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>

diff --git a/arch/arm/boot/dts/sun4i-a10.dtsi b/arch/arm/boot/dts/sun4i-a10.dtsi
index 5619a213da99d66c519a58ec36c6aaa7885e6e41..e7ef619a70a2531440400086cdac4ee6ae3b71eb 100644 (file)
--- 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 391bcb70858be77a5e701277cd652466b6b596c7..31fa38f8cc9851788e1aea09f1c5853eb397ae7e 100644 (file)
--- 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 {