From: Heiko Stuebner Date: Tue, 15 Apr 2014 17:44:59 +0000 (+0200) Subject: ARM: dts: rockchip: move oscillator input clock into main dtsi X-Git-Tag: cleanup-for-v3.18~79^2~10^2~13 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=560106c1ca063e7cbbb527c0df2c6929cb36c6ae;p=pandora-kernel.git 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 Acked-By: Max Schwarz Tested-By: Max Schwarz --- diff --git a/arch/arm/boot/dts/rk3066a-clocks.dtsi b/arch/arm/boot/dts/rk3066a-clocks.dtsi index 6e307fc4c451..0d4d667b82dc 100644 --- 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 b1b92dc245ce..6bc0373a2fb8 100644 --- 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>; Reading git-diff-tree failed