Merge branch 'drivers/mmc' into next/dt2

Changes in the dt2 branch move stuff around that gets changed
in the drivers/mmc branch. I chose a non-obvious resolution by
adding the new bus-width property into all the tegra sdhci device
nodes.

Conflicts:
	arch/arm/boot/dts/tegra-cardhu.dts
	arch/arm/boot/dts/tegra-harmony.dts
	arch/arm/boot/dts/tegra-ventana.dts

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

diff --cc arch/arm/boot/dts/imx53-smd.dts
Simple merge

diff --cc arch/arm/boot/dts/imx6q-arm2.dts
index 97893f5cab92908da14106762c16ec76d247f253,d2eaf521c9fd7ae7f5faafcbce609a6254413e76..db4c6096c562eaea2415570934b4cd7fad4a981a
--- 1/arch/arm/boot/dts/imx6q-arm2.dts
--- 2/arch/arm/boot/dts/imx6q-arm2.dts
+++ b/arch/arm/boot/dts/imx6q-arm2.dts
@@@ -38,10 -41,8 +38,10 @@@
                        };
  
                        usdhc@0219c000 { /* uSDHC4 */
-                               fsl,card-wired;
+                               non-removable;
                                vmmc-supply = <&reg_3p3v>;
 +                              pinctrl-names = "default";
 +                              pinctrl-0 = <&pinctrl_usdhc4_1>;
                                status = "okay";
                        };
  

diff --cc arch/arm/boot/dts/tegra-cardhu.dts
index e14bb450c3289000966c10326a06087d91ed13f3,67c6511f6372a8b8dee4f527e8e58b1dfc375f79..36321bceec46beb8ae812bc1ff5e80f2db45fab0
--- 1/arch/arm/boot/dts/tegra-cardhu.dts
--- 2/arch/arm/boot/dts/tegra-cardhu.dts
+++ b/arch/arm/boot/dts/tegra-cardhu.dts
@@@ -139,32 -54,19 +139,34 @@@
                cd-gpios = <&gpio 69 0>; /* gpio PI5 */
                wp-gpios = <&gpio 155 0>; /* gpio PT3 */
                power-gpios = <&gpio 31 0>; /* gpio PD7 */
+               bus-width = <4>;
        };
  
 -      sdhci@78000200 {
 -              status = "disable";
 -      };
 -
 -      sdhci@78000400 {
 -              status = "disable";
 -      };
 -
 -      sdhci@78000400 {
 +      sdhci@78000600 {
 +              status = "okay";
                support-8bit;
+               bus-width = <8>;
        };
 +
 +      sound {
 +              compatible = "nvidia,tegra-audio-wm8903-cardhu",
 +                           "nvidia,tegra-audio-wm8903";
 +              nvidia,model = "NVIDIA Tegra Cardhu";
 +
 +              nvidia,audio-routing =
 +                      "Headphone Jack", "HPOUTR",
 +                      "Headphone Jack", "HPOUTL",
 +                      "Int Spk", "ROP",
 +                      "Int Spk", "RON",
 +                      "Int Spk", "LOP",
 +                      "Int Spk", "LON",
 +                      "Mic Jack", "MICBIAS",
 +                      "IN1L", "Mic Jack";
 +
 +              nvidia,i2s-controller = <&tegra_i2s1>;
 +              nvidia,audio-codec = <&wm8903>;
 +
 +              nvidia,spkr-en-gpios = <&wm8903 2 0>;
 +              nvidia,hp-det-gpios = <&gpio 178 0>; /* gpio PW2 */
 +      };
  };

