Merge remote-tracking branch 'thermal-soc/next'

[karo-tx-linux.git] / arch / arm / boot / dts / sun8i-a23-a33.dtsi

diff --git a/arch/arm/boot/dts/sun8i-a23-a33.dtsi b/arch/arm/boot/dts/sun8i-a23-a33.dtsi
index 6f88fb0ddbc7d13a1f2ee83befbdd111ee36dfb4..783b4b8b7c189e20f38199ce6e6eba1aafb65004 100644 (file)
--- a/arch/arm/boot/dts/sun8i-a23-a33.dtsi
+++ b/arch/arm/boot/dts/sun8i-a23-a33.dtsi
@@ -60,7 +60,7 @@
                        compatible = "allwinner,simple-framebuffer",
                                     "simple-framebuffer";
                        allwinner,pipeline = "de_be0-lcd0";
-                       clocks = <&pll6 0>;
+                       clocks = <&pll6>;
                        status = "disabled";
                };
        };
@@ -129,11 +129,20 @@
                };
 
                pll6: clk@01c20028 {
-                       #clock-cells = <1>;
+                       #clock-cells = <0>;
                        compatible = "allwinner,sun6i-a31-pll6-clk";
                        reg = <0x01c20028 0x4>;
                        clocks = <&osc24M>;
-                       clock-output-names = "pll6", "pll6x2";
+                       clock-output-names = "pll6";
+               };
+
+                pll6x2: pll6x2_clk {
+                       compatible = "fixed-factor-clock";
+                       #clock-cells = <0>;
+                       clock-div = <1>;
+                       clock-mult = <2>;
+                       clocks = <&pll6>;
+                       clock-output-names = "pll6-2x";
                };
 
                cpu: cpu_clk@01c20050 {
@@ -163,7 +172,7 @@
                        #clock-cells = <0>;
                        compatible = "allwinner,sun6i-a31-ahb1-clk";
                        reg = <0x01c20054 0x4>;
-                       clocks = <&osc32k>, <&osc24M>, <&axi>, <&pll6 0>;
+                       clocks = <&osc32k>, <&osc24M>, <&axi>, <&pll6>;
                        clock-output-names = "ahb1";
                };
 
@@ -190,7 +199,7 @@
                        #clock-cells = <0>;
                        compatible = "allwinner,sun4i-a10-apb1-clk";
                        reg = <0x01c20058 0x4>;
-                       clocks = <&osc32k>, <&osc24M>, <&pll6 0>, <&pll6 0>;
+                       clocks = <&osc32k>, <&osc24M>, <&pll6>, <&pll6>;
                        clock-output-names = "apb2";
                };
 
@@ -213,7 +222,7 @@
                        #clock-cells = <1>;
                        compatible = "allwinner,sun4i-a10-mmc-clk";
                        reg = <0x01c20088 0x4>;
-                       clocks = <&osc24M>, <&pll6 0>;
+                       clocks = <&osc24M>, <&pll6>;
                        clock-output-names = "mmc0",
                                             "mmc0_output",
                                             "mmc0_sample";
@@ -223,7 +232,7 @@
                        #clock-cells = <1>;
                        compatible = "allwinner,sun4i-a10-mmc-clk";
                        reg = <0x01c2008c 0x4>;
-                       clocks = <&osc24M>, <&pll6 0>;
+                       clocks = <&osc24M>, <&pll6>;
                        clock-output-names = "mmc1",
                                             "mmc1_output",
                                             "mmc1_sample";
@@ -233,7 +242,7 @@
                        #clock-cells = <1>;
                        compatible = "allwinner,sun4i-a10-mmc-clk";
                        reg = <0x01c20090 0x4>;
-                       clocks = <&osc24M>, <&pll6 0>;
+                       clocks = <&osc24M>, <&pll6>;
                        clock-output-names = "mmc2",
                                             "mmc2_output",
                                             "mmc2_sample";
@@ -381,7 +390,7 @@
                                allwinner,pins = "PC5", "PC6", "PC8",
                                                 "PC9", "PC10", "PC11",
                                                 "PC12", "PC13", "PC14",
-                                                "PC15";
+                                                "PC15", "PC16";
                                allwinner,function = "mmc2";
                                allwinner,drive = <SUN4I_PINCTRL_30_MA>;
                                allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;