| Message ID | 1357883330-5364-12-git-send-email-mporter@ti.com (mailing list archive) |
|---|---|
| State | Superseded, archived |
| Headers | show |
* Matt Porter <mporter@ti.com> [130110 21:47]: > Adds AM33XX MMC support for am335x-bone, am335x-evm, and > am335x-evmsk.. This one should be queued separately by Benoit: Acked-by: Tony Lindgren <tony@atomide.com> > Signed-off-by: Matt Porter <mporter@ti.com> > --- > arch/arm/boot/dts/am335x-bone.dts | 7 +++++++ > arch/arm/boot/dts/am335x-evm.dts | 7 +++++++ > arch/arm/boot/dts/am335x-evmsk.dts | 7 +++++++ > arch/arm/boot/dts/am33xx.dtsi | 28 ++++++++++++++++++++++++++++ > 4 files changed, 49 insertions(+) > > diff --git a/arch/arm/boot/dts/am335x-bone.dts b/arch/arm/boot/dts/am335x-bone.dts > index 11b240c..a154ce0 100644 > --- a/arch/arm/boot/dts/am335x-bone.dts > +++ b/arch/arm/boot/dts/am335x-bone.dts > @@ -120,6 +120,8 @@ > }; > > ldo3_reg: regulator@5 { > + regulator-min-microvolt = <1800000>; > + regulator-max-microvolt = <3300000>; > regulator-always-on; > }; > > @@ -136,3 +138,8 @@ > &cpsw_emac1 { > phy_id = <&davinci_mdio>, <1>; > }; > + > +&mmc1 { > + status = "okay"; > + vmmc-supply = <&ldo3_reg>; > +}; > diff --git a/arch/arm/boot/dts/am335x-evm.dts b/arch/arm/boot/dts/am335x-evm.dts > index d649644..2907da6 100644 > --- a/arch/arm/boot/dts/am335x-evm.dts > +++ b/arch/arm/boot/dts/am335x-evm.dts > @@ -232,6 +232,8 @@ > }; > > vmmc_reg: regulator@12 { > + regulator-min-microvolt = <1800000>; > + regulator-max-microvolt = <3300000>; > regulator-always-on; > }; > }; > @@ -244,3 +246,8 @@ > &cpsw_emac1 { > phy_id = <&davinci_mdio>, <1>; > }; > + > +&mmc1 { > + status = "okay"; > + vmmc-supply = <&vmmc_reg>; > +}; > diff --git a/arch/arm/boot/dts/am335x-evmsk.dts b/arch/arm/boot/dts/am335x-evmsk.dts > index f5a6162..f050c46 100644 > --- a/arch/arm/boot/dts/am335x-evmsk.dts > +++ b/arch/arm/boot/dts/am335x-evmsk.dts > @@ -244,7 +244,14 @@ > }; > > vmmc_reg: regulator@12 { > + regulator-min-microvolt = <1800000>; > + regulator-max-microvolt = <3300000>; > regulator-always-on; > }; > }; > }; > + > +&mmc1 { > + status = "okay"; > + vmmc-supply = <&vmmc_reg>; > +}; > diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi > index e711ffb..278b75d 100644 > --- a/arch/arm/boot/dts/am33xx.dtsi > +++ b/arch/arm/boot/dts/am33xx.dtsi > @@ -235,6 +235,34 @@ > 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"; > -- > 1.7.9.5 > ------------------------------------------------------------------------------ Master HTML5, CSS3, ASP.NET, MVC, AJAX, Knockout.js, Web API and much more. Get web development skills now with LearnDevNow - 350+ hours of step-by-step video tutorials by Microsoft MVPs and experts. SALE $99.99 this month only -- learn more at: http://p.sf.net/sfu/learnmore_122812
diff --git a/arch/arm/boot/dts/am335x-bone.dts b/arch/arm/boot/dts/am335x-bone.dts index 11b240c..a154ce0 100644 --- a/arch/arm/boot/dts/am335x-bone.dts +++ b/arch/arm/boot/dts/am335x-bone.dts @@ -120,6 +120,8 @@ }; ldo3_reg: regulator@5 { + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <3300000>; regulator-always-on; }; @@ -136,3 +138,8 @@ &cpsw_emac1 { phy_id = <&davinci_mdio>, <1>; }; + +&mmc1 { + status = "okay"; + vmmc-supply = <&ldo3_reg>; +}; diff --git a/arch/arm/boot/dts/am335x-evm.dts b/arch/arm/boot/dts/am335x-evm.dts index d649644..2907da6 100644 --- a/arch/arm/boot/dts/am335x-evm.dts +++ b/arch/arm/boot/dts/am335x-evm.dts @@ -232,6 +232,8 @@ }; vmmc_reg: regulator@12 { + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <3300000>; regulator-always-on; }; }; @@ -244,3 +246,8 @@ &cpsw_emac1 { phy_id = <&davinci_mdio>, <1>; }; + +&mmc1 { + status = "okay"; + vmmc-supply = <&vmmc_reg>; +}; diff --git a/arch/arm/boot/dts/am335x-evmsk.dts b/arch/arm/boot/dts/am335x-evmsk.dts index f5a6162..f050c46 100644 --- a/arch/arm/boot/dts/am335x-evmsk.dts +++ b/arch/arm/boot/dts/am335x-evmsk.dts @@ -244,7 +244,14 @@ }; vmmc_reg: regulator@12 { + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <3300000>; regulator-always-on; }; }; }; + +&mmc1 { + status = "okay"; + vmmc-supply = <&vmmc_reg>; +}; diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi index e711ffb..278b75d 100644 --- a/arch/arm/boot/dts/am33xx.dtsi +++ b/arch/arm/boot/dts/am33xx.dtsi @@ -235,6 +235,34 @@ 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";
Adds AM33XX MMC support for am335x-bone, am335x-evm, and am335x-evmsk.. Signed-off-by: Matt Porter <mporter@ti.com> --- arch/arm/boot/dts/am335x-bone.dts | 7 +++++++ arch/arm/boot/dts/am335x-evm.dts | 7 +++++++ arch/arm/boot/dts/am335x-evmsk.dts | 7 +++++++ arch/arm/boot/dts/am33xx.dtsi | 28 ++++++++++++++++++++++++++++ 4 files changed, 49 insertions(+)