Skip to content

Commit

Permalink
arm64: dts: allwinner: h6: Move ext. oscillator to board DTs
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Jernej Skrabec authored and Maxime Ripard committed Mar 9, 2020
1 parent 91f480d commit 32507b8
Show file tree
Hide file tree
Showing 5 changed files with 44 additions and 8 deletions.
11 changes: 11 additions & 0 deletions arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts
Original file line number Diff line number Diff line change
Expand Up @@ -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";

Expand Down Expand Up @@ -275,6 +282,10 @@
vcc-pm-supply = <&reg_aldo1>;
};

&rtc {
clocks = <&ext_osc32k>;
};

&spdif {
status = "okay";
};
Expand Down
11 changes: 11 additions & 0 deletions arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-3.dts
Original file line number Diff line number Diff line change
Expand Up @@ -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";

Expand Down Expand Up @@ -285,6 +292,10 @@
status = "okay";
};

&rtc {
clocks = <&ext_osc32k>;
};

&uart0 {
pinctrl-names = "default";
pinctrl-0 = <&uart0_ph_pins>;
Expand Down
11 changes: 11 additions & 0 deletions arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -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";

Expand Down Expand Up @@ -197,6 +204,10 @@
status = "okay";
};

&rtc {
clocks = <&ext_osc32k>;
};

&uart0 {
pinctrl-names = "default";
pinctrl-0 = <&uart0_ph_pins>;
Expand Down
11 changes: 11 additions & 0 deletions arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down Expand Up @@ -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.
Expand Down
8 changes: 0 additions & 8 deletions arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -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>,
Expand Down Expand Up @@ -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>;
};

Expand Down

0 comments on commit 32507b8

Please sign in to comment.