[PATCH 0/2] arm64: meson: g12a: enable peripheral clock controller

[PATCH 0/2] arm64: meson: g12a: enable peripheral clock controller

[Jerome Brunet]

This patchset selects the required configuration flag and adds the
DT node of the main clock controller for g12a SoC family.

FYI, the configuration flag and DT bindings have been introduced by
this series [0].

[0]: https://lkml.kernel.org/r/20190201145345.6795-1-jbrunet@baylibre.com

Jerome Brunet (2):
  arm64: meson: enable g12a clock controller
  arm64: dts: meson: g12a: add peripheral clock controller

 arch/arm64/Kconfig.platforms                |  4 +++-
 arch/arm64/boot/dts/amlogic/meson-g12a.dtsi | 13 +++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

-- 
2.20.1

[PATCH 1/2] arm64: meson: enable g12a clock controller

[Jerome Brunet]

Enable the g12a clock controller for ARCH_MESON

Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
---
 arch/arm64/Kconfig.platforms | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms
index 819e74ae9224..d0e0bd4af05d 100644
--- a/arch/arm64/Kconfig.platforms
+++ b/arch/arm64/Kconfig.platforms
@@ -114,9 +114,11 @@ config ARCH_MESON
 	select PINCTRL_MESON
 	select COMMON_CLK_GXBB
 	select COMMON_CLK_AXG
+	select COMMON_CLK_G12A
 	select MESON_IRQ_GPIO
 	help
-	  This enables support for the Amlogic S905 SoCs.
+	  This enables support for the arm64 based Amlogic SoCs
+	  such as the s905, S905X/D, S912, A113X/D or S905X/D2
 
 config ARCH_MVEBU
 	bool "Marvell EBU SoC Family"
-- 
2.20.1

Re: [PATCH 1/2] arm64: meson: enable g12a clock controller

[Kevin Hilman]

Jerome Brunet <jbrunet@baylibre.com> writes:

> Enable the g12a clock controller for ARCH_MESON
>
> Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
> ---
>  arch/arm64/Kconfig.platforms | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms
> index 819e74ae9224..d0e0bd4af05d 100644
> --- a/arch/arm64/Kconfig.platforms
> +++ b/arch/arm64/Kconfig.platforms
> @@ -114,9 +114,11 @@ config ARCH_MESON
>  	select PINCTRL_MESON
>  	select COMMON_CLK_GXBB
>  	select COMMON_CLK_AXG
> +	select COMMON_CLK_G12A
>  	select MESON_IRQ_GPIO
>  	help
> -	  This enables support for the Amlogic S905 SoCs.
> +	  This enables support for the arm64 based Amlogic SoCs
> +	  such as the s905, S905X/D, S912, A113X/D or S905X/D2

Queued for v5.1.

nit: s/s905/S905/ to match the others.  I'll fix that up when applying
to my v5.1/soc branch.

Kevin

[PATCH 2/2] arm64: dts: meson: g12a: add peripheral clock controller

[Jerome Brunet]

Add the peripheral clock controller to the g12a SoC DT

Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
---
 arch/arm64/boot/dts/amlogic/meson-g12a.dtsi | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi
index 05ea750b8c16..701a02244e04 100644
--- a/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi
@@ -121,6 +121,19 @@
 				#address-cells = <2>;
 				#size-cells = <2>;
 				ranges = <0x0 0x0 0x0 0x3c000 0x0 0x1400>;
+
+				hhi: system-controller@0 {
+					compatible = "amlogic,meson-gx-hhi-sysctrl",
+						     "simple-mfd", "syscon";
+					reg = <0 0 0 0x400>;
+
+					clkc: clock-controller {
+						compatible = "amlogic,g12a-clkc";
+						#clock-cells = <1>;
+						clocks = <&xtal>;
+						clock-names = "xtal";
+					};
+				};
 			};
 		};
 
-- 
2.20.1

Re: [PATCH 2/2] arm64: dts: meson: g12a: add peripheral clock controller

[Kevin Hilman]

Jerome Brunet <jbrunet@baylibre.com> writes:

> Add the peripheral clock controller to the g12a SoC DT
>
> Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>

Queued for v5.1 (branch: v5.1/dt64)

Kevin