From f2f198e9924fba55cda317bed11f587aee18c0f8 Mon Sep 17 00:00:00 2001 From: Sachin Kamat Date: Fri, 8 Feb 2013 14:04:28 -0800 Subject: [PATCH] --- yaml --- r: 372431 b: refs/heads/master c: 44632826987a389d263029569565036e46d9eab8 h: refs/heads/master i: 372429: 1e70c4fb4045ec17082cd3ab2a1c6760e6d3a27e 372427: e8c862071bd076c3bae9228794c08937f2723bf6 372423: 8e309037bb8e70522091013a86851251a1e84501 372415: 7a3a77f691fec17f26de1487803ef78bfc22113a v: v3 --- [refs] | 2 +- trunk/arch/arm/boot/dts/exynos4412-origen.dts | 20 +++++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 4a489fd7c3f6..c445ec9c1a94 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 32486d14085d20451ec6d412f71d7485245d4938 +refs/heads/master: 44632826987a389d263029569565036e46d9eab8 diff --git a/trunk/arch/arm/boot/dts/exynos4412-origen.dts b/trunk/arch/arm/boot/dts/exynos4412-origen.dts index e066fc65b77a..40f96bd06ee4 100644 --- a/trunk/arch/arm/boot/dts/exynos4412-origen.dts +++ b/trunk/arch/arm/boot/dts/exynos4412-origen.dts @@ -44,6 +44,26 @@ status = "okay"; }; + mshc@12550000 { + pinctrl-0 = <&sd4_clk &sd4_cmd &sd4_bus4 &sd4_bus8>; + pinctrl-names = "default"; + status = "okay"; + + num-slots = <1>; + supports-highspeed; + broken-cd; + fifo-depth = <0x80>; + card-detect-delay = <200>; + samsung,dw-mshc-ciu-div = <3>; + samsung,dw-mshc-sdr-timing = <2 3>; + samsung,dw-mshc-ddr-timing = <1 2>; + + slot@0 { + reg = <0>; + bus-width = <8>; + }; + }; + codec@13400000 { samsung,mfc-r = <0x43000000 0x800000>; samsung,mfc-l = <0x51000000 0x800000>;