Signed-off-by: David Lanzendörfer <david.lanzendoer...@o2s.ch>
Signed-off-by: Hans de Goede <hdego...@redhat.com>
---
 arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts |   30 +++++++++++++++
 arch/arm/boot/dts/sun5i-a10s.dtsi                |   44 ++++++++++++++++++++++
 arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts  |   15 ++++++++
 arch/arm/boot/dts/sun5i-a13-olinuxino.dts        |   15 ++++++++
 arch/arm/boot/dts/sun5i-a13.dtsi                 |   37 +++++++++++++++++++
 5 files changed, 141 insertions(+)

diff --git a/arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts 
b/arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts
index 3c9f8b3..5c7b454 100644
--- a/arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts
+++ b/arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts
@@ -34,7 +34,37 @@
                        };
                };
 
+               mmc0: mmc@01c0f000 {
+                       pinctrl-names = "default", "default";
+                       pinctrl-0 = <&mmc0_pins_a>;
+                       pinctrl-1 = <&mmc0_cd_pin_olinuxino_micro>;
+                       cd-gpios = <&pio 6 1 0>; /* PG1 */
+                       status = "okay";
+               };
+
+               mmc1: mmc@01c10000 {
+                       pinctrl-names = "default", "default";
+                       pinctrl-0 = <&mmc1_pins_a>;
+                       pinctrl-1 = <&mmc1_cd_pin_olinuxino_micro>;
+                       cd-gpios = <&pio 6 13 0>; /* PG13 */
+                       status = "okay";
+               };
+
                pinctrl@01c20800 {
+                       mmc0_cd_pin_olinuxino_micro: mmc0_cd_pin@0 {
+                               allwinner,pins = "PG1";
+                               allwinner,function = "gpio_in";
+                               allwinner,drive = <0>;
+                               allwinner,pull = <1>;
+                       };
+
+                       mmc1_cd_pin_olinuxino_micro: mmc1_cd_pin@0 {
+                               allwinner,pins = "PG13";
+                               allwinner,function = "gpio_in";
+                               allwinner,drive = <0>;
+                               allwinner,pull = <1>;
+                       };
+
                        led_pins_olinuxino: led_pins@0 {
                                allwinner,pins = "PE3";
                                allwinner,function = "gpio_out";
diff --git a/arch/arm/boot/dts/sun5i-a10s.dtsi 
b/arch/arm/boot/dts/sun5i-a10s.dtsi
index 327e87b..b6d1de0 100644
--- a/arch/arm/boot/dts/sun5i-a10s.dtsi
+++ b/arch/arm/boot/dts/sun5i-a10s.dtsi
@@ -293,6 +293,36 @@
                        #size-cells = <0>;
                };
 
+               mmc0: mmc@01c0f000 {
+                       compatible = "allwinner,sun5i-a13-mmc";
+                       reg = <0x01c0f000 0x1000>;
+                       clocks = <&ahb_gates 8>, <&mmc0_clk>;
+                       clock-names = "ahb", "mod";
+                       interrupts = <32>;
+                       bus-width = <4>;
+                       status = "disabled";
+               };
+
+               mmc1: mmc@01c10000 {
+                       compatible = "allwinner,sun5i-a13-mmc";
+                       reg = <0x01c10000 0x1000>;
+                       clocks = <&ahb_gates 9>, <&mmc1_clk>;
+                       clock-names = "ahb", "mod";
+                       interrupts = <33>;
+                       bus-width = <4>;
+                       status = "disabled";
+               };
+
+               mmc2: mmc@01c11000 {
+                       compatible = "allwinner,sun5i-a13-mmc";
+                       reg = <0x01c11000 0x1000>;
+                       clocks = <&ahb_gates 10>, <&mmc2_clk>;
+                       clock-names = "ahb", "mod";
+                       interrupts = <34>;
+                       bus-width = <4>;
+                       status = "disabled";
+               };
+
                intc: interrupt-controller@01c20400 {
                        compatible = "allwinner,sun4i-ic";
                        reg = <0x01c20400 0x400>;
@@ -363,6 +393,20 @@
                                allwinner,drive = <0>;
                                allwinner,pull = <0>;
                        };
+
+                       mmc0_pins_a: mmc0@0 {
+                               allwinner,pins = 
"PF0","PF1","PF2","PF3","PF4","PF5";
+                               allwinner,function = "mmc0";
+                               allwinner,drive = <3>;
+                               allwinner,pull = <0>;
+                       };
+
+                       mmc1_pins_a: mmc1@0 {
+                               allwinner,pins = 
"PG3","PG4","PG5","PG6","PG7","PG8";
+                               allwinner,function = "mmc1";
+                               allwinner,drive = <3>;
+                               allwinner,pull = <0>;
+                       };
                };
 
                timer@01c20c00 {
diff --git a/arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts 
b/arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts
index fe2ce0a..2f08bb2 100644
--- a/arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts
+++ b/arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts
@@ -20,7 +20,22 @@
        compatible = "olimex,a13-olinuxino-micro", "allwinner,sun5i-a13";
 
        soc@01c00000 {
+               mmc0: mmc@01c0f000 {
+                       pinctrl-names = "default", "default";
+                       pinctrl-0 = <&mmc0_pins_a>;
+                       pinctrl-1 = <&mmc0_cd_pin_olinuxinom>;
+                       cd-gpios = <&pio 6 0 0>; /* PG0 */
+                       status = "okay";
+               };
+
                pinctrl@01c20800 {
+                       mmc0_cd_pin_olinuxinom: mmc0_cd_pin@0 {
+                               allwinner,pins = "PG0";
+                               allwinner,function = "gpio_in";
+                               allwinner,drive = <0>;
+                               allwinner,pull = <1>;
+                       };
+
                        led_pins_olinuxinom: led_pins@0 {
                                allwinner,pins = "PG9";
                                allwinner,function = "gpio_out";
diff --git a/arch/arm/boot/dts/sun5i-a13-olinuxino.dts 
b/arch/arm/boot/dts/sun5i-a13-olinuxino.dts
index a4ba5ff..a7280f5 100644
--- a/arch/arm/boot/dts/sun5i-a13-olinuxino.dts
+++ b/arch/arm/boot/dts/sun5i-a13-olinuxino.dts
@@ -19,7 +19,22 @@
        compatible = "olimex,a13-olinuxino", "allwinner,sun5i-a13";
 
        soc@01c00000 {
+               mmc0: mmc@01c0f000 {
+                       pinctrl-names = "default", "default";
+                       pinctrl-0 = <&mmc0_pins_a>;
+                       pinctrl-1 = <&mmc0_cd_pin_olinuxino>;
+                       cd-gpios = <&pio 6 0 0>; /* PG0 */
+                       status = "okay";
+               };
+
                pinctrl@01c20800 {
+                       mmc0_cd_pin_olinuxino: mmc0_cd_pin@0 {
+                               allwinner,pins = "PG0";
+                               allwinner,function = "gpio_in";
+                               allwinner,drive = <0>;
+                               allwinner,pull = <1>;
+                       };
+
                        led_pins_olinuxino: led_pins@0 {
                                allwinner,pins = "PG9";
                                allwinner,function = "gpio_out";
diff --git a/arch/arm/boot/dts/sun5i-a13.dtsi b/arch/arm/boot/dts/sun5i-a13.dtsi
index f49eb13..040d304 100644
--- a/arch/arm/boot/dts/sun5i-a13.dtsi
+++ b/arch/arm/boot/dts/sun5i-a13.dtsi
@@ -274,6 +274,36 @@
                #size-cells = <1>;
                ranges;
 
+               mmc0: mmc@01c0f000 {
+                       compatible = "allwinner,sun5i-a13-mmc";
+                       reg = <0x01c0f000 0x1000>;
+                       clocks = <&ahb_gates 8>, <&mmc0_clk>;
+                       clock-names = "ahb", "mod";
+                       interrupts = <32>;
+                       bus-width = <4>;
+                       status = "disabled";
+               };
+
+               mmc1: mmc@01c10000 {
+                       compatible = "allwinner,sun5i-a13-mmc";
+                       reg = <0x01c10000 0x1000>;
+                       clocks = <&ahb_gates 9>, <&mmc1_clk>;
+                       clock-names = "ahb", "mod";
+                       interrupts = <33>;
+                       bus-width = <4>;
+                       status = "disabled";
+               };
+
+               mmc2: mmc@01c11000 {
+                       compatible = "allwinner,sun5i-a13-mmc";
+                       reg = <0x01c11000 0x1000>;
+                       clocks = <&ahb_gates 10>, <&mmc2_clk>;
+                       clock-names = "ahb", "mod";
+                       interrupts = <34>;
+                       bus-width = <4>;
+                       status = "disabled";
+               };
+
                intc: interrupt-controller@01c20400 {
                        compatible = "allwinner,sun4i-ic";
                        reg = <0x01c20400 0x400>;
@@ -326,6 +356,13 @@
                                allwinner,drive = <0>;
                                allwinner,pull = <0>;
                        };
+
+                       mmc0_pins_a: mmc0@0 {
+                               allwinner,pins = 
"PF0","PF1","PF2","PF3","PF4","PF5";
+                               allwinner,function = "mmc0";
+                               allwinner,drive = <3>;
+                               allwinner,pull = <0>;
+                       };
                };
 
                timer@01c20c00 {

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to