target/linux/mvebu/patches-3.10/0002-ARM-mvebu-Use-standard-MMC-binding-for-all-users-of-.patch

   1 From cf6eb4599d60cb9fa81465aa018c71d11e19ea6a Mon Sep 17 00:00:00 2001
   2 From: Simon Baatz <gmbnomis@gmail.com>
   3 Date: Mon, 13 May 2013 23:18:58 +0200
   4 Subject: [PATCH 002/203] ARM: mvebu: Use standard MMC binding for all users of
   5  mvsdio
   6
   7 In order to prepare the switch to the standard MMC device tree parser
   8 for mvsdio, adapt all current uses of mvsdio in the dts files to the
   9 standard format.
  10
  11 Signed-off-by: Simon Baatz <gmbnomis@gmail.com>
  12 Signed-off-by: Jason Cooper <jason@lakedaemon.net>
  13 ---
  14  arch/arm/boot/dts/armada-370-db.dts                 | 1 +
  15  arch/arm/boot/dts/armada-370-mirabox.dts            | 1 +
  16  arch/arm/boot/dts/armada-370-rd.dts                 | 1 +
  17  arch/arm/boot/dts/armada-370-xp.dtsi                | 4 ++++
  18  arch/arm/boot/dts/armada-xp-db.dts                  | 1 +
  19  arch/arm/boot/dts/kirkwood-dreamplug.dts            | 1 +
  20  arch/arm/boot/dts/kirkwood-guruplug-server-plus.dts | 2 ++
  21  arch/arm/boot/dts/kirkwood-mplcec4.dts              | 2 +-
  22  arch/arm/boot/dts/kirkwood-topkick.dts              | 1 +
  23  arch/arm/boot/dts/kirkwood.dtsi                     | 4 ++++
  24  10 files changed, 17 insertions(+), 1 deletion(-)
  25
  26 --- a/arch/arm/boot/dts/armada-370-db.dts
  27 +++ b/arch/arm/boot/dts/armada-370-db.dts
  28 @@ -74,6 +74,7 @@
  29                                  */
  30                                 status = "disabled";
  31                                 /* No CD or WP GPIOs */
  32 +                               broken-cd;
  33                         };
  34
  35                         usb@50000 {
  36 --- a/arch/arm/boot/dts/armada-370-mirabox.dts
  37 +++ b/arch/arm/boot/dts/armada-370-mirabox.dts
  38 @@ -99,6 +99,7 @@
  39                                  * No CD or WP GPIOs: SDIO interface used for
  40                                  * Wifi/Bluetooth chip
  41                                  */
  42 +                                broken-cd;
  43                         };
  44
  45                         usb@50000 {
  46 --- a/arch/arm/boot/dts/armada-370-rd.dts
  47 +++ b/arch/arm/boot/dts/armada-370-rd.dts
  48 @@ -64,6 +64,7 @@
  49                                 pinctrl-names = "default";
  50                                 status = "okay";
  51                                 /* No CD or WP GPIOs */
  52 +                               broken-cd;
  53                         };
  54
  55                         usb@50000 {
  56 --- a/arch/arm/boot/dts/armada-370-xp.dtsi
  57 +++ b/arch/arm/boot/dts/armada-370-xp.dtsi
  58 @@ -143,6 +143,10 @@
  59                                 reg = <0xd4000 0x200>;
  60                                 interrupts = <54>;
  61                                 clocks = <&gateclk 17>;
  62 +                               bus-width = <4>;
  63 +                               cap-sdio-irq;
  64 +                               cap-sd-highspeed;
  65 +                               cap-mmc-highspeed;
  66                                 status = "disabled";
  67                         };
  68
  69 --- a/arch/arm/boot/dts/armada-xp-db.dts
  70 +++ b/arch/arm/boot/dts/armada-xp-db.dts
  71 @@ -97,6 +97,7 @@
  72                                 pinctrl-names = "default";
  73                                 status = "okay";
  74                                 /* No CD or WP GPIOs */
  75 +                               broken-cd;
  76                         };
  77
  78                         usb@50000 {
  79 --- a/arch/arm/boot/dts/kirkwood-dreamplug.dts
  80 +++ b/arch/arm/boot/dts/kirkwood-dreamplug.dts
  81 @@ -79,6 +79,7 @@
  82                         pinctrl-names = "default";
  83                         status = "okay";
  84                         /* No CD or WP GPIOs */
  85 +                       broken-cd;
  86                 };
  87         };
  88
  89 --- a/arch/arm/boot/dts/kirkwood-guruplug-server-plus.dts
  90 +++ b/arch/arm/boot/dts/kirkwood-guruplug-server-plus.dts
  91 @@ -72,6 +72,8 @@
  92
  93                 mvsdio@90000 {
  94                         status = "okay";
  95 +                       /* No CD or WP GPIOs */
  96 +                       broken-cd;
  97                 };
  98         };
  99
 100 --- a/arch/arm/boot/dts/kirkwood-mplcec4.dts
 101 +++ b/arch/arm/boot/dts/kirkwood-mplcec4.dts
 102 @@ -136,7 +136,7 @@
 103                         pinctrl-0 = <&pmx_sdio &pmx_sdio_cd>;
 104                         pinctrl-names = "default";
 105                         status = "okay";
 106 -                       cd-gpios = <&gpio1 15 0>;
 107 +                       cd-gpios = <&gpio1 15 1>;
 108                         /* No WP GPIO */
 109                 };
 110         };
 111 --- a/arch/arm/boot/dts/kirkwood-topkick.dts
 112 +++ b/arch/arm/boot/dts/kirkwood-topkick.dts
 113 @@ -154,6 +154,7 @@
 114                         pinctrl-names = "default";
 115                         status = "okay";
 116                         /* No CD or WP GPIOs */
 117 +                       broken-cd;
 118                 };
 119         };
 120
 121 --- a/arch/arm/boot/dts/kirkwood.dtsi
 122 +++ b/arch/arm/boot/dts/kirkwood.dtsi
 123 @@ -200,6 +200,10 @@
 124                         reg = <0x90000 0x200>;
 125                         interrupts = <28>;
 126                         clocks = <&gate_clk 4>;
 127 +                       bus-width = <4>;
 128 +                       cap-sdio-irq;
 129 +                       cap-sd-highspeed;
 130 +                       cap-mmc-highspeed;
 131                         status = "disabled";
 132                 };
 133         };