1 files changed, 39 insertions, 15 deletions

diff --git a/arch/arm/boot/dts/sun5i-a10s.dtsi b/arch/arm/boot/dts/sun5i-a10s.dtsi
index 1b76667f3182..0e011427615f 100644
--- a/arch/arm/boot/dts/sun5i-a10s.dtsi
+++ b/arch/arm/boot/dts/sun5i-a10s.dtsi
@@ -211,27 +211,33 @@
                 };
 
                 mmc0_clk: clk@01c20088 {
-                        #clock-cells = <0>;
-                        compatible = "allwinner,sun4i-a10-mod0-clk";
+                        #clock-cells = <1>;
+                        compatible = "allwinner,sun4i-a10-mmc-clk";
                         reg = <0x01c20088 0x4>;
                         clocks = <&osc24M>, <&pll6 1>, <&pll5 1>;
-                        clock-output-names = "mmc0";
+                        clock-output-names = "mmc0",
+                                             "mmc0_output",
+                                             "mmc0_sample";
                 };
 
                 mmc1_clk: clk@01c2008c {
-                        #clock-cells = <0>;
-                        compatible = "allwinner,sun4i-a10-mod0-clk";
+                        #clock-cells = <1>;
+                        compatible = "allwinner,sun4i-a10-mmc-clk";
                         reg = <0x01c2008c 0x4>;
                         clocks = <&osc24M>, <&pll6 1>, <&pll5 1>;
-                        clock-output-names = "mmc1";
+                        clock-output-names = "mmc1",
+                                             "mmc1_output",
+                                             "mmc1_sample";
                 };
 
                 mmc2_clk: clk@01c20090 {
-                        #clock-cells = <0>;
-                        compatible = "allwinner,sun4i-a10-mod0-clk";
+                        #clock-cells = <1>;
+                        compatible = "allwinner,sun4i-a10-mmc-clk";
                         reg = <0x01c20090 0x4>;
                         clocks = <&osc24M>, <&pll6 1>, <&pll5 1>;
-                        clock-output-names = "mmc2";
+                        clock-output-names = "mmc2",
+                                             "mmc2_output",
+                                             "mmc2_sample";
                 };
 
                 ts_clk: clk@01c20098 {
@@ -359,8 +365,14 @@
                 mmc0: mmc@01c0f000 {
                         compatible = "allwinner,sun5i-a13-mmc";
                         reg = <0x01c0f000 0x1000>;
-                        clocks = <&ahb_gates 8>, <&mmc0_clk>;
-                        clock-names = "ahb", "mmc";
+                        clocks = <&ahb_gates 8>,
+                                 <&mmc0_clk 0>,
+                                 <&mmc0_clk 1>,
+                                 <&mmc0_clk 2>;
+                        clock-names = "ahb",
+                                      "mmc",
+                                      "output",
+                                      "sample";
                         interrupts = <32>;
                         status = "disabled";
                 };
@@ -368,8 +380,14 @@
                 mmc1: mmc@01c10000 {
                         compatible = "allwinner,sun5i-a13-mmc";
                         reg = <0x01c10000 0x1000>;
-                        clocks = <&ahb_gates 9>, <&mmc1_clk>;
-                        clock-names = "ahb", "mmc";
+                        clocks = <&ahb_gates 9>,
+                                 <&mmc1_clk 0>,
+                                 <&mmc1_clk 1>,
+                                 <&mmc1_clk 2>;
+                        clock-names = "ahb",
+                                      "mmc",
+                                      "output",
+                                      "sample";
                         interrupts = <33>;
                         status = "disabled";
                 };
@@ -377,8 +395,14 @@
                 mmc2: mmc@01c11000 {
                         compatible = "allwinner,sun5i-a13-mmc";
                         reg = <0x01c11000 0x1000>;
-                        clocks = <&ahb_gates 10>, <&mmc2_clk>;
-                        clock-names = "ahb", "mmc";
+                        clocks = <&ahb_gates 10>,
+                                 <&mmc2_clk 0>,
+                                 <&mmc2_clk 1>,
+                                 <&mmc2_clk 2>;
+                        clock-names = "ahb",
+                                      "mmc",
+                                      "output",
+                                      "sample";
                         interrupts = <34>;
                         status = "disabled";
                 };