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>

diff --git a/include/dt-bindings/sound/qcom,q6dsp-lpass-ports.h b/include/dt-bindings/sound/qcom,q6dsp-lpass-ports.h
index 2e879a3c09aef3b70a7a03324843ad6f58548abc..3a99703dbc4a0d0abf5b25bc3fd49a2f6c7e1f33 100644 (file)
--- a/include/dt-bindings/sound/qcom,q6dsp-lpass-ports.h
+++ b/include/dt-bindings/sound/qcom,q6dsp-lpass-ports.h
@@ -237,34 +237,34 @@
 /* Clock ID for RX CORE MCLK2 2X  MCLK */
 #define LPASS_CLK_ID_RX_CORE_MCLK2_2X_MCLK     70
 
-#define LAPSS_CLK_ID_QAIF_IF0_IBIT             71
-#define LAPSS_CLK_ID_QAIF_IF0_EBIT             72
-#define LAPSS_CLK_ID_QAIF_IF1_IBIT             73
-#define LAPSS_CLK_ID_QAIF_IF1_EBIT             74
-#define LAPSS_CLK_ID_QAIF_IF2_IBIT             75
-#define LAPSS_CLK_ID_QAIF_IF2_EBIT             76
-#define LAPSS_CLK_ID_QAIF_IF3_IBIT             77
-#define LAPSS_CLK_ID_QAIF_IF3_EBIT             78
-#define LAPSS_CLK_ID_QAIF_IF4_IBIT             79
-#define LAPSS_CLK_ID_QAIF_IF4_EBIT             80
-#define LAPSS_CLK_ID_QAIF_IF5_IBIT             81
-#define LAPSS_CLK_ID_QAIF_IF5_EBIT             82
-#define LAPSS_CLK_ID_QAIF_IF6_IBIT             83
-#define LAPSS_CLK_ID_QAIF_IF6_EBIT             84
-#define LAPSS_CLK_ID_QAIF_IF7_IBIT             85
-#define LAPSS_CLK_ID_QAIF_IF7_EBIT             86
-#define LAPSS_CLK_ID_QAIF_IF8_IBIT             87
-#define LAPSS_CLK_ID_QAIF_IF8_EBIT             88
-#define LAPSS_CLK_ID_QAIF_IF9_IBIT             89
-#define LAPSS_CLK_ID_QAIF_IF9_EBIT             90
-#define LAPSS_CLK_ID_QAIF_IF10_IBIT    91
-#define LAPSS_CLK_ID_QAIF_IF10_EBIT    92
-#define LAPSS_CLK_ID_QAIF_IF11_IBIT    93
-#define LAPSS_CLK_ID_QAIF_IF11_EBIT    94
-#define LAPSS_CLK_ID_QAIF_IF12_IBIT    95
-#define LAPSS_CLK_ID_QAIF_IF12_EBIT    96
-#define LAPSS_CLK_ID_VA_QAIF_IF0_IBIT  97
-#define LAPSS_CLK_ID_VA_QAIF_IF0_EBIT  98
+#define LPASS_CLK_ID_QAIF_IF0_IBIT             71
+#define LPASS_CLK_ID_QAIF_IF0_EBIT             72
+#define LPASS_CLK_ID_QAIF_IF1_IBIT             73
+#define LPASS_CLK_ID_QAIF_IF1_EBIT             74
+#define LPASS_CLK_ID_QAIF_IF2_IBIT             75
+#define LPASS_CLK_ID_QAIF_IF2_EBIT             76
+#define LPASS_CLK_ID_QAIF_IF3_IBIT             77
+#define LPASS_CLK_ID_QAIF_IF3_EBIT             78
+#define LPASS_CLK_ID_QAIF_IF4_IBIT             79
+#define LPASS_CLK_ID_QAIF_IF4_EBIT             80
+#define LPASS_CLK_ID_QAIF_IF5_IBIT             81
+#define LPASS_CLK_ID_QAIF_IF5_EBIT             82
+#define LPASS_CLK_ID_QAIF_IF6_IBIT             83
+#define LPASS_CLK_ID_QAIF_IF6_EBIT             84
+#define LPASS_CLK_ID_QAIF_IF7_IBIT             85
+#define LPASS_CLK_ID_QAIF_IF7_EBIT             86
+#define LPASS_CLK_ID_QAIF_IF8_IBIT             87
+#define LPASS_CLK_ID_QAIF_IF8_EBIT             88
+#define LPASS_CLK_ID_QAIF_IF9_IBIT             89
+#define LPASS_CLK_ID_QAIF_IF9_EBIT             90
+#define LPASS_CLK_ID_QAIF_IF10_IBIT    91
+#define LPASS_CLK_ID_QAIF_IF10_EBIT    92
+#define LPASS_CLK_ID_QAIF_IF11_IBIT    93
+#define LPASS_CLK_ID_QAIF_IF11_EBIT    94
+#define LPASS_CLK_ID_QAIF_IF12_IBIT    95
+#define LPASS_CLK_ID_QAIF_IF12_EBIT    96
+#define LPASS_CLK_ID_VA_QAIF_IF0_IBIT  97
+#define LPASS_CLK_ID_VA_QAIF_IF0_EBIT  98
 
 #define LPASS_HW_AVTIMER_VOTE          101
 #define LPASS_HW_MACRO_VOTE            102

diff --git a/sound/soc/qcom/qdsp6/q6prm-clocks.c b/sound/soc/qcom/qdsp6/q6prm-clocks.c
index f613e2aee75e6309104fbc5fffe9e80b40d47c98..b4f9abbe02cb0bb1ca8d7e5de0237f8a8e8270e8 100644 (file)
--- 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 cca77cd92bc17b300cf6b3c85659744b187ad7a2..cf619ef6561a119e765d2082dd89f49ce4eb8305 100644 (file)
--- 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