ARM: dts: sun5i: Enable mmc controller on various A10s and A13 boards

The cd pin settings have been taken from the original firmware fex files,
and have been confirmed to work on the actual boards.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>

diff --git a/arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts b/arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts
index 23611b7..de91308 100644 (file)
--- a/arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts
+++ b/arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts
@@ -35,6 +35,24 @@
                        };
                };
 
+               mmc0: mmc@01c0f000 {
+                       pinctrl-names = "default";
+                       pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_olinuxino_micro>;
+                       bus-width = <4>;
+                       cd-gpios = <&pio 6 1 0>; /* PG1 */
+                       cd-inverted;
+                       status = "okay";
+               };
+
+               mmc1: mmc@01c10000 {
+                       pinctrl-names = "default";
+                       pinctrl-0 = <&mmc1_pins_a>, <&mmc1_cd_pin_olinuxino_micro>;
+                       bus-width = <4>;
+                       cd-gpios = <&pio 6 13 0>; /* PG13 */
+                       cd-inverted;
+                       status = "okay";
+               };
+
                usbphy: phy@01c13400 {
                        usb1_vbus-supply = <&reg_usb1_vbus>;
                        status = "okay";
@@ -49,6 +67,20 @@
                };
 
                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-a13-olinuxino-micro.dts b/arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts
index 11169d5..8515f19 100644 (file)
--- a/arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts
+++ b/arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts
@@ -21,6 +21,15 @@
        compatible = "olimex,a13-olinuxino-micro", "allwinner,sun5i-a13";
 
        soc@01c00000 {
+               mmc0: mmc@01c0f000 {
+                       pinctrl-names = "default";
+                       pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_olinuxinom>;
+                       bus-width = <4>;
+                       cd-gpios = <&pio 6 0 0>; /* PG0 */
+                       cd-inverted;
+                       status = "okay";
+               };
+
                usbphy: phy@01c13400 {
                        usb1_vbus-supply = <&reg_usb1_vbus>;
                        status = "okay";
@@ -35,6 +44,13 @@
                };
 
                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 7a9187b..51a9438 100644 (file)
--- a/arch/arm/boot/dts/sun5i-a13-olinuxino.dts
+++ b/arch/arm/boot/dts/sun5i-a13-olinuxino.dts
@@ -20,6 +20,15 @@
        compatible = "olimex,a13-olinuxino", "allwinner,sun5i-a13";
 
        soc@01c00000 {
+               mmc0: mmc@01c0f000 {
+                       pinctrl-names = "default";
+                       pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_olinuxino>;
+                       bus-width = <4>;
+                       cd-gpios = <&pio 6 0 0>; /* PG0 */
+                       cd-inverted;
+                       status = "okay";
+               };
+
                usbphy: phy@01c13400 {
                        usb1_vbus-supply = <&reg_usb1_vbus>;
                        status = "okay";
@@ -34,6 +43,13 @@
                };
 
                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";