Unverified Commit 32507b86 authored by Jernej Skrabec's avatar Jernej Skrabec Committed by Maxime Ripard
Browse files

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: default avatarJernej Skrabec <jernej.skrabec@siol.net>
Signed-off-by: default avatarMaxime Ripard <maxime@cerno.tech>
parent 91f480d4

arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts

+11 −0
Original line number Diff line number Diff line
@@ -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";

};

arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-3.dts

+11 −0
Original line number Diff line number Diff line
@@ -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>;

arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi.dtsi

+11 −0
Original line number Diff line number Diff line
@@ -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>;

arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts

+11 −0
Original line number Diff line number Diff line
@@ -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.

arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi

+0 −8
Original line number Diff line number Diff line
@@ -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>;

		};