2019-03-21 09:21:10

by Neil Armstrong

Subject: [PATCH] dt-bindings: clock: g12a-aoclk: expose CLKID_AO_CTS_OSCIN

When submitted v2 of the G12A AO-CLK IDs, the CLKID_AO_CTS_OSCIN was moved
to the internal non-exported bindings, but this clock is necessary for
the second AO-CEC-B module since it embeds the 32768Hz dual-divider
clock generator unlike the AO-CEC-A module.

Export it back to the public bindings.

Fixes: be3d960b0aeb ("dt-bindings: clk: add G12A AO Clock and Reset Bindings")
Signed-off-by: Neil Armstrong <[email protected]>
---
drivers/clk/meson/g12a-aoclk.h | 1 -
include/dt-bindings/clock/g12a-aoclkc.h | 1 +
2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/clk/meson/g12a-aoclk.h b/drivers/clk/meson/g12a-aoclk.h
index 666b4493822c..a67c8a7cd7c4 100644
--- a/drivers/clk/meson/g12a-aoclk.h
+++ b/drivers/clk/meson/g12a-aoclk.h
@@ -17,7 +17,6 @@
* will remain defined here.
*/
#define CLKID_AO_SAR_ADC_DIV 17
-#define CLKID_AO_CTS_OSCIN 19
#define CLKID_AO_32K_PRE 20
#define CLKID_AO_32K_DIV 21
#define CLKID_AO_32K_SEL 22
diff --git a/include/dt-bindings/clock/g12a-aoclkc.h b/include/dt-bindings/clock/g12a-aoclkc.h
index 5ac66a2eee0f..e916e49ff288 100644
--- a/include/dt-bindings/clock/g12a-aoclkc.h
+++ b/include/dt-bindings/clock/g12a-aoclkc.h
@@ -28,6 +28,7 @@
#define CLKID_AO_CLK81 15
#define CLKID_AO_SAR_ADC_SEL 16
#define CLKID_AO_SAR_ADC_CLK 18
+#define CLKID_AO_CTS_OSCIN 19
#define CLKID_AO_32K 23
#define CLKID_AO_CEC 27
#define CLKID_AO_CTS_RTC_OSCIN 28
--
2.21.0

2019-03-31 06:45:50

by Rob Herring (Arm)

Subject: Re: [PATCH] dt-bindings: clock: g12a-aoclk: expose CLKID_AO_CTS_OSCIN

On Thu, 21 Mar 2019 10:20:10 +0100, Neil Armstrong wrote:
> When submitted v2 of the G12A AO-CLK IDs, the CLKID_AO_CTS_OSCIN was moved
> to the internal non-exported bindings, but this clock is necessary for
> the second AO-CEC-B module since it embeds the 32768Hz dual-divider
> clock generator unlike the AO-CEC-A module.
>
> Export it back to the public bindings.
>
> Fixes: be3d960b0aeb ("dt-bindings: clk: add G12A AO Clock and Reset Bindings")
> Signed-off-by: Neil Armstrong <[email protected]>
> ---
> drivers/clk/meson/g12a-aoclk.h | 1 -
> include/dt-bindings/clock/g12a-aoclkc.h | 1 +
> 2 files changed, 1 insertion(+), 1 deletion(-)
>

Reviewed-by: Rob Herring <[email protected]>

2019-04-01 08:39:25

by Neil Armstrong

Subject: Re: [PATCH] dt-bindings: clock: g12a-aoclk: expose CLKID_AO_CTS_OSCIN

On 21/03/2019 10:20, Neil Armstrong wrote:
> When submitted v2 of the G12A AO-CLK IDs, the CLKID_AO_CTS_OSCIN was moved
> to the internal non-exported bindings, but this clock is necessary for
> the second AO-CEC-B module since it embeds the 32768Hz dual-divider
> clock generator unlike the AO-CEC-A module.
>
> Export it back to the public bindings.
>
> Fixes: be3d960b0aeb ("dt-bindings: clk: add G12A AO Clock and Reset Bindings")
> Signed-off-by: Neil Armstrong <[email protected]>
> ---
> drivers/clk/meson/g12a-aoclk.h | 1 -
> include/dt-bindings/clock/g12a-aoclkc.h | 1 +
> 2 files changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/clk/meson/g12a-aoclk.h b/drivers/clk/meson/g12a-aoclk.h
> index 666b4493822c..a67c8a7cd7c4 100644
> --- a/drivers/clk/meson/g12a-aoclk.h
> +++ b/drivers/clk/meson/g12a-aoclk.h
> @@ -17,7 +17,6 @@
> * will remain defined here.
> */
> #define CLKID_AO_SAR_ADC_DIV 17
> -#define CLKID_AO_CTS_OSCIN 19
> #define CLKID_AO_32K_PRE 20
> #define CLKID_AO_32K_DIV 21
> #define CLKID_AO_32K_SEL 22
> diff --git a/include/dt-bindings/clock/g12a-aoclkc.h b/include/dt-bindings/clock/g12a-aoclkc.h
> index 5ac66a2eee0f..e916e49ff288 100644
> --- a/include/dt-bindings/clock/g12a-aoclkc.h
> +++ b/include/dt-bindings/clock/g12a-aoclkc.h
> @@ -28,6 +28,7 @@
> #define CLKID_AO_CLK81 15
> #define CLKID_AO_SAR_ADC_SEL 16
> #define CLKID_AO_SAR_ADC_CLK 18
> +#define CLKID_AO_CTS_OSCIN 19
> #define CLKID_AO_32K 23
> #define CLKID_AO_CEC 27
> #define CLKID_AO_CTS_RTC_OSCIN 28
>

Applied to next/headers for Linux 5.2-rc1