diff --cc arch/arm/boot/dts/tegra-harmony.dts
index 6bcdad34d2e75fbbbdc2ccde56329ad26749d0e0,e9cae68861deefb0a96e1340da5b389a57fdc1ab..7de701365fce6b9e6594e16491ad97da9cfa75fb
--- 1/arch/arm/boot/dts/tegra-harmony.dts
--- 2/arch/arm/boot/dts/tegra-harmony.dts
+++ b/arch/arm/boot/dts/tegra-harmony.dts
@@@ -277,36 -44,8 +277,38 @@@
                clock-frequency = <400000>;
        };
  
 -      i2s@70002a00 {
 -              status = "disable";
 +      pmc {
 +              nvidia,invert-interrupt;
 +      };
 +
 +      usb@c5000000 {
 +              status = "okay";
 +      };
 +
 +      usb@c5004000 {
 +              status = "okay";
 +              nvidia,phy-reset-gpio = <&gpio 169 0>; /* gpio PV1 */
 +      };
 +
 +      usb@c5008000 {
 +              status = "okay";
 +      };
 +
 +      sdhci@c8000200 {
 +              status = "okay";
 +              cd-gpios = <&gpio 69 0>; /* gpio PI5 */
 +              wp-gpios = <&gpio 57 0>; /* gpio PH1 */
 +              power-gpios = <&gpio 155 0>; /* gpio PT3 */
++              bus-width = <4>;
 +      };
 +
 +      sdhci@c8000600 {
 +              status = "okay";
 +              cd-gpios = <&gpio 58 0>; /* gpio PH2 */
 +              wp-gpios = <&gpio 59 0>; /* gpio PH3 */
 +              power-gpios = <&gpio 70 0>; /* gpio PI6 */
 +              support-8bit;
++              bus-width = <8>;
        };
  
        sound {

diff --cc arch/arm/boot/dts/tegra-paz00.dts
index cb366f0c6ffe6f20a4eaf5ff387b485fae01d337,03d3d7994da77a43eede865906ed26ecfc61d2b6..bfeb117d5aea639bdd0f8949796593b4d881da26
--- 1/arch/arm/boot/dts/tegra-paz00.dts
--- 2/arch/arm/boot/dts/tegra-paz00.dts
+++ b/arch/arm/boot/dts/tegra-paz00.dts
@@@ -296,11 -97,20 +296,13 @@@
                cd-gpios = <&gpio 173 0>; /* gpio PV5 */
                wp-gpios = <&gpio 57 0>;  /* gpio PH1 */
                power-gpios = <&gpio 169 0>; /* gpio PV1 */
+               bus-width = <4>;
        };
  
 -      sdhci@c8000200 {
 -              status = "disable";
 -      };
 -
 -      sdhci@c8000400 {
 -              status = "disable";
 -      };
 -
        sdhci@c8000600 {
 +              status = "okay";
                support-8bit;
+               bus-width = <8>;
        };
  
        gpio-keys {

diff --cc arch/arm/boot/dts/tegra-seaboard.dts
index 21b586e41e97f0450e091dceedc7296ff3784119,8decf722997339f7c9ed80e967bb02c4c26c02f0..89cb7f2acd92cfa9ebbe8ceb8bb18823d62ceeeb
--- 1/arch/arm/boot/dts/tegra-seaboard.dts
--- 2/arch/arm/boot/dts/tegra-seaboard.dts
+++ b/arch/arm/boot/dts/tegra-seaboard.dts
@@@ -395,10 -108,15 +396,11 @@@
        };
  
        sdhci@c8000600 {
 +              status = "okay";
                support-8bit;
+               bus-width = <8>;
        };
  
 -      usb@c5000000 {
 -              nvidia,vbus-gpio = <&gpio 24 0>; /* PD0 */
 -              dr_mode = "otg";
 -      };
 -
        gpio-keys {
                compatible = "gpio-keys";
  

diff --cc arch/arm/boot/dts/tegra-trimslice.dts
index 6fc52afa9431e82364b6a294cdc5f64f473636b1,252476867b54a6804a0c63f484ed4766698c3787..9de5636023f69694d39bf4196f1bca180e7ebb43
--- 1/arch/arm/boot/dts/tegra-trimslice.dts
--- 2/arch/arm/boot/dts/tegra-trimslice.dts
+++ b/arch/arm/boot/dts/tegra-trimslice.dts
@@@ -287,18 -59,19 +287,20 @@@
        };
  
        sdhci@c8000000 {
 -              status = "disable";
 -      };
 -
 -      sdhci@c8000200 {
 -              status = "disable";
 +              status = "okay";
++              bus-width = <4>;
        };
  
 -      sdhci@c8000400 {
 -              status = "disable";
 +      sdhci@c8000600 {
 +              status = "okay";
 +              cd-gpios = <&gpio 121 0>; /* gpio PP1 */
 +              wp-gpios = <&gpio 122 0>; /* gpio PP2 */
++              bus-width = <4>;
        };
  
 -      sdhci@c8000600 {
 -              cd-gpios = <&gpio 121 0>;
 -              wp-gpios = <&gpio 122 0>;
 +      sound {
 +              compatible = "nvidia,tegra-audio-trimslice";
 +              nvidia,i2s-controller = <&tegra_i2s1>;
 +              nvidia,audio-codec = <&codec>;
        };
  };

diff --cc arch/arm/boot/dts/tegra-ventana.dts
index 15d8fdbe21f228439f8d5baf23bb777a64f9c2f1,29e54c7a3657c8248229db9b75a92cfd62363d9c..445343b0fbdd7bc7eedbd989196bac17f7ffc383
--- 1/arch/arm/boot/dts/tegra-ventana.dts
--- 2/arch/arm/boot/dts/tegra-ventana.dts
+++ b/arch/arm/boot/dts/tegra-ventana.dts
@@@ -291,29 -40,8 +291,31 @@@
                clock-frequency = <400000>;
        };
  
 -      i2s@70002a00 {
 -              status = "disable";
 +      usb@c5000000 {
 +              status = "okay";
 +      };
 +
 +      usb@c5004000 {
 +              status = "okay";
 +              nvidia,phy-reset-gpio = <&gpio 169 0>; /* gpio PV1 */
 +      };
 +
 +      usb@c5008000 {
 +              status = "okay";
 +      };
 +
 +      sdhci@c8000400 {
 +              status = "okay";
 +              cd-gpios = <&gpio 69 0>; /* gpio PI5 */
 +              wp-gpios = <&gpio 57 0>; /* gpio PH1 */
 +              power-gpios = <&gpio 70 0>; /* gpio PI6 */
++              bus-width = <4>;
 +      };
 +
 +      sdhci@c8000600 {
 +              status = "okay";
 +              support-8bit;
++              bus-width = <8>;
        };
  
        sound {

diff --cc drivers/mmc/host/sdhci-esdhc-imx.c
Simple merge