diff options
| author | Heiko Stuebner <heiko@sntech.de> | 2014-04-15 19:44:59 +0200 |
|---|---|---|
| committer | Heiko Stuebner <heiko@sntech.de> | 2014-07-26 23:15:31 +0200 |
| commit | 560106c1ca063e7cbbb527c0df2c6929cb36c6ae (patch) | |
| tree | 3c0fbed4dce6487cd1be65bbe6e3d4292e811cc2 /arch | |
| parent | b13d2a7b43654c7f52aba9dc04f93cf7055ebc8b (diff) | |
| download | linux-560106c1ca063e7cbbb527c0df2c6929cb36c6ae.tar.bz2 | |
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>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boot/dts/rk3066a-clocks.dtsi | 6 | ||||
| -rw-r--r-- | arch/arm/boot/dts/rk3188-clocks.dtsi | 6 | ||||
| -rw-r--r-- | arch/arm/boot/dts/rk3xxx.dtsi | 7 |
3 files changed, 7 insertions, 12 deletions
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>; diff --git a/arch/arm/boot/dts/rk3xxx.dtsi b/arch/arm/boot/dts/rk3xxx.dtsi index b47d5fe81187..6d163644c7cd 100644 --- 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>; |