From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 8 Jan 2014 02:24:12 +0000 (+1100)
Subject: Merge remote-tracking branch 'mmc/mmc-next'
X-Git-Tag: next-20140108~44
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=0ce86f2f05b7bafdf9c6f60a53445cd99adbb3d0;p=karo-tx-linux.git

Merge remote-tracking branch 'mmc/mmc-next'
---

0ce86f2f05b7bafdf9c6f60a53445cd99adbb3d0
diff --cc arch/arm/boot/dts/imx6qdl-sabresd.dtsi
index 91e5dd43537f,b8ee305a25a9..c072d465655a
--- a/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
@@@ -304,58 -184,6 +304,62 @@@
  				MX6QDL_PAD_ENET_CRS_DV__GPIO1_IO25 0x80000000
  			>;
  		};
 +
 +		pinctrl_audmux: audmuxgrp {
 +			fsl,pins = <MX6QDL_AUDMUX_PINGRP2>;
 +		};
 +
 +		pinctrl_ecspi1: ecspi1grp {
 +			fsl,pins = <MX6QDL_ECSPI1_PINGRP2>;
 +		};
 +
 +		pinctrl_enet: enetgrp {
 +			fsl,pins = <MX6QDL_ENET_PINGRP1>;
 +		};
 +
 +		pinctrl_gpio_keys: gpio_keysgrp {
 +			fsl,pins = <
 +				MX6QDL_PAD_EIM_D29__GPIO3_IO29 0x80000000
 +				MX6QDL_PAD_GPIO_4__GPIO1_IO04  0x80000000
 +				MX6QDL_PAD_GPIO_5__GPIO1_IO05  0x80000000
 +			>;
 +		};
 +
 +		pinctrl_i2c1: i2c1grp {
 +			fsl,pins = <MX6QDL_I2C1_PINGRP2>;
 +		};
 +
 +		pinctrl_i2c2: i2c2grp {
 +			fsl,pins = <MX6QDL_I2C2_PINGRP2>;
 +		};
 +
 +		pinctrl_i2c3: i2c3grp {
 +			fsl,pins = <MX6QDL_I2C3_PINGRP2>;
 +		};
 +
 +		pinctrl_pwm1: pwm1grp {
 +			fsl,pins = <MX6QDL_PWM1_PINGRP1>;
 +		};
 +
 +		pinctrl_uart1: uart1grp {
 +			fsl,pins = <MX6QDL_UART1_PINGRP1>;
 +		};
 +
 +		pinctrl_usbotg: usbotggrp {
 +			fsl,pins = <MX6QDL_USBOTG_PINGRP2>;
 +		};
 +
 +		pinctrl_usdhc2: usdhc2grp {
 +			fsl,pins = <MX6QDL_USDHC2_PINGRP_D8>;
 +		};
 +
 +		pinctrl_usdhc3: usdhc3grp {
 +			fsl,pins = <MX6QDL_USDHC3_PINGRP_D8>;
 +		};
++
++		pinctrl_usdhc4: usdhc4grp {
++			fsl,pins = <MX6QDL_USDHC4_PINGRP_D8>;
++		};
  	};
  };
  
@@@ -431,3 -259,12 +435,12 @@@
  	wp-gpios = <&gpio2 1 0>;
  	status = "okay";
  };
+ 
+ &usdhc4 {
+ 	pinctrl-names = "default";
 -	pinctrl-0 = <&pinctrl_usdhc4_1>;
++	pinctrl-0 = <&pinctrl_usdhc4>;
+ 	bus-width = <8>;
+ 	non-removable;
+ 	no-1-8-v;
+ 	status = "okay";
+ };