ARM: mvebu: Use standard MMC binding for all users of mvsdio
authorSimon Baatz <gmbnomis@gmail.com>
Mon, 13 May 2013 21:18:58 +0000 (23:18 +0200)
committerJason Cooper <jason@lakedaemon.net>
Wed, 15 May 2013 00:28:13 +0000 (00:28 +0000)
In order to prepare the switch to the standard MMC device tree parser
for mvsdio, adapt all current uses of mvsdio in the dts files to the
standard format.

Signed-off-by: Simon Baatz <gmbnomis@gmail.com>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
arch/arm/boot/dts/armada-370-db.dts
arch/arm/boot/dts/armada-370-mirabox.dts
arch/arm/boot/dts/armada-370-rd.dts
arch/arm/boot/dts/armada-370-xp.dtsi
arch/arm/boot/dts/armada-xp-db.dts
arch/arm/boot/dts/kirkwood-dreamplug.dts
arch/arm/boot/dts/kirkwood-guruplug-server-plus.dts
arch/arm/boot/dts/kirkwood-mplcec4.dts
arch/arm/boot/dts/kirkwood-topkick.dts
arch/arm/boot/dts/kirkwood.dtsi

index 2353b1f13704b66e39284757b5442f5256bf01ba..beee1699d49eb553a474a9186b508b6fb1da4230 100644 (file)
@@ -74,6 +74,7 @@
                                 */
                                status = "disabled";
                                /* No CD or WP GPIOs */
+                               broken-cd;
                        };
 
                        usb@50000 {
index 14e36e19d5152caedc8e8056a723fa885c3495ce..45b107763e3b7c88f1632ef8bf00adb6027258b5 100644 (file)
@@ -99,6 +99,7 @@
                                 * No CD or WP GPIOs: SDIO interface used for
                                 * Wifi/Bluetooth chip
                                 */
+                                broken-cd;
                        };
 
                        usb@50000 {
index 130f8390a7e42d2f1e92057399cd6a6f54183cdc..89c21106cfa93de89fac1c9209efff44dad2ef06 100644 (file)
@@ -64,6 +64,7 @@
                                pinctrl-names = "default";
                                status = "okay";
                                /* No CD or WP GPIOs */
+                               broken-cd;
                        };
 
                        usb@50000 {
index 272bbc65fab05b809b9df0a57497c14d37eac302..031894eb5ef8e011547eb64eb3c91c00ce549553 100644 (file)
                                reg = <0xd4000 0x200>;
                                interrupts = <54>;
                                clocks = <&gateclk 17>;
+                               bus-width = <4>;
+                               cap-sdio-irq;
+                               cap-sd-highspeed;
+                               cap-mmc-highspeed;
                                status = "disabled";
                        };
 
index d6cc8bf8272e387281c30a0130914c1e961fa69f..7c22a20d51b56fc0f1fbfd20d8421b2b1008d931 100644 (file)
@@ -97,6 +97,7 @@
                                pinctrl-names = "default";
                                status = "okay";
                                /* No CD or WP GPIOs */
+                               broken-cd;
                        };
 
                        usb@50000 {
index 289e51d86372895ff6428892fe199cbefa255520..be16a8401562f3c1c3de87ead05fc5d81193c11c 100644 (file)
@@ -79,6 +79,7 @@
                        pinctrl-names = "default";
                        status = "okay";
                        /* No CD or WP GPIOs */
+                       broken-cd;
                };
        };
 
index 44fd97dfc1f36b58205e5976e33d1f160ddba95e..484a2a6c0afc6e3353ae7235e213efbccf36ed03 100644 (file)
@@ -72,6 +72,8 @@
 
                mvsdio@90000 {
                        status = "okay";
+                       /* No CD or WP GPIOs */
+                       broken-cd;
                };
        };
 
index 758824118a9a8e22041817183449839f1c9c072e..bf3a58cfcccf34da7df7a6c7d0492aa60604d484 100644 (file)
                        pinctrl-0 = <&pmx_sdio &pmx_sdio_cd>;
                        pinctrl-names = "default";
                        status = "okay";
-                       cd-gpios = <&gpio1 15 0>;
+                       cd-gpios = <&gpio1 15 1>;
                        /* No WP GPIO */
                };
        };
index 66eb45b00b25218476c372a5bb1dfc20f3046fb0..7dc14f4f5270797e6123576d8dd2dc549d5f6c9c 100644 (file)
                        pinctrl-names = "default";
                        status = "okay";
                        /* No CD or WP GPIOs */
+                       broken-cd;
                };
        };
 
index fada7e6d24d8543fd956ef18d7981aa12b9b9ee6..e2a28db7a0a785c59ee07091da20efc24711059b 100644 (file)
                        reg = <0x90000 0x200>;
                        interrupts = <28>;
                        clocks = <&gate_clk 4>;
+                       bus-width = <4>;
+                       cap-sdio-irq;
+                       cap-sd-highspeed;
+                       cap-mmc-highspeed;
                        status = "disabled";
                };
        };