Merge tag 'sunxi-clocks-for-3.19' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux into clk-next

Allwinner Clocks additions for 3.19

A few patches that should go through the clock tree, mostly fixes, cleanups,
and new clocks additions to start to support the A80.

6 files changed, 12 insertions, 60 deletions

diff --git a/arch/arm/boot/dts/sun4i-a10.dtsi b/arch/arm/boot/dts/sun4i-a10.dtsi
index 380f914b226d..5e2ec2dd8333 100644
--- a/arch/arm/boot/dts/sun4i-a10.dtsi
+++ b/arch/arm/boot/dts/sun4i-a10.dtsi
@@ -174,19 +174,11 @@
                                 "apb0_ir1", "apb0_keypad";
                 };
 
-                apb1_mux: apb1_mux@01c20058 {
-                        #clock-cells = <0>;
-                        compatible = "allwinner,sun4i-a10-apb1-mux-clk";
-                        reg = <0x01c20058 0x4>;
-                        clocks = <&osc24M>, <&pll6 1>, <&osc32k>;
-                        clock-output-names = "apb1_mux";
-                };
-
-                apb1: apb1@01c20058 {
+                apb1: clk@01c20058 {
                         #clock-cells = <0>;
                         compatible = "allwinner,sun4i-a10-apb1-clk";
                         reg = <0x01c20058 0x4>;
-                        clocks = <&apb1_mux>;
+                        clocks = <&osc24M>, <&pll6 1>, <&osc32k>;
                         clock-output-names = "apb1";
                 };
 
diff --git a/arch/arm/boot/dts/sun5i-a10s.dtsi b/arch/arm/boot/dts/sun5i-a10s.dtsi
index 531272c0e526..d2a85144d2d9 100644
--- a/arch/arm/boot/dts/sun5i-a10s.dtsi
+++ b/arch/arm/boot/dts/sun5i-a10s.dtsi
@@ -162,19 +162,11 @@
                                 "apb0_ir", "apb0_keypad";
                 };
 
-                apb1_mux: apb1_mux@01c20058 {
-                        #clock-cells = <0>;
-                        compatible = "allwinner,sun4i-a10-apb1-mux-clk";
-                        reg = <0x01c20058 0x4>;
-                        clocks = <&osc24M>, <&pll6 1>, <&osc32k>;
-                        clock-output-names = "apb1_mux";
-                };
-
-                apb1: apb1@01c20058 {
+                apb1: clk@01c20058 {
                         #clock-cells = <0>;
                         compatible = "allwinner,sun4i-a10-apb1-clk";
                         reg = <0x01c20058 0x4>;
-                        clocks = <&apb1_mux>;
+                        clocks = <&osc24M>, <&pll6 1>, <&osc32k>;
                         clock-output-names = "apb1";
                 };
 
diff --git a/arch/arm/boot/dts/sun5i-a13.dtsi b/arch/arm/boot/dts/sun5i-a13.dtsi
index b131068f4f35..c35217ea1f64 100644
--- a/arch/arm/boot/dts/sun5i-a13.dtsi
+++ b/arch/arm/boot/dts/sun5i-a13.dtsi
@@ -161,19 +161,11 @@
                         clock-output-names = "apb0_codec", "apb0_pio", "apb0_ir";
                 };
 
-                apb1_mux: apb1_mux@01c20058 {
-                        #clock-cells = <0>;
-                        compatible = "allwinner,sun4i-a10-apb1-mux-clk";
-                        reg = <0x01c20058 0x4>;
-                        clocks = <&osc24M>, <&pll6 1>, <&osc32k>;
-                        clock-output-names = "apb1_mux";
-                };
-
-                apb1: apb1@01c20058 {
+                apb1: clk@01c20058 {
                         #clock-cells = <0>;
                         compatible = "allwinner,sun4i-a10-apb1-clk";
                         reg = <0x01c20058 0x4>;
-                        clocks = <&apb1_mux>;
+                        clocks = <&osc24M>, <&pll6 1>, <&osc32k>;
                         clock-output-names = "apb1";
                 };
 
diff --git a/arch/arm/boot/dts/sun6i-a31.dtsi b/arch/arm/boot/dts/sun6i-a31.dtsi
index 543f895d18d3..4083201e93c8 100644
--- a/arch/arm/boot/dts/sun6i-a31.dtsi
+++ b/arch/arm/boot/dts/sun6i-a31.dtsi
@@ -217,19 +217,11 @@
                                         "apb1_daudio1";
                 };
 
-                apb2_mux: apb2_mux@01c20058 {
+                apb2: clk@01c20058 {
                         #clock-cells = <0>;
-                        compatible = "allwinner,sun4i-a10-apb1-mux-clk";
+                        compatible = "allwinner,sun4i-a10-apb1-clk";
                         reg = <0x01c20058 0x4>;
                         clocks = <&osc32k>, <&osc24M>, <&pll6>, <&pll6>;
-                        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 82097c905c48..6d996c9e282a 100644
--- a/arch/arm/boot/dts/sun7i-a20.dtsi
+++ b/arch/arm/boot/dts/sun7i-a20.dtsi
@@ -222,19 +222,11 @@
                                 "apb0_iis2", "apb0_keypad";
                 };
 
-                apb1_mux: apb1_mux@01c20058 {
-                        #clock-cells = <0>;
-                        compatible = "allwinner,sun4i-a10-apb1-mux-clk";
-                        reg = <0x01c20058 0x4>;
-                        clocks = <&osc24M>, <&pll6 1>, <&osc32k>;
-                        clock-output-names = "apb1_mux";
-                };
-
-                apb1: apb1@01c20058 {
+                apb1: clk@01c20058 {
                         #clock-cells = <0>;
                         compatible = "allwinner,sun4i-a10-apb1-clk";
                         reg = <0x01c20058 0x4>;
-                        clocks = <&apb1_mux>;
+                        clocks = <&osc24M>, <&pll6 1>, <&osc32k>;
                         clock-output-names = "apb1";
                 };
 
diff --git a/arch/arm/boot/dts/sun8i-a23.dtsi b/arch/arm/boot/dts/sun8i-a23.dtsi
index 6146ef15efbe..701960e9d033 100644
--- a/arch/arm/boot/dts/sun8i-a23.dtsi
+++ b/arch/arm/boot/dts/sun8i-a23.dtsi
@@ -189,19 +189,11 @@
                                         "apb1_daudio0", "apb1_daudio1";
                 };
 
-                apb2_mux: apb2_mux_clk@01c20058 {
+                apb2: clk@01c20058 {
                         #clock-cells = <0>;
-                        compatible = "allwinner,sun4i-a10-apb1-mux-clk";
+                        compatible = "allwinner,sun4i-a10-apb1-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";
                 };