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 | |
| 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>
| -rw-r--r-- | arch/arm/boot/dts/sun4i-a10.dtsi | 8 | ||||
| -rw-r--r-- | arch/arm/boot/dts/sun5i-a13.dtsi | 8 |
2 files changed, 2 insertions, 14 deletions
diff --git a/arch/arm/boot/dts/sun4i-a10.dtsi b/arch/arm/boot/dts/sun4i-a10.dtsi index 5619a213da99..e7ef619a70a2 100644 --- a/arch/arm/boot/dts/sun4i-a10.dtsi +++ b/arch/arm/boot/dts/sun4i-a10.dtsi | |||
| @@ -42,17 +42,11 @@ | |||
| 42 | clock-frequency = <0>; | 42 | clock-frequency = <0>; |
| 43 | }; | 43 | }; |
| 44 | 44 | ||
| 45 | osc24M_fixed: osc24M_fixed { | ||
| 46 | #clock-cells = <0>; | ||
| 47 | compatible = "fixed-clock"; | ||
| 48 | clock-frequency = <24000000>; | ||
| 49 | }; | ||
| 50 | |||
| 51 | osc24M: osc24M@01c20050 { | 45 | osc24M: osc24M@01c20050 { |
| 52 | #clock-cells = <0>; | 46 | #clock-cells = <0>; |
| 53 | compatible = "allwinner,sun4i-osc-clk"; | 47 | compatible = "allwinner,sun4i-osc-clk"; |
| 54 | reg = <0x01c20050 0x4>; | 48 | reg = <0x01c20050 0x4>; |
| 55 | clocks = <&osc24M_fixed>; | 49 | clock-frequency = <24000000>; |
| 56 | }; | 50 | }; |
| 57 | 51 | ||
| 58 | osc32k: osc32k { | 52 | osc32k: osc32k { |
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 { |