From: Emilio López Date: Tue, 9 Apr 2013 13:48:04 +0000 (-0300) Subject: ARM: sunxi: unify osc24M_fixed and osc24M X-Git-Tag: next-20130422~16^2~24^2^2 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=92fd6e066a4ecdf161710afe6460bc372899ae5f;p=karo-tx-linux.git 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 Signed-off-by: Maxime Ripard --- 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 @@ 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 391bcb70858b..31fa38f8cc98 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 {