diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2013-12-21 08:12:01 +0900 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2013-12-21 08:12:01 +0900 |
| commit | de4cf2fe3639af73a5d7d1afe2d8bf6756c7940e (patch) | |
| tree | 5ed3955a6908fa564f662666973c087e1e607a01 /arch/arm/boot/dts/exynos4412-odroidx.dts | |
| parent | e0b51c2eae8ebf10d80530b7a306818252206325 (diff) | |
| parent | ca7c11fc8df0657ddeffc1cd98428abd739e1e10 (diff) | |
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.dts | 5 |
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>; |