summaryrefslogtreecommitdiff
path: root/sound/soc
diff options
context:
space:
mode:
authorPrasad Kumpatla <prasad.kumpatla@oss.qualcomm.com>2026-08-18 14:16:52 +0530
committerMark Brown <broonie@kernel.org>2026-08-18 19:22:44 +0100
commitc41ac86802fc0a22a886915a43bcad2e8d482b02 (patch)
tree9f361eff3a4ab4f640fd3b2f80646b83fc35ee77 /sound/soc
parent19b7493a71625bcc8f29e1b858e99c7e42790156 (diff)
ASoC: dt-bindings: qcom,q6dsp-lpass-ports: Rename QAIF clock IDs
The QAIF clock IDs were introduced with a LAPSS prefix typo. Rename them to use the existing LPASS naming convention and update all corresponding in-tree users. Since these IDs are new, rename them directly instead of keeping backward-compatible aliases. Reported-by: Sashiko <sashiko-bot@kernel.org> Link: https://sashiko.dev/#/patchset/20260804070307.117119-1-prasad.kumpatla@oss.qualcomm.com Signed-off-by: Prasad Kumpatla <prasad.kumpatla@oss.qualcomm.com> Link: https://patch.msgid.link/20260818084655.3240284-2-prasad.kumpatla@oss.qualcomm.com Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/qcom/qdsp6/q6prm-clocks.c56
-rw-r--r--sound/soc/qcom/qdsp6/q6prm.h56
2 files changed, 56 insertions, 56 deletions
diff --git a/sound/soc/qcom/qdsp6/q6prm-clocks.c b/sound/soc/qcom/qdsp6/q6prm-clocks.c
index f613e2aee75e..b4f9abbe02cb 100644
--- a/sound/soc/qcom/qdsp6/q6prm-clocks.c
+++ b/sound/soc/qcom/qdsp6/q6prm-clocks.c
@@ -64,34 +64,34 @@ static const struct q6dsp_clk_init q6prm_clks[] = {
Q6PRM_CLK(LPASS_CLK_ID_WSA2_CORE_TX_MCLK),
Q6PRM_CLK(LPASS_CLK_ID_WSA2_CORE_TX_2X_MCLK),
Q6PRM_CLK(LPASS_CLK_ID_RX_CORE_MCLK2_2X_MCLK),
- Q6PRM_CLK(LAPSS_CLK_ID_QAIF_IF0_IBIT),
- Q6PRM_CLK(LAPSS_CLK_ID_QAIF_IF0_EBIT),
- Q6PRM_CLK(LAPSS_CLK_ID_QAIF_IF1_IBIT),
- Q6PRM_CLK(LAPSS_CLK_ID_QAIF_IF1_EBIT),
- Q6PRM_CLK(LAPSS_CLK_ID_QAIF_IF2_IBIT),
- Q6PRM_CLK(LAPSS_CLK_ID_QAIF_IF2_EBIT),
- Q6PRM_CLK(LAPSS_CLK_ID_QAIF_IF3_IBIT),
- Q6PRM_CLK(LAPSS_CLK_ID_QAIF_IF3_EBIT),
- Q6PRM_CLK(LAPSS_CLK_ID_QAIF_IF4_IBIT),
- Q6PRM_CLK(LAPSS_CLK_ID_QAIF_IF4_EBIT),
- Q6PRM_CLK(LAPSS_CLK_ID_QAIF_IF5_IBIT),
- Q6PRM_CLK(LAPSS_CLK_ID_QAIF_IF5_EBIT),
- Q6PRM_CLK(LAPSS_CLK_ID_QAIF_IF6_IBIT),
- Q6PRM_CLK(LAPSS_CLK_ID_QAIF_IF6_EBIT),
- Q6PRM_CLK(LAPSS_CLK_ID_QAIF_IF7_IBIT),
- Q6PRM_CLK(LAPSS_CLK_ID_QAIF_IF7_EBIT),
- Q6PRM_CLK(LAPSS_CLK_ID_QAIF_IF8_IBIT),
- Q6PRM_CLK(LAPSS_CLK_ID_QAIF_IF8_EBIT),
- Q6PRM_CLK(LAPSS_CLK_ID_QAIF_IF9_IBIT),
- Q6PRM_CLK(LAPSS_CLK_ID_QAIF_IF9_EBIT),
- Q6PRM_CLK(LAPSS_CLK_ID_QAIF_IF10_IBIT),
- Q6PRM_CLK(LAPSS_CLK_ID_QAIF_IF10_EBIT),
- Q6PRM_CLK(LAPSS_CLK_ID_QAIF_IF11_IBIT),
- Q6PRM_CLK(LAPSS_CLK_ID_QAIF_IF11_EBIT),
- Q6PRM_CLK(LAPSS_CLK_ID_QAIF_IF12_IBIT),
- Q6PRM_CLK(LAPSS_CLK_ID_QAIF_IF12_EBIT),
- Q6PRM_CLK(LAPSS_CLK_ID_VA_QAIF_IF0_IBIT),
- Q6PRM_CLK(LAPSS_CLK_ID_VA_QAIF_IF0_EBIT),
+ Q6PRM_CLK(LPASS_CLK_ID_QAIF_IF0_IBIT),
+ Q6PRM_CLK(LPASS_CLK_ID_QAIF_IF0_EBIT),
+ Q6PRM_CLK(LPASS_CLK_ID_QAIF_IF1_IBIT),
+ Q6PRM_CLK(LPASS_CLK_ID_QAIF_IF1_EBIT),
+ Q6PRM_CLK(LPASS_CLK_ID_QAIF_IF2_IBIT),
+ Q6PRM_CLK(LPASS_CLK_ID_QAIF_IF2_EBIT),
+ Q6PRM_CLK(LPASS_CLK_ID_QAIF_IF3_IBIT),
+ Q6PRM_CLK(LPASS_CLK_ID_QAIF_IF3_EBIT),
+ Q6PRM_CLK(LPASS_CLK_ID_QAIF_IF4_IBIT),
+ Q6PRM_CLK(LPASS_CLK_ID_QAIF_IF4_EBIT),
+ Q6PRM_CLK(LPASS_CLK_ID_QAIF_IF5_IBIT),
+ Q6PRM_CLK(LPASS_CLK_ID_QAIF_IF5_EBIT),
+ Q6PRM_CLK(LPASS_CLK_ID_QAIF_IF6_IBIT),
+ Q6PRM_CLK(LPASS_CLK_ID_QAIF_IF6_EBIT),
+ Q6PRM_CLK(LPASS_CLK_ID_QAIF_IF7_IBIT),
+ Q6PRM_CLK(LPASS_CLK_ID_QAIF_IF7_EBIT),
+ Q6PRM_CLK(LPASS_CLK_ID_QAIF_IF8_IBIT),
+ Q6PRM_CLK(LPASS_CLK_ID_QAIF_IF8_EBIT),
+ Q6PRM_CLK(LPASS_CLK_ID_QAIF_IF9_IBIT),
+ Q6PRM_CLK(LPASS_CLK_ID_QAIF_IF9_EBIT),
+ Q6PRM_CLK(LPASS_CLK_ID_QAIF_IF10_IBIT),
+ Q6PRM_CLK(LPASS_CLK_ID_QAIF_IF10_EBIT),
+ Q6PRM_CLK(LPASS_CLK_ID_QAIF_IF11_IBIT),
+ Q6PRM_CLK(LPASS_CLK_ID_QAIF_IF11_EBIT),
+ Q6PRM_CLK(LPASS_CLK_ID_QAIF_IF12_IBIT),
+ Q6PRM_CLK(LPASS_CLK_ID_QAIF_IF12_EBIT),
+ Q6PRM_CLK(LPASS_CLK_ID_VA_QAIF_IF0_IBIT),
+ Q6PRM_CLK(LPASS_CLK_ID_VA_QAIF_IF0_EBIT),
Q6DSP_VOTE_CLK(LPASS_HW_MACRO_VOTE, Q6PRM_HW_CORE_ID_LPASS,
"LPASS_HW_MACRO"),
Q6DSP_VOTE_CLK(LPASS_HW_DCODEC_VOTE, Q6PRM_HW_CORE_ID_DCODEC,
diff --git a/sound/soc/qcom/qdsp6/q6prm.h b/sound/soc/qcom/qdsp6/q6prm.h
index cca77cd92bc1..cf619ef6561a 100644
--- a/sound/soc/qcom/qdsp6/q6prm.h
+++ b/sound/soc/qcom/qdsp6/q6prm.h
@@ -97,34 +97,34 @@
/* Clock ID for RX CORE MCLK2 2X MCLK */
#define Q6PRM_LPASS_CLK_ID_RX_CORE_MCLK2_2X_MCLK 0x318
-#define Q6PRM_LAPSS_CLK_ID_QAIF_IF0_IBIT 0x500
-#define Q6PRM_LAPSS_CLK_ID_QAIF_IF0_EBIT 0x501
-#define Q6PRM_LAPSS_CLK_ID_QAIF_IF1_IBIT 0x502
-#define Q6PRM_LAPSS_CLK_ID_QAIF_IF1_EBIT 0x503
-#define Q6PRM_LAPSS_CLK_ID_QAIF_IF2_IBIT 0x504
-#define Q6PRM_LAPSS_CLK_ID_QAIF_IF2_EBIT 0x505
-#define Q6PRM_LAPSS_CLK_ID_QAIF_IF3_IBIT 0x506
-#define Q6PRM_LAPSS_CLK_ID_QAIF_IF3_EBIT 0x507
-#define Q6PRM_LAPSS_CLK_ID_QAIF_IF4_IBIT 0x508
-#define Q6PRM_LAPSS_CLK_ID_QAIF_IF4_EBIT 0x509
-#define Q6PRM_LAPSS_CLK_ID_QAIF_IF5_IBIT 0x50A
-#define Q6PRM_LAPSS_CLK_ID_QAIF_IF5_EBIT 0x50B
-#define Q6PRM_LAPSS_CLK_ID_QAIF_IF6_IBIT 0x50C
-#define Q6PRM_LAPSS_CLK_ID_QAIF_IF6_EBIT 0x50D
-#define Q6PRM_LAPSS_CLK_ID_QAIF_IF7_IBIT 0x50E
-#define Q6PRM_LAPSS_CLK_ID_QAIF_IF7_EBIT 0x50F
-#define Q6PRM_LAPSS_CLK_ID_QAIF_IF8_IBIT 0x510
-#define Q6PRM_LAPSS_CLK_ID_QAIF_IF8_EBIT 0x511
-#define Q6PRM_LAPSS_CLK_ID_QAIF_IF9_IBIT 0x512
-#define Q6PRM_LAPSS_CLK_ID_QAIF_IF9_EBIT 0x513
-#define Q6PRM_LAPSS_CLK_ID_QAIF_IF10_IBIT 0x514
-#define Q6PRM_LAPSS_CLK_ID_QAIF_IF10_EBIT 0x515
-#define Q6PRM_LAPSS_CLK_ID_QAIF_IF11_IBIT 0x516
-#define Q6PRM_LAPSS_CLK_ID_QAIF_IF11_EBIT 0x517
-#define Q6PRM_LAPSS_CLK_ID_QAIF_IF12_IBIT 0x518
-#define Q6PRM_LAPSS_CLK_ID_QAIF_IF12_EBIT 0x519
-#define Q6PRM_LAPSS_CLK_ID_VA_QAIF_IF0_IBIT 0x550
-#define Q6PRM_LAPSS_CLK_ID_VA_QAIF_IF0_EBIT 0x551
+#define Q6PRM_LPASS_CLK_ID_QAIF_IF0_IBIT 0x500
+#define Q6PRM_LPASS_CLK_ID_QAIF_IF0_EBIT 0x501
+#define Q6PRM_LPASS_CLK_ID_QAIF_IF1_IBIT 0x502
+#define Q6PRM_LPASS_CLK_ID_QAIF_IF1_EBIT 0x503
+#define Q6PRM_LPASS_CLK_ID_QAIF_IF2_IBIT 0x504
+#define Q6PRM_LPASS_CLK_ID_QAIF_IF2_EBIT 0x505
+#define Q6PRM_LPASS_CLK_ID_QAIF_IF3_IBIT 0x506
+#define Q6PRM_LPASS_CLK_ID_QAIF_IF3_EBIT 0x507
+#define Q6PRM_LPASS_CLK_ID_QAIF_IF4_IBIT 0x508
+#define Q6PRM_LPASS_CLK_ID_QAIF_IF4_EBIT 0x509
+#define Q6PRM_LPASS_CLK_ID_QAIF_IF5_IBIT 0x50A
+#define Q6PRM_LPASS_CLK_ID_QAIF_IF5_EBIT 0x50B
+#define Q6PRM_LPASS_CLK_ID_QAIF_IF6_IBIT 0x50C
+#define Q6PRM_LPASS_CLK_ID_QAIF_IF6_EBIT 0x50D
+#define Q6PRM_LPASS_CLK_ID_QAIF_IF7_IBIT 0x50E
+#define Q6PRM_LPASS_CLK_ID_QAIF_IF7_EBIT 0x50F
+#define Q6PRM_LPASS_CLK_ID_QAIF_IF8_IBIT 0x510
+#define Q6PRM_LPASS_CLK_ID_QAIF_IF8_EBIT 0x511
+#define Q6PRM_LPASS_CLK_ID_QAIF_IF9_IBIT 0x512
+#define Q6PRM_LPASS_CLK_ID_QAIF_IF9_EBIT 0x513
+#define Q6PRM_LPASS_CLK_ID_QAIF_IF10_IBIT 0x514
+#define Q6PRM_LPASS_CLK_ID_QAIF_IF10_EBIT 0x515
+#define Q6PRM_LPASS_CLK_ID_QAIF_IF11_IBIT 0x516
+#define Q6PRM_LPASS_CLK_ID_QAIF_IF11_EBIT 0x517
+#define Q6PRM_LPASS_CLK_ID_QAIF_IF12_IBIT 0x518
+#define Q6PRM_LPASS_CLK_ID_QAIF_IF12_EBIT 0x519
+#define Q6PRM_LPASS_CLK_ID_VA_QAIF_IF0_IBIT 0x550
+#define Q6PRM_LPASS_CLK_ID_VA_QAIF_IF0_EBIT 0x551
#define Q6PRM_LPASS_CLK_SRC_INTERNAL 1
#define Q6PRM_LPASS_CLK_ROOT_DEFAULT 0