[PATCH v5 01/14] dt-bindings: clocks: imx8mp: Rename audiomix ids clocks to audio_blk_ctl

Abel Vesa
2020-11-03T11:19:18Z

In the reference manual the actual name is Audio BLK_CTL.
Lets make it more obvious here by renaming from audiomix to audio_blk_ctl.

Signed-off-by: Abel Vesa <abel.vesa@nxp.com>
Acked-by: Rob Herring <robh@kernel.org>
Reviewed-by: Dong Aisheng <aisheng.dong@nxp.com>
---
include/dt-bindings/clock/imx8mp-clock.h | 120 +++++++++++++++----------------
1 file changed, 60 insertions(+), 60 deletions(-)

diff --git a/include/dt-bindings/clock/imx8mp-clock.h b/include/dt-bindings/clock/imx8mp-clock.h
index e8d68fb..89c67b7 100644
--- a/include/dt-bindings/clock/imx8mp-clock.h
+++ b/include/dt-bindings/clock/imx8mp-clock.h
@@ -324,66 +324,66 @@

#define IMX8MP_CLK_END 313

-#define IMX8MP_CLK_AUDIOMIX_SAI1_IPG 0
-#define IMX8MP_CLK_AUDIOMIX_SAI1_MCLK1 1
-#define IMX8MP_CLK_AUDIOMIX_SAI1_MCLK2 2
-#define IMX8MP_CLK_AUDIOMIX_SAI1_MCLK3 3
-#define IMX8MP_CLK_AUDIOMIX_SAI2_IPG 4
-#define IMX8MP_CLK_AUDIOMIX_SAI2_MCLK1 5
-#define IMX8MP_CLK_AUDIOMIX_SAI2_MCLK2 6
-#define IMX8MP_CLK_AUDIOMIX_SAI2_MCLK3 7
-#define IMX8MP_CLK_AUDIOMIX_SAI3_IPG 8
-#define IMX8MP_CLK_AUDIOMIX_SAI3_MCLK1 9
-#define IMX8MP_CLK_AUDIOMIX_SAI3_MCLK2 10
-#define IMX8MP_CLK_AUDIOMIX_SAI3_MCLK3 11
-#define IMX8MP_CLK_AUDIOMIX_SAI5_IPG 12
-#define IMX8MP_CLK_AUDIOMIX_SAI5_MCLK1 13
-#define IMX8MP_CLK_AUDIOMIX_SAI5_MCLK2 14
-#define IMX8MP_CLK_AUDIOMIX_SAI5_MCLK3 15
-#define IMX8MP_CLK_AUDIOMIX_SAI6_IPG 16
-#define IMX8MP_CLK_AUDIOMIX_SAI6_MCLK1 17
-#define IMX8MP_CLK_AUDIOMIX_SAI6_MCLK2 18
-#define IMX8MP_CLK_AUDIOMIX_SAI6_MCLK3 19
-#define IMX8MP_CLK_AUDIOMIX_SAI7_IPG 20
-#define IMX8MP_CLK_AUDIOMIX_SAI7_MCLK1 21
-#define IMX8MP_CLK_AUDIOMIX_SAI7_MCLK2 22
-#define IMX8MP_CLK_AUDIOMIX_SAI7_MCLK3 23
-#define IMX8MP_CLK_AUDIOMIX_ASRC_IPG 24
-#define IMX8MP_CLK_AUDIOMIX_PDM_IPG 25
-#define IMX8MP_CLK_AUDIOMIX_SDMA2_ROOT 26
-#define IMX8MP_CLK_AUDIOMIX_SDMA3_ROOT 27
-#define IMX8MP_CLK_AUDIOMIX_SPBA2_ROOT 28
-#define IMX8MP_CLK_AUDIOMIX_DSP_ROOT 29
-#define IMX8MP_CLK_AUDIOMIX_DSPDBG_ROOT 30
-#define IMX8MP_CLK_AUDIOMIX_EARC_IPG 31
-#define IMX8MP_CLK_AUDIOMIX_OCRAMA_IPG 32
-#define IMX8MP_CLK_AUDIOMIX_AUD2HTX_IPG 33
-#define IMX8MP_CLK_AUDIOMIX_EDMA_ROOT 34
-#define IMX8MP_CLK_AUDIOMIX_AUDPLL_ROOT 35
-#define IMX8MP_CLK_AUDIOMIX_MU2_ROOT 36
-#define IMX8MP_CLK_AUDIOMIX_MU3_ROOT 37
-#define IMX8MP_CLK_AUDIOMIX_EARC_PHY 38
-#define IMX8MP_CLK_AUDIOMIX_PDM_ROOT 39
-#define IMX8MP_CLK_AUDIOMIX_SAI1_MCLK1_SEL 40
-#define IMX8MP_CLK_AUDIOMIX_SAI1_MCLK2_SEL 41
-#define IMX8MP_CLK_AUDIOMIX_SAI2_MCLK1_SEL 42
-#define IMX8MP_CLK_AUDIOMIX_SAI2_MCLK2_SEL 43
-#define IMX8MP_CLK_AUDIOMIX_SAI3_MCLK1_SEL 44
-#define IMX8MP_CLK_AUDIOMIX_SAI3_MCLK2_SEL 45
-#define IMX8MP_CLK_AUDIOMIX_SAI4_MCLK1_SEL 46
-#define IMX8MP_CLK_AUDIOMIX_SAI4_MCLK2_SEL 47
-#define IMX8MP_CLK_AUDIOMIX_SAI5_MCLK1_SEL 48
-#define IMX8MP_CLK_AUDIOMIX_SAI5_MCLK2_SEL 49
-#define IMX8MP_CLK_AUDIOMIX_SAI6_MCLK1_SEL 50
-#define IMX8MP_CLK_AUDIOMIX_SAI6_MCLK2_SEL 51
-#define IMX8MP_CLK_AUDIOMIX_SAI7_MCLK1_SEL 52
-#define IMX8MP_CLK_AUDIOMIX_SAI7_MCLK2_SEL 53
-#define IMX8MP_CLK_AUDIOMIX_PDM_SEL 54
-#define IMX8MP_CLK_AUDIOMIX_SAI_PLL_REF_SEL 55
-#define IMX8MP_CLK_AUDIOMIX_SAI_PLL 56
-#define IMX8MP_CLK_AUDIOMIX_SAI_PLL_BYPASS 57
-#define IMX8MP_CLK_AUDIOMIX_SAI_PLL_OUT 58
+#define IMX8MP_CLK_AUDIO_BLK_CTL_SAI1_IPG 0
+#define IMX8MP_CLK_AUDIO_BLK_CTL_SAI1_MCLK1 1
+#define IMX8MP_CLK_AUDIO_BLK_CTL_SAI1_MCLK2 2
+#define IMX8MP_CLK_AUDIO_BLK_CTL_SAI1_MCLK3 3
+#define IMX8MP_CLK_AUDIO_BLK_CTL_SAI2_IPG 4
+#define IMX8MP_CLK_AUDIO_BLK_CTL_SAI2_MCLK1 5
+#define IMX8MP_CLK_AUDIO_BLK_CTL_SAI2_MCLK2 6
+#define IMX8MP_CLK_AUDIO_BLK_CTL_SAI2_MCLK3 7
+#define IMX8MP_CLK_AUDIO_BLK_CTL_SAI3_IPG 8
+#define IMX8MP_CLK_AUDIO_BLK_CTL_SAI3_MCLK1 9
+#define IMX8MP_CLK_AUDIO_BLK_CTL_SAI3_MCLK2 10
+#define IMX8MP_CLK_AUDIO_BLK_CTL_SAI3_MCLK3 11
+#define IMX8MP_CLK_AUDIO_BLK_CTL_SAI5_IPG 12
+#define IMX8MP_CLK_AUDIO_BLK_CTL_SAI5_MCLK1 13
+#define IMX8MP_CLK_AUDIO_BLK_CTL_SAI5_MCLK2 14
+#define IMX8MP_CLK_AUDIO_BLK_CTL_SAI5_MCLK3 15
+#define IMX8MP_CLK_AUDIO_BLK_CTL_SAI6_IPG 16
+#define IMX8MP_CLK_AUDIO_BLK_CTL_SAI6_MCLK1 17
+#define IMX8MP_CLK_AUDIO_BLK_CTL_SAI6_MCLK2 18
+#define IMX8MP_CLK_AUDIO_BLK_CTL_SAI6_MCLK3 19
+#define IMX8MP_CLK_AUDIO_BLK_CTL_SAI7_IPG 20
+#define IMX8MP_CLK_AUDIO_BLK_CTL_SAI7_MCLK1 21
+#define IMX8MP_CLK_AUDIO_BLK_CTL_SAI7_MCLK2 22
+#define IMX8MP_CLK_AUDIO_BLK_CTL_SAI7_MCLK3 23
+#define IMX8MP_CLK_AUDIO_BLK_CTL_ASRC_IPG 24
+#define IMX8MP_CLK_AUDIO_BLK_CTL_PDM_IPG 25
+#define IMX8MP_CLK_AUDIO_BLK_CTL_SDMA2_ROOT 26
+#define IMX8MP_CLK_AUDIO_BLK_CTL_SDMA3_ROOT 27
+#define IMX8MP_CLK_AUDIO_BLK_CTL_SPBA2_ROOT 28
+#define IMX8MP_CLK_AUDIO_BLK_CTL_DSP_ROOT 29
+#define IMX8MP_CLK_AUDIO_BLK_CTL_DSPDBG_ROOT 30
+#define IMX8MP_CLK_AUDIO_BLK_CTL_EARC_IPG 31
+#define IMX8MP_CLK_AUDIO_BLK_CTL_OCRAMA_IPG 32
+#define IMX8MP_CLK_AUDIO_BLK_CTL_AUD2HTX_IPG 33
+#define IMX8MP_CLK_AUDIO_BLK_CTL_EDMA_ROOT 34
+#define IMX8MP_CLK_AUDIO_BLK_CTL_AUDPLL_ROOT 35
+#define IMX8MP_CLK_AUDIO_BLK_CTL_MU2_ROOT 36
+#define IMX8MP_CLK_AUDIO_BLK_CTL_MU3_ROOT 37
+#define IMX8MP_CLK_AUDIO_BLK_CTL_EARC_PHY 38
+#define IMX8MP_CLK_AUDIO_BLK_CTL_PDM_ROOT 39
+#define IMX8MP_CLK_AUDIO_BLK_CTL_SAI1_MCLK1_SEL 40
+#define IMX8MP_CLK_AUDIO_BLK_CTL_SAI1_MCLK2_SEL 41
+#define IMX8MP_CLK_AUDIO_BLK_CTL_SAI2_MCLK1_SEL 42
+#define IMX8MP_CLK_AUDIO_BLK_CTL_SAI2_MCLK2_SEL 43
+#define IMX8MP_CLK_AUDIO_BLK_CTL_SAI3_MCLK1_SEL 44
+#define IMX8MP_CLK_AUDIO_BLK_CTL_SAI3_MCLK2_SEL 45
+#define IMX8MP_CLK_AUDIO_BLK_CTL_SAI4_MCLK1_SEL 46
+#define IMX8MP_CLK_AUDIO_BLK_CTL_SAI4_MCLK2_SEL 47
+#define IMX8MP_CLK_AUDIO_BLK_CTL_SAI5_MCLK1_SEL 48
+#define IMX8MP_CLK_AUDIO_BLK_CTL_SAI5_MCLK2_SEL 49
+#define IMX8MP_CLK_AUDIO_BLK_CTL_SAI6_MCLK1_SEL 50
+#define IMX8MP_CLK_AUDIO_BLK_CTL_SAI6_MCLK2_SEL 51
+#define IMX8MP_CLK_AUDIO_BLK_CTL_SAI7_MCLK1_SEL 52
+#define IMX8MP_CLK_AUDIO_BLK_CTL_SAI7_MCLK2_SEL 53
+#define IMX8MP_CLK_AUDIO_BLK_CTL_PDM_SEL 54
+#define IMX8MP_CLK_AUDIO_BLK_CTL_SAI_PLL_REF_SEL 55
+#define IMX8MP_CLK_AUDIO_BLK_CTL_SAI_PLL 56
+#define IMX8MP_CLK_AUDIO_BLK_CTL_SAI_PLL_BYPASS 57
+#define IMX8MP_CLK_AUDIO_BLK_CTL_SAI_PLL_OUT 58

-#define IMX8MP_CLK_AUDIOMIX_END 59
+#define IMX8MP_CLK_AUDIO_BLK_CTL_END 59

#endif
--
2.7.4