Merge branch 'sunxi/dt' into next/dt

This avoids a boot regression

* sunxi/dt:
  Revert "ARM: dts: sunxi: unify APB1 clock"
  Revert "ARM: dts: sunxi: Use sun4i-a10-apb1-clk for sun6i/sun8i apb2 clocks."

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

6 files changed, 60 insertions, 12 deletions

diff --git a/arch/arm/boot/dts/sun4i-a10.dtsi b/arch/arm/boot/dts/sun4i-a10.dtsi
index 5e2ec2dd8333..380f914b226d 100644
--- a/arch/arm/boot/dts/sun4i-a10.dtsi
+++ b/arch/arm/boot/dts/sun4i-a10.dtsi
@@ -174,11 +174,19 @@
                                 "apb0_ir1", "apb0_keypad";
                 };
 
-                apb1: clk@01c20058 {
+                apb1_mux: apb1_mux@01c20058 {
                         #clock-cells = <0>;
-                        compatible = "allwinner,sun4i-a10-apb1-clk";
+                        compatible = "allwinner,sun4i-a10-apb1-mux-clk";
                         reg = <0x01c20058 0x4>;
                         clocks = <&osc24M>, <&pll6 1>, <&osc32k>;
+                        clock-output-names = "apb1_mux";
+                };
+
+                apb1: apb1@01c20058 {
+                        #clock-cells = <0>;
+                        compatible = "allwinner,sun4i-a10-apb1-clk";
+                        reg = <0x01c20058 0x4>;
+                        clocks = <&apb1_mux>;
                         clock-output-names = "apb1";
                 };
 
diff --git a/arch/arm/boot/dts/sun5i-a10s.dtsi b/arch/arm/boot/dts/sun5i-a10s.dtsi
index d2a85144d2d9..531272c0e526 100644
--- a/arch/arm/boot/dts/sun5i-a10s.dtsi
+++ b/arch/arm/boot/dts/sun5i-a10s.dtsi
@@ -162,11 +162,19 @@
                                 "apb0_ir", "apb0_keypad";
                 };
 
-                apb1: clk@01c20058 {
+                apb1_mux: apb1_mux@01c20058 {
                         #clock-cells = <0>;
-                        compatible = "allwinner,sun4i-a10-apb1-clk";
+                        compatible = "allwinner,sun4i-a10-apb1-mux-clk";
                         reg = <0x01c20058 0x4>;
                         clocks = <&osc24M>, <&pll6 1>, <&osc32k>;
+                        clock-output-names = "apb1_mux";
+                };
+
+                apb1: apb1@01c20058 {
+                        #clock-cells = <0>;
+                        compatible = "allwinner,sun4i-a10-apb1-clk";
+                        reg = <0x01c20058 0x4>;
+                        clocks = <&apb1_mux>;
                         clock-output-names = "apb1";
                 };
 
diff --git a/arch/arm/boot/dts/sun5i-a13.dtsi b/arch/arm/boot/dts/sun5i-a13.dtsi
index c35217ea1f64..b131068f4f35 100644
--- a/arch/arm/boot/dts/sun5i-a13.dtsi
+++ b/arch/arm/boot/dts/sun5i-a13.dtsi
@@ -161,11 +161,19 @@
                         clock-output-names = "apb0_codec", "apb0_pio", "apb0_ir";
                 };
 
-                apb1: clk@01c20058 {
+                apb1_mux: apb1_mux@01c20058 {
                         #clock-cells = <0>;
-                        compatible = "allwinner,sun4i-a10-apb1-clk";
+                        compatible = "allwinner,sun4i-a10-apb1-mux-clk";
                         reg = <0x01c20058 0x4>;
                         clocks = <&osc24M>, <&pll6 1>, <&osc32k>;
+                        clock-output-names = "apb1_mux";
+                };
+
+                apb1: apb1@01c20058 {
+                        #clock-cells = <0>;
+                        compatible = "allwinner,sun4i-a10-apb1-clk";
+                        reg = <0x01c20058 0x4>;
+                        clocks = <&apb1_mux>;
                         clock-output-names = "apb1";
                 };
 
diff --git a/arch/arm/boot/dts/sun6i-a31.dtsi b/arch/arm/boot/dts/sun6i-a31.dtsi
index f1519a8a2ac7..529c73803976 100644
--- a/arch/arm/boot/dts/sun6i-a31.dtsi
+++ b/arch/arm/boot/dts/sun6i-a31.dtsi
@@ -217,11 +217,19 @@
                                         "apb1_daudio1";
                 };
 
-                apb2: clk@01c20058 {
+                apb2_mux: apb2_mux@01c20058 {
                         #clock-cells = <0>;
-                        compatible = "allwinner,sun4i-a10-apb1-clk";
+                        compatible = "allwinner,sun4i-a10-apb1-mux-clk";
                         reg = <0x01c20058 0x4>;
                         clocks = <&osc32k>, <&osc24M>, <&pll6 0>, <&pll6 0>;
+                        clock-output-names = "apb2_mux";
+                };
+
+                apb2: apb2@01c20058 {
+                        #clock-cells = <0>;
+                        compatible = "allwinner,sun6i-a31-apb2-div-clk";
+                        reg = <0x01c20058 0x4>;
+                        clocks = <&apb2_mux>;
                         clock-output-names = "apb2";
                 };
 
diff --git a/arch/arm/boot/dts/sun7i-a20.dtsi b/arch/arm/boot/dts/sun7i-a20.dtsi
index 7e30e267c317..d7135f5282bc 100644
--- a/arch/arm/boot/dts/sun7i-a20.dtsi
+++ b/arch/arm/boot/dts/sun7i-a20.dtsi
@@ -222,11 +222,19 @@
                                 "apb0_iis2", "apb0_keypad";
                 };
 
-                apb1: clk@01c20058 {
+                apb1_mux: apb1_mux@01c20058 {
                         #clock-cells = <0>;
-                        compatible = "allwinner,sun4i-a10-apb1-clk";
+                        compatible = "allwinner,sun4i-a10-apb1-mux-clk";
                         reg = <0x01c20058 0x4>;
                         clocks = <&osc24M>, <&pll6 1>, <&osc32k>;
+                        clock-output-names = "apb1_mux";
+                };
+
+                apb1: apb1@01c20058 {
+                        #clock-cells = <0>;
+                        compatible = "allwinner,sun4i-a10-apb1-clk";
+                        reg = <0x01c20058 0x4>;
+                        clocks = <&apb1_mux>;
                         clock-output-names = "apb1";
                 };
 
diff --git a/arch/arm/boot/dts/sun8i-a23.dtsi b/arch/arm/boot/dts/sun8i-a23.dtsi
index 0746cd1024d7..6086adbf9d74 100644
--- a/arch/arm/boot/dts/sun8i-a23.dtsi
+++ b/arch/arm/boot/dts/sun8i-a23.dtsi
@@ -189,11 +189,19 @@
                                         "apb1_daudio0", "apb1_daudio1";
                 };
 
-                apb2: clk@01c20058 {
+                apb2_mux: apb2_mux_clk@01c20058 {
                         #clock-cells = <0>;
-                        compatible = "allwinner,sun4i-a10-apb1-clk";
+                        compatible = "allwinner,sun4i-a10-apb1-mux-clk";
                         reg = <0x01c20058 0x4>;
                         clocks = <&osc32k>, <&osc24M>, <&pll6>, <&pll6>;
+                        clock-output-names = "apb2_mux";
+                };
+
+                apb2: apb2_clk@01c20058 {
+                        #clock-cells = <0>;
+                        compatible = "allwinner,sun6i-a31-apb2-div-clk";
+                        reg = <0x01c20058 0x4>;
+                        clocks = <&apb2_mux>;
                         clock-output-names = "apb2";
                 };