diff --git a/[refs] b/[refs] index 320fd33b117d..cb8e31ef50f8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 80c70c68216f78b45e022893753555f54315de78 +refs/heads/master: 79b1c9e69de27813c7b270b1fbe0880c7b537def diff --git a/trunk/arch/arm/boot/dts/u9540.dts b/trunk/arch/arm/boot/dts/u9540.dts index 2dade76321f3..95892ec6c342 100644 --- a/trunk/arch/arm/boot/dts/u9540.dts +++ b/trunk/arch/arm/boot/dts/u9540.dts @@ -33,10 +33,35 @@ status = "okay"; }; + // External Micro SD slot + sdi0_per1@80126000 { + arm,primecell-periphid = <0x10480180>; + max-frequency = <100000000>; + bus-width = <4>; + mmc-cap-sd-highspeed; + mmc-cap-mmc-highspeed; + vmmc-supply = <&ab8500_ldo_aux3_reg>; + + cd-gpios = <&gpio7 6 0x4>; // 230 + cd-inverted; + + status = "okay"; + }; + + + // WLAN SDIO channel + sdi1_per2@80118000 { + arm,primecell-periphid = <0x10480180>; + max-frequency = <50000000>; + bus-width = <4>; + + status = "okay"; + }; + // On-board eMMC sdi4_per2@80114000 { arm,primecell-periphid = <0x10480180>; - max-frequency = <50000000>; + max-frequency = <100000000>; bus-width = <8>; mmc-cap-mmc-highspeed; vmmc-supply = <&ab8500_ldo_aux2_reg>;