ARM: dts: rockchip: move oscillator input clock into main dtsi

The clock definitions get a lot shorter due to the soc clocks being handled by
rk3188-cru and only the input clock remains. These can now simply live
in the main rk3xxx.dtsi without affecting readability.

At the same time, rename the node to oscillator, adding a clock-output-names
property to match how the rk3288 handles this.

Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Acked-By: Max Schwarz <max.schwarz@online.de>
Tested-By: Max Schwarz <max.schwarz@online.de>

diff --git a/arch/arm/boot/dts/rk3066a-clocks.dtsi b/arch/arm/boot/dts/rk3066a-clocks.dtsi
index 6e307fc4c451d6cfc90a132fe532aa293a2e9158..0d4d667b82dc0efbdaa168ed4301dca63deec4ae 100644 (file)
--- a/arch/arm/boot/dts/rk3066a-clocks.dtsi
+++ b/arch/arm/boot/dts/rk3066a-clocks.dtsi
@@ -31,12 +31,6 @@
                        #clock-cells = <0>;
                };
 
-               xin24m: xin24m {
-                       compatible = "fixed-clock";
-                       clock-frequency = <24000000>;
-                       #clock-cells = <0>;
-               };
-
                dummy48m: dummy48m {
                        compatible = "fixed-clock";
                        clock-frequency = <48000000>;

diff --git a/arch/arm/boot/dts/rk3188-clocks.dtsi b/arch/arm/boot/dts/rk3188-clocks.dtsi
index b1b92dc245ce0dbe62fd4b8335eeeee8658dd6d3..6bc0373a2fb8ac4545e5c979ea855a327cea4c75 100644 (file)
--- a/arch/arm/boot/dts/rk3188-clocks.dtsi
+++ b/arch/arm/boot/dts/rk3188-clocks.dtsi
@@ -31,12 +31,6 @@
                        #clock-cells = <0>;
                };
 
-               xin24m: xin24m {
-                       compatible = "fixed-clock";
-                       clock-frequency = <24000000>;
-                       #clock-cells = <0>;
-               };
-
                dummy48m: dummy48m {
                        compatible = "fixed-clock";
                        clock-frequency = <48000000>;

diff --git a/arch/arm/boot/dts/rk3xxx.dtsi b/arch/arm/boot/dts/rk3xxx.dtsi
index b47d5fe8118735655f14fbb078cc8cd50c380e63..6d163644c7cd6f4dc8e7e85996bb4e910243b6c6 100644 (file)
--- a/arch/arm/boot/dts/rk3xxx.dtsi
+++ b/arch/arm/boot/dts/rk3xxx.dtsi
@@ -20,6 +20,13 @@
 / {
        interrupt-parent = <&gic>;
 
+       xin24m: oscillator {
+               compatible = "fixed-clock";
+               clock-frequency = <24000000>;
+               #clock-cells = <0>;
+               clock-output-names = "xin24m";
+       };
+
        soc {
                #address-cells = <1>;
                #size-cells = <1>;