Merge branch 'drivers/mmc' into next/drivers

* drivers/mmc:
  mmc: dt: Consolidate DT bindings

Also pulls in the omap/dt-missed-3.4 branch as a dependency.

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

diff --cc arch/arm/boot/dts/tegra-cardhu.dts
index ab8d901b5ab6c83593efb541f00e9aca87e7cf64,67c6511f6372a8b8dee4f527e8e58b1dfc375f79..4a166357172b9327c76d97349b218dbb60f15597
--- 1/arch/arm/boot/dts/tegra-cardhu.dts
--- 2/arch/arm/boot/dts/tegra-cardhu.dts
+++ b/arch/arm/boot/dts/tegra-cardhu.dts
@@@ -133,45 -67,6 +134,46 @@@
  
        sdhci@78000400 {
                support-8bit;
+               bus-width = <8>;
        };
 +
 +      ahub@70080000 {
 +              i2s@70080300 {
 +                      status = "disable";
 +              };
 +
 +              i2s@70080500 {
 +                      status = "disable";
 +              };
 +
 +              i2s@70080600 {
 +                      status = "disable";
 +              };
 +
 +              i2s@70080700 {
 +                      status = "disable";
 +              };
 +      };
 +
 +      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 6857cec8382d01f1c6f2c49a03ba533b08ff4f34,e9cae68861deefb0a96e1340da5b389a57fdc1ab..7cd513ac5ea602a907db6e1aecfcd231dd85e883
--- 1/arch/arm/boot/dts/tegra-harmony.dts
--- 2/arch/arm/boot/dts/tegra-harmony.dts
+++ b/arch/arm/boot/dts/tegra-harmony.dts
@@@ -335,9 -112,6 +336,10 @@@
                wp-gpios = <&gpio 59 0>; /* gpio PH3 */
                power-gpios = <&gpio 70 0>; /* gpio PI6 */
                support-8bit;
+               bus-width = <8>;
        };
 +
 +      usb@c5004000 {
 +              nvidia,phy-reset-gpio = <&gpio 169 0>; /* gpio PV1 */
 +      };
  };

diff --cc arch/arm/boot/dts/tegra-paz00.dts
Simple merge

diff --cc arch/arm/boot/dts/tegra-seaboard.dts
Simple merge

diff --cc arch/arm/boot/dts/tegra-ventana.dts
index bd074cfb338fbab0be7f49453aa0e8fa6da87a81,29e54c7a3657c8248229db9b75a92cfd62363d9c..b922a26747e7c078596e5e8cabf44c3d29126757
--- 1/arch/arm/boot/dts/tegra-ventana.dts
--- 2/arch/arm/boot/dts/tegra-ventana.dts
+++ b/arch/arm/boot/dts/tegra-ventana.dts
@@@ -334,9 -105,6 +335,10 @@@
  
        sdhci@c8000600 {
                support-8bit;
+               bus-width = <8>;
        };
 +
 +      usb@c5004000 {
 +              nvidia,phy-reset-gpio = <&gpio 169 0>; /* gpio PV1 */
 +      };
  };