summaryrefslogtreecommitdiffstats
path: root/arch/arm/boot/dts/exynos4412-odroidx.dts
diff options
context:
space:
mode:
authorKukjin Kim <kgene.kim@samsung.com>2013-12-21 00:12:01 +0100
committerKukjin Kim <kgene.kim@samsung.com>2013-12-21 00:12:01 +0100
commitde4cf2fe3639af73a5d7d1afe2d8bf6756c7940e (patch)
tree5ed3955a6908fa564f662666973c087e1e607a01 /arch/arm/boot/dts/exynos4412-odroidx.dts
parentARM: dts: Update Samsung sysreg binding document (diff)
parentARM: dts: Use MSHC controller for eMMC memory for exynos4412-trats2 (diff)
downloadlinux-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-odroidx.dts')
-rw-r--r--arch/arm/boot/dts/exynos4412-odroidx.dts5
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/arm/boot/dts/exynos4412-odroidx.dts b/arch/arm/boot/dts/exynos4412-odroidx.dts
index 46c678ee119c..8aad5f72ced7 100644
--- a/arch/arm/boot/dts/exynos4412-odroidx.dts
+++ b/arch/arm/boot/dts/exynos4412-odroidx.dts
@@ -38,9 +38,7 @@
};
};
- mshc@12550000 {
- #address-cells = <1>;
- #size-cells = <0>;
+ mmc@12550000 {
pinctrl-0 = <&sd4_clk &sd4_cmd &sd4_bus4 &sd4_bus8>;
pinctrl-names = "default";
vmmc-supply = <&ldo20_reg &buck8_reg>;
@@ -49,7 +47,6 @@
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>;