arm64: dts: allwinner: h6: Move ext. oscillator to board DTs

It turns out that not all H6 boards have external 32kHz oscillator.
Currently the only one known such H6 board is Tanix TX6.

Move external oscillator node from common H6 dtsi to board specific dts
files where present.

Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>
Signed-off-by: Maxime Ripard <maxime@cerno.tech>

diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts b/arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts
index df6d872c34e24a1914b5e818a1b545d0674c5ef6..8f09d209359b74c8edd0d6fb5861ec52fbbb3038 100644 (file)
--- a/arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts
@@ -32,6 +32,13 @@
                };
        };
 
+       ext_osc32k: ext_osc32k_clk {
+               #clock-cells = <0>;
+               compatible = "fixed-clock";
+               clock-frequency = <32768>;
+               clock-output-names = "ext_osc32k";
+       };
+
        leds {
                compatible = "gpio-leds";
 
@@ -275,6 +282,10 @@
        vcc-pm-supply = <&reg_aldo1>;
 };
 
+&rtc {
+       clocks = <&ext_osc32k>;
+};
+
 &spdif {
        status = "okay";
 };

diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-3.dts b/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-3.dts
index 1e0abd9d047fa4a30113c06f1c67008098af978b..47f579610dcc3dc2bcb2efe5ee6833b68c790b47 100644 (file)
--- a/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-3.dts
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-3.dts
@@ -32,6 +32,13 @@
                };
        };
 
+       ext_osc32k: ext_osc32k_clk {
+               #clock-cells = <0>;
+               compatible = "fixed-clock";
+               clock-frequency = <32768>;
+               clock-output-names = "ext_osc32k";
+       };
+
        leds {
                compatible = "gpio-leds";
 
@@ -285,6 +292,10 @@
        status = "okay";
 };
 
+&rtc {
+       clocks = <&ext_osc32k>;
+};
+
 &uart0 {
        pinctrl-names = "default";
        pinctrl-0 = <&uart0_ph_pins>;

diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi.dtsi
index 37f4c57597d4277e52a6f4cb8965f0105b08ae4e..37fc3f3697f7b840243683358251841b7bbf1436 100644 (file)
--- a/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi.dtsi
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi.dtsi
@@ -20,6 +20,13 @@
                stdout-path = "serial0:115200n8";
        };
 
+       ext_osc32k: ext_osc32k_clk {
+               #clock-cells = <0>;
+               compatible = "fixed-clock";
+               clock-frequency = <32768>;
+               clock-output-names = "ext_osc32k";
+       };
+
        leds {
                compatible = "gpio-leds";
 
@@ -197,6 +204,10 @@
        status = "okay";
 };
 
+&rtc {
+       clocks = <&ext_osc32k>;
+};
+
 &uart0 {
        pinctrl-names = "default";
        pinctrl-0 = <&uart0_ph_pins>;

diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts b/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts
index 3c9dd0d69754e1b34d789a423eb364ab05f0f197..b0642d84193350891d33607e8255d8951eda52e6 100644 (file)
--- a/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts
@@ -21,6 +21,13 @@
                stdout-path = "serial0:115200n8";
        };
 
+       ext_osc32k: ext_osc32k_clk {
+               #clock-cells = <0>;
+               compatible = "fixed-clock";
+               clock-frequency = <32768>;
+               clock-output-names = "ext_osc32k";
+       };
+
        hdmi_connector: connector {
                compatible = "hdmi-connector";
                type = "a";
@@ -279,6 +286,10 @@
        vcc-pm-supply = <&reg_aldo1>;
 };
 
+&rtc {
+       clocks = <&ext_osc32k>;
+};
+
 /*
  * The CS pin is shared with the MMC2 CMD pin, so we cannot have the SPI
  * flash and eMMC at the same time, as one of them would fail probing.

diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi
index 967249e5881149d9bbad0dc122ab5d5fc2212473..b9ab7d8fa8af81b7ebe26d99ca89162e131e55fd 100644 (file)
--- a/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi
@@ -62,13 +62,6 @@
                clock-output-names = "osc24M";
        };
 
-       ext_osc32k: ext_osc32k_clk {
-               #clock-cells = <0>;
-               compatible = "fixed-clock";
-               clock-frequency = <32768>;
-               clock-output-names = "ext_osc32k";
-       };
-
        pmu {
                compatible = "arm,cortex-a53-pmu";
                interrupts = <GIC_SPI 140 IRQ_TYPE_LEVEL_HIGH>,
@@ -854,7 +847,6 @@
                        interrupts = <GIC_SPI 101 IRQ_TYPE_LEVEL_HIGH>,
                                     <GIC_SPI 102 IRQ_TYPE_LEVEL_HIGH>;
                        clock-output-names = "osc32k", "osc32k-out", "iosc";
-                       clocks = <&ext_osc32k>;
                        #clock-cells = <1>;
                };