Browse Source

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>
Emilio López 12 years ago
parent
commit
92fd6e066a
2 changed files with 2 additions and 14 deletions
  1. 1 7
      arch/arm/boot/dts/sun4i-a10.dtsi
  2. 1 7
      arch/arm/boot/dts/sun5i-a13.dtsi

+ 1 - 7
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 {

+ 1 - 7
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 {