diff options
author | Emilio López <emilio@elopez.com.ar> | 2013-04-09 09:48:04 -0400 |
---|---|---|
committer | Maxime Ripard <maxime.ripard@free-electrons.com> | 2013-04-15 04:24:54 -0400 |
commit | 92fd6e066a4ecdf161710afe6460bc372899ae5f (patch) | |
tree | 9c933fff461149e8b5a965417b8dfbc967048a0a /arch/arm/boot/dts/sun5i-a13.dtsi | |
parent | 0b19b7c2c6e169efccb4b1632fe628969d001618 (diff) |
ARM: sunxi: unify osc24M_fixed and osc24M
Now that the clock driver supports the gatable oscillator as one single
clock, drop osc24M_fixed and move the relevant properties to osc24M
Signed-off-by: Emilio López <emilio@elopez.com.ar>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Diffstat (limited to 'arch/arm/boot/dts/sun5i-a13.dtsi')
-rw-r--r-- | arch/arm/boot/dts/sun5i-a13.dtsi | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/arch/arm/boot/dts/sun5i-a13.dtsi b/arch/arm/boot/dts/sun5i-a13.dtsi index 391bcb70858b..31fa38f8cc98 100644 --- a/arch/arm/boot/dts/sun5i-a13.dtsi +++ b/arch/arm/boot/dts/sun5i-a13.dtsi | |||
@@ -43,17 +43,11 @@ | |||
43 | clock-frequency = <0>; | 43 | clock-frequency = <0>; |
44 | }; | 44 | }; |
45 | 45 | ||
46 | osc24M_fixed: osc24M_fixed { | ||
47 | #clock-cells = <0>; | ||
48 | compatible = "fixed-clock"; | ||
49 | clock-frequency = <24000000>; | ||
50 | }; | ||
51 | |||
52 | osc24M: osc24M@01c20050 { | 46 | osc24M: osc24M@01c20050 { |
53 | #clock-cells = <0>; | 47 | #clock-cells = <0>; |
54 | compatible = "allwinner,sun4i-osc-clk"; | 48 | compatible = "allwinner,sun4i-osc-clk"; |
55 | reg = <0x01c20050 0x4>; | 49 | reg = <0x01c20050 0x4>; |
56 | clocks = <&osc24M_fixed>; | 50 | clock-frequency = <24000000>; |
57 | }; | 51 | }; |
58 | 52 | ||
59 | osc32k: osc32k { | 53 | osc32k: osc32k { |