Merge remote-tracking branch 'mmc-uh/next'

diff --cc arch/arm/boot/dts/sun6i-a31.dtsi
index 6a84fe7e9ab267c2eb9a5df4280d373c850aa659,0d24f107ede0ba127dae0d1b27206fa523bb192e..ce1960453a0bb96bda88162a50e4826a0fdfb172
--- 1/arch/arm/boot/dts/sun6i-a31.dtsi
--- 2/arch/arm/boot/dts/sun6i-a31.dtsi
+++ b/arch/arm/boot/dts/sun6i-a31.dtsi
@@@ -247,12 -469,12 +247,12 @@@
                };
  
                mmc0: mmc@01c0f000 {
-                       compatible = "allwinner,sun5i-a13-mmc";
+                       compatible = "allwinner,sun7i-a20-mmc";
                        reg = <0x01c0f000 0x1000>;
 -                      clocks = <&ahb1_gates 8>,
 -                               <&mmc0_clk 0>,
 -                               <&mmc0_clk 1>,
 -                               <&mmc0_clk 2>;
 +                      clocks = <&ccu CLK_AHB1_MMC0>,
 +                               <&ccu CLK_MMC0>,
 +                               <&ccu CLK_MMC0_OUTPUT>,
 +                               <&ccu CLK_MMC0_SAMPLE>;
                        clock-names = "ahb",
                                      "mmc",
                                      "output",
@@@ -266,12 -488,12 +266,12 @@@
                };
  
                mmc1: mmc@01c10000 {
-                       compatible = "allwinner,sun5i-a13-mmc";
+                       compatible = "allwinner,sun7i-a20-mmc";
                        reg = <0x01c10000 0x1000>;
 -                      clocks = <&ahb1_gates 9>,
 -                               <&mmc1_clk 0>,
 -                               <&mmc1_clk 1>,
 -                               <&mmc1_clk 2>;
 +                      clocks = <&ccu CLK_AHB1_MMC1>,
 +                               <&ccu CLK_MMC1>,
 +                               <&ccu CLK_MMC1_OUTPUT>,
 +                               <&ccu CLK_MMC1_SAMPLE>;
                        clock-names = "ahb",
                                      "mmc",
                                      "output",
@@@ -285,12 -507,12 +285,12 @@@
                };
  
                mmc2: mmc@01c11000 {
-                       compatible = "allwinner,sun5i-a13-mmc";
+                       compatible = "allwinner,sun7i-a20-mmc";
                        reg = <0x01c11000 0x1000>;
 -                      clocks = <&ahb1_gates 10>,
 -                               <&mmc2_clk 0>,
 -                               <&mmc2_clk 1>,
 -                               <&mmc2_clk 2>;
 +                      clocks = <&ccu CLK_AHB1_MMC2>,
 +                               <&ccu CLK_MMC2>,
 +                               <&ccu CLK_MMC2_OUTPUT>,
 +                               <&ccu CLK_MMC2_SAMPLE>;
                        clock-names = "ahb",
                                      "mmc",
                                      "output",
@@@ -304,12 -526,12 +304,12 @@@
                };
  
                mmc3: mmc@01c12000 {
-                       compatible = "allwinner,sun5i-a13-mmc";
+                       compatible = "allwinner,sun7i-a20-mmc";
                        reg = <0x01c12000 0x1000>;
 -                      clocks = <&ahb1_gates 11>,
 -                               <&mmc3_clk 0>,
 -                               <&mmc3_clk 1>,
 -                               <&mmc3_clk 2>;
 +                      clocks = <&ccu CLK_AHB1_MMC3>,
 +                               <&ccu CLK_MMC3>,
 +                               <&ccu CLK_MMC3_OUTPUT>,
 +                               <&ccu CLK_MMC3_SAMPLE>;
                        clock-names = "ahb",
                                      "mmc",
                                      "output",

diff --cc arch/arm/boot/dts/sun8i-a23-a33.dtsi
index 01d8bbf08749e3f5ae3294fa18e0327e61e2fbfe,e3b196e08ccf575d4c4c1bbd858874b3d6c0a225..09204317535f9dbc63b69c339ffa00ce328da5b3
--- 1/arch/arm/boot/dts/sun8i-a23-a33.dtsi
--- 2/arch/arm/boot/dts/sun8i-a23-a33.dtsi
+++ b/arch/arm/boot/dts/sun8i-a23-a33.dtsi
@@@ -133,12 -266,12 +133,12 @@@
                };
  
                mmc0: mmc@01c0f000 {
-                       compatible = "allwinner,sun5i-a13-mmc";
+                       compatible = "allwinner,sun7i-a20-mmc";
                        reg = <0x01c0f000 0x1000>;
 -                      clocks = <&ahb1_gates 8>,
 -                               <&mmc0_clk 0>,
 -                               <&mmc0_clk 1>,
 -                               <&mmc0_clk 2>;
 +                      clocks = <&ccu CLK_BUS_MMC0>,
 +                               <&ccu CLK_MMC0>,
 +                               <&ccu CLK_MMC0_OUTPUT>,
 +                               <&ccu CLK_MMC0_SAMPLE>;
                        clock-names = "ahb",
                                      "mmc",
                                      "output",
@@@ -152,12 -285,12 +152,12 @@@
                };
  
                mmc1: mmc@01c10000 {
-                       compatible = "allwinner,sun5i-a13-mmc";
+                       compatible = "allwinner,sun7i-a20-mmc";
                        reg = <0x01c10000 0x1000>;
 -                      clocks = <&ahb1_gates 9>,
 -                               <&mmc1_clk 0>,
 -                               <&mmc1_clk 1>,
 -                               <&mmc1_clk 2>;
 +                      clocks = <&ccu CLK_BUS_MMC1>,
 +                               <&ccu CLK_MMC1>,
 +                               <&ccu CLK_MMC1_OUTPUT>,
 +                               <&ccu CLK_MMC1_SAMPLE>;
                        clock-names = "ahb",
                                      "mmc",
                                      "output",
@@@ -171,12 -304,12 +171,12 @@@
                };
  
                mmc2: mmc@01c11000 {
-                       compatible = "allwinner,sun5i-a13-mmc";
+                       compatible = "allwinner,sun7i-a20-mmc";
                        reg = <0x01c11000 0x1000>;
 -                      clocks = <&ahb1_gates 10>,
 -                               <&mmc2_clk 0>,
 -                               <&mmc2_clk 1>,
 -                               <&mmc2_clk 2>;
 +                      clocks = <&ccu CLK_BUS_MMC2>,
 +                               <&ccu CLK_MMC2>,
 +                               <&ccu CLK_MMC2_OUTPUT>,
 +                               <&ccu CLK_MMC2_SAMPLE>;
                        clock-names = "ahb",
                                      "mmc",
                                      "output",

diff --cc arch/arm/boot/dts/sun8i-h3.dtsi
Simple merge