Merge tag 'sunxi-dt-for-3.10-4' of git://github.com/mripard/linux into next/dt
From Maxime Ripard:
Fourth round of dt additions for 3.10
There's only one late patch that merge together two clocks that were
already defined in a previous patch.
* tag 'sunxi-dt-for-3.10-4' of git://github.com/mripard/linux:
ARM: sunxi: unify osc24M_fixed and osc24M
Signed-off-by: Olof Johansson <olof@lixom.net>
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 {
