Patchwork [3/3] ARM: sunxi: unify osc24M_fixed and osc24M

login
register
mail settings
Submitter Emilio López
Date April 9, 2013, 1:48 p.m.
Message ID <1365515284-32061-4-git-send-email-emilio@elopez.com.ar>
Download mbox | patch
Permalink /patch/235090/
State New
Headers show

Comments

Emilio López - April 9, 2013, 1:48 p.m.
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>
---
 arch/arm/boot/dts/sunxi.dtsi | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)
Maxime Ripard - April 15, 2013, 8:45 a.m.
Hi,

Le 09/04/2013 15:48, Emilio López a écrit :
> 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>

Rebased and applied in my dt-for-3.10 branch.

Maxime

Patch

diff --git a/arch/arm/boot/dts/sunxi.dtsi b/arch/arm/boot/dts/sunxi.dtsi
index a8d47e2..2309272 100644
--- a/arch/arm/boot/dts/sunxi.dtsi
+++ b/arch/arm/boot/dts/sunxi.dtsi
@@ -39,17 +39,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";
+			clock-frequency = <24000000>;
 			reg = <0x01c20050 0x4>;
-			clocks = <&osc24M_fixed>;
 		};
 
 		osc32k: osc32k {