diff options
| author | Emilio López <emilio@elopez.com.ar> | 2013-04-09 13:48:04 (GMT) |
|---|---|---|
| committer | Maxime Ripard <maxime.ripard@free-electrons.com> | 2013-04-15 08:24:54 (GMT) |
| commit | 92fd6e066a4ecdf161710afe6460bc372899ae5f (patch) | |
| tree | 9c933fff461149e8b5a965417b8dfbc967048a0a | |
| parent | 0b19b7c2c6e169efccb4b1632fe628969d001618 (diff) | |
| download | linux-92fd6e066a4ecdf161710afe6460bc372899ae5f.tar.xz | |
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 5619a21..e7ef619 100644 --- a/arch/arm/boot/dts/sun4i-a10.dtsi +++ b/arch/arm/boot/dts/sun4i-a10.dtsi @@ -42,17 +42,11 @@ clock-frequency = <0>; }; - osc24M_fixed: osc24M_fixed { - #clock-cells = <0>; - compatible = "fixed-clock"; - clock-frequency = <24000000>; - }; - osc24M: osc24M@01c20050 { #clock-cells = <0>; compatible = "allwinner,sun4i-osc-clk"; reg = <0x01c20050 0x4>; - clocks = <&osc24M_fixed>; + clock-frequency = <24000000>; }; osc32k: osc32k { diff --git a/arch/arm/boot/dts/sun5i-a13.dtsi b/arch/arm/boot/dts/sun5i-a13.dtsi index 391bcb7..31fa38f 100644 --- a/arch/arm/boot/dts/sun5i-a13.dtsi +++ b/arch/arm/boot/dts/sun5i-a13.dtsi @@ -43,17 +43,11 @@ clock-frequency = <0>; }; - osc24M_fixed: osc24M_fixed { - #clock-cells = <0>; - compatible = "fixed-clock"; - clock-frequency = <24000000>; - }; - osc24M: osc24M@01c20050 { #clock-cells = <0>; compatible = "allwinner,sun4i-osc-clk"; reg = <0x01c20050 0x4>; - clocks = <&osc24M_fixed>; + clock-frequency = <24000000>; }; osc32k: osc32k { |