Skip to contentSkip to conversation

arm64: meson: g12a: enable peripheral clock controller

PATCH Applied Jerome Brunet 2 participants 5 messages Feb 8, 2019

Subsystems (3)
lore
Share & tools
lore

Jerome Brunet

author reviewer
#0 lore raw

cover arm64: meson: g12a: enable peripheral clock controller

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/[email protected]

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(-)
Signature · 1 line
2.20.1
author reviewer
#1 lore raw

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

Enable the g12a clock controller for ARCH_MESON

---
 arch/arm64/Kconfig.platforms | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
arch/arm64/Kconfig.platforms +3 -1
index 819e74ae9224..d0e0bd4af05d 100644
@@ -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"
Signature · 1 line
2.20.1
maintainer
#2 lore raw

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

Quoted 12 lines · Jerome Brunet

Enable the g12a clock controller for ARCH_MESON

---
 arch/arm64/Kconfig.platforms | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
arch/arm64/Kconfig.platforms +0 -0
index 819e74ae9224..d0e0bd4af05d 100644

arch/arm64/Kconfig.platforms config ARCH_MESON · line 121

Quoted 9 lines
arch/arm64/Kconfig.platforms +3 -1
@@ -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

author reviewer
#3 lore raw

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

In reply to Jerome Brunet

Add the peripheral clock controller to the g12a SoC DT

---
 arch/arm64/boot/dts/amlogic/meson-g12a.dtsi | 13 +++++++++++++
 1 file changed, 13 insertions(+)
arch/arm64/boot/dts/amlogic/meson-g12a.dtsi +13 -0
index 05ea750b8c16..701a02244e04 100644
@@ -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";
+					};
+				};
 			};
 		};
 
Signature · 1 line
2.20.1
maintainer Applied
#4 lore raw

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

Quoted 3 lines · Jerome Brunet

Add the peripheral clock controller to the g12a SoC DT

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

Kevin