From a764e808f2beb0c09f249dc2ad8c2b77202f34d0 Mon Sep 17 00:00:00 2001 From: Torben Hohn <torbenh@linutronix.de> Date: Mon, 17 Mar 2014 20:58:52 +0100 Subject: [PATCH 42/51] ARM: dts: add AM33XX MMC support Adds AM33XX MMC support for am335x-bone, am335x-evm, and am335x-evmsk. Signed-off-by: Matt Porter <mporter@ti.com> Acked-by: Tony Lindgren <tony@atomide.com> Conflicts: arch/arm/boot/dts/am335x-bone.dts arch/arm/boot/dts/am335x-evmsk.dts --- arch/arm/boot/dts/am335x-evm.dts | 7 +++++++ arch/arm/boot/dts/am335x-evmsk.dts | 7 +++++++ arch/arm/boot/dts/am33xx.dtsi | 28 ++++++++++++++++++++++++++++ 3 files changed, 42 insertions(+) Index: linux-3.12.13-rt21-r7s5/arch/arm/boot/dts/am335x-evm.dts =================================================================== @ linux-3.12.13-rt21-r7s5/arch/arm/boot/dts/am335x-evm.dts:512 @ }; vmmc_reg: regulator@12 { + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <3300000>; regulator-always-on; }; }; @ linux-3.12.13-rt21-r7s5/arch/arm/boot/dts/am335x-evm.dts:587 @ ti,adc-channels = <4>; }; }; + +&mmc1 { + status = "okay"; + vmmc-supply = <&vmmc_reg>; +}; Index: linux-3.12.13-rt21-r7s5/arch/arm/boot/dts/am335x-evmsk.dts =================================================================== --- linux-3.12.13-rt21-r7s5.orig/arch/arm/boot/dts/am335x-evmsk.dts +++ linux-3.12.13-rt21-r7s5/arch/arm/boot/dts/am335x-evmsk.dts @ linux-3.12.13-rt21-r7s5/arch/arm/boot/dts/am335x-evm.dts:429 @ }; vmmc_reg: regulator@12 { + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <3300000>; regulator-always-on; }; }; @ linux-3.12.13-rt21-r7s5/arch/arm/boot/dts/am335x-evm.dts:477 @ }; }; }; + +&mmc1 { + status = "okay"; + vmmc-supply = <&vmmc_reg>; +}; Index: linux-3.12.13-rt21-r7s5/arch/arm/boot/dts/am33xx.dtsi =================================================================== --- linux-3.12.13-rt21-r7s5.orig/arch/arm/boot/dts/am33xx.dtsi +++ linux-3.12.13-rt21-r7s5/arch/arm/boot/dts/am33xx.dtsi @ linux-3.12.13-rt21-r7s5/arch/arm/boot/dts/am335x-evm.dts:231 @ status = "disabled"; }; + mmc1: mmc@48060000 { + compatible = "ti,omap3-hsmmc"; + ti,hwmods = "mmc1"; + ti,dual-volt; + ti,needs-special-reset; + dmas = <&edma 24 + &edma 25>; + dma-names = "tx", "rx"; + status = "disabled"; + }; + + mmc2: mmc@481d8000 { + compatible = "ti,omap3-hsmmc"; + ti,hwmods = "mmc2"; + ti,needs-special-reset; + dmas = <&edma 2 + &edma 3>; + dma-names = "tx", "rx"; + status = "disabled"; + }; + + mmc3: mmc@47810000 { + compatible = "ti,omap3-hsmmc"; + ti,hwmods = "mmc3"; + ti,needs-special-reset; + status = "disabled"; + }; + wdt2: wdt@44e35000 { compatible = "ti,omap3-wdt"; ti,hwmods = "wd_timer2";