Re: [PATCH v2 01/17] dt-bindings: clocks: imx8mp: Rename audiomix ids clocks to audio_blk_ctrl

[Dong Aisheng]

On Fri, Aug 14, 2020 at 8:14 PM Abel Vesa <abel.vesa@xxxxxxx> wrote:
>
> In the reference manual the actual name is Audio BLK_CTRL.
> Lets make it more obvious here by renaming from audiomix to audio_blk_ctrl.
>
> Signed-off-by: Abel Vesa <abel.vesa@xxxxxxx>

As there's still no users of the old definitions, it's okay for me to
change it now.
Reviewed-by: Dong Aisheng <aisheng.dong@xxxxxxx>

Regards
Aisheng

> ---
>  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 7a23f28..6008f32 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_CTRL_SAI1_IPG             0
> +#define IMX8MP_CLK_AUDIO_BLK_CTRL_SAI1_MCLK1           1
> +#define IMX8MP_CLK_AUDIO_BLK_CTRL_SAI1_MCLK2           2
> +#define IMX8MP_CLK_AUDIO_BLK_CTRL_SAI1_MCLK3           3
> +#define IMX8MP_CLK_AUDIO_BLK_CTRL_SAI2_IPG             4
> +#define IMX8MP_CLK_AUDIO_BLK_CTRL_SAI2_MCLK1           5
> +#define IMX8MP_CLK_AUDIO_BLK_CTRL_SAI2_MCLK2           6
> +#define IMX8MP_CLK_AUDIO_BLK_CTRL_SAI2_MCLK3           7
> +#define IMX8MP_CLK_AUDIO_BLK_CTRL_SAI3_IPG             8
> +#define IMX8MP_CLK_AUDIO_BLK_CTRL_SAI3_MCLK1           9
> +#define IMX8MP_CLK_AUDIO_BLK_CTRL_SAI3_MCLK2           10
> +#define IMX8MP_CLK_AUDIO_BLK_CTRL_SAI3_MCLK3           11
> +#define IMX8MP_CLK_AUDIO_BLK_CTRL_SAI5_IPG             12
> +#define IMX8MP_CLK_AUDIO_BLK_CTRL_SAI5_MCLK1           13
> +#define IMX8MP_CLK_AUDIO_BLK_CTRL_SAI5_MCLK2           14
> +#define IMX8MP_CLK_AUDIO_BLK_CTRL_SAI5_MCLK3           15
> +#define IMX8MP_CLK_AUDIO_BLK_CTRL_SAI6_IPG             16
> +#define IMX8MP_CLK_AUDIO_BLK_CTRL_SAI6_MCLK1           17
> +#define IMX8MP_CLK_AUDIO_BLK_CTRL_SAI6_MCLK2           18
> +#define IMX8MP_CLK_AUDIO_BLK_CTRL_SAI6_MCLK3           19
> +#define IMX8MP_CLK_AUDIO_BLK_CTRL_SAI7_IPG             20
> +#define IMX8MP_CLK_AUDIO_BLK_CTRL_SAI7_MCLK1           21
> +#define IMX8MP_CLK_AUDIO_BLK_CTRL_SAI7_MCLK2           22
> +#define IMX8MP_CLK_AUDIO_BLK_CTRL_SAI7_MCLK3           23
> +#define IMX8MP_CLK_AUDIO_BLK_CTRL_ASRC_IPG             24
> +#define IMX8MP_CLK_AUDIO_BLK_CTRL_PDM_IPG              25
> +#define IMX8MP_CLK_AUDIO_BLK_CTRL_SDMA2_ROOT           26
> +#define IMX8MP_CLK_AUDIO_BLK_CTRL_SDMA3_ROOT           27
> +#define IMX8MP_CLK_AUDIO_BLK_CTRL_SPBA2_ROOT           28
> +#define IMX8MP_CLK_AUDIO_BLK_CTRL_DSP_ROOT             29
> +#define IMX8MP_CLK_AUDIO_BLK_CTRL_DSPDBG_ROOT          30
> +#define IMX8MP_CLK_AUDIO_BLK_CTRL_EARC_IPG             31
> +#define IMX8MP_CLK_AUDIO_BLK_CTRL_OCRAMA_IPG           32
> +#define IMX8MP_CLK_AUDIO_BLK_CTRL_AUD2HTX_IPG          33
> +#define IMX8MP_CLK_AUDIO_BLK_CTRL_EDMA_ROOT            34
> +#define IMX8MP_CLK_AUDIO_BLK_CTRL_AUDPLL_ROOT          35
> +#define IMX8MP_CLK_AUDIO_BLK_CTRL_MU2_ROOT             36
> +#define IMX8MP_CLK_AUDIO_BLK_CTRL_MU3_ROOT             37
> +#define IMX8MP_CLK_AUDIO_BLK_CTRL_EARC_PHY             38
> +#define IMX8MP_CLK_AUDIO_BLK_CTRL_PDM_ROOT             39
> +#define IMX8MP_CLK_AUDIO_BLK_CTRL_SAI1_MCLK1_SEL       40
> +#define IMX8MP_CLK_AUDIO_BLK_CTRL_SAI1_MCLK2_SEL       41
> +#define IMX8MP_CLK_AUDIO_BLK_CTRL_SAI2_MCLK1_SEL       42
> +#define IMX8MP_CLK_AUDIO_BLK_CTRL_SAI2_MCLK2_SEL       43
> +#define IMX8MP_CLK_AUDIO_BLK_CTRL_SAI3_MCLK1_SEL       44
> +#define IMX8MP_CLK_AUDIO_BLK_CTRL_SAI3_MCLK2_SEL       45
> +#define IMX8MP_CLK_AUDIO_BLK_CTRL_SAI4_MCLK1_SEL       46
> +#define IMX8MP_CLK_AUDIO_BLK_CTRL_SAI4_MCLK2_SEL       47
> +#define IMX8MP_CLK_AUDIO_BLK_CTRL_SAI5_MCLK1_SEL       48
> +#define IMX8MP_CLK_AUDIO_BLK_CTRL_SAI5_MCLK2_SEL       49
> +#define IMX8MP_CLK_AUDIO_BLK_CTRL_SAI6_MCLK1_SEL       50
> +#define IMX8MP_CLK_AUDIO_BLK_CTRL_SAI6_MCLK2_SEL       51
> +#define IMX8MP_CLK_AUDIO_BLK_CTRL_SAI7_MCLK1_SEL       52
> +#define IMX8MP_CLK_AUDIO_BLK_CTRL_SAI7_MCLK2_SEL       53
> +#define IMX8MP_CLK_AUDIO_BLK_CTRL_PDM_SEL              54
> +#define IMX8MP_CLK_AUDIO_BLK_CTRL_SAI_PLL_REF_SEL      55
> +#define IMX8MP_CLK_AUDIO_BLK_CTRL_SAI_PLL              56
> +#define IMX8MP_CLK_AUDIO_BLK_CTRL_SAI_PLL_BYPASS       57
> +#define IMX8MP_CLK_AUDIO_BLK_CTRL_SAI_PLL_OUT          58
>
> -#define IMX8MP_CLK_AUDIOMIX_END                        59
> +#define IMX8MP_CLK_AUDIO_BLK_CTRL_END                  59
>
>  #endif
> --
> 2.7.4
>