diff options
author | Kukjin Kim <kgene.kim@samsung.com> | 2013-12-21 00:12:01 +0100 |
---|---|---|
committer | Kukjin Kim <kgene.kim@samsung.com> | 2013-12-21 00:12:01 +0100 |
commit | de4cf2fe3639af73a5d7d1afe2d8bf6756c7940e (patch) | |
tree | 5ed3955a6908fa564f662666973c087e1e607a01 /arch/arm/boot/dts/exynos4412-trats2.dts | |
parent | ARM: dts: Update Samsung sysreg binding document (diff) | |
parent | ARM: dts: Use MSHC controller for eMMC memory for exynos4412-trats2 (diff) | |
download | linux-de4cf2fe3639af73a5d7d1afe2d8bf6756c7940e.tar.xz linux-de4cf2fe3639af73a5d7d1afe2d8bf6756c7940e.zip |
Merge branch 'v3.14-next/fixes-samsung-2' into v3.14-next/dt-exynos-2
Diffstat (limited to 'arch/arm/boot/dts/exynos4412-trats2.dts')
-rw-r--r-- | arch/arm/boot/dts/exynos4412-trats2.dts | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/arch/arm/boot/dts/exynos4412-trats2.dts b/arch/arm/boot/dts/exynos4412-trats2.dts index fb7b9ae5f399..890ad275cb85 100644 --- a/arch/arm/boot/dts/exynos4412-trats2.dts +++ b/arch/arm/boot/dts/exynos4412-trats2.dts @@ -442,13 +442,25 @@ }; }; - sdhci@12510000 { - bus-width = <8>; + mmc@12550000 { + num-slots = <1>; + supports-highspeed; + broken-cd; non-removable; - pinctrl-0 = <&sd0_clk &sd0_cmd &sd0_bus8>; - pinctrl-names = "default"; + card-detect-delay = <200>; vmmc-supply = <&vemmc_reg>; + clock-frequency = <400000000>; + samsung,dw-mshc-ciu-div = <0>; + samsung,dw-mshc-sdr-timing = <2 3>; + samsung,dw-mshc-ddr-timing = <1 2>; + pinctrl-0 = <&sd4_clk &sd4_cmd &sd4_bus4 &sd4_bus8>; + pinctrl-names = "default"; status = "okay"; + + slot@0 { + reg = <0>; + bus-width = <8>; + }; }; serial@13800000 { |