| Message ID | 1375218923-29876-2-git-send-email-coelho@ti.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Wednesday 31 July 2013 02:45 AM, Luciano Coelho wrote: > Add regulator, pin muxing and MMC5 configuration to be used by the > on-board WiLink6 module. > > Signed-off-by: Luciano Coelho <coelho@ti.com> > --- > arch/arm/boot/dts/omap4-panda-common.dtsi | 31 ++++++++++++++++++++++++++++++- > 1 file changed, 30 insertions(+), 1 deletion(-) > > diff --git a/arch/arm/boot/dts/omap4-panda-common.dtsi b/arch/arm/boot/dts/omap4-panda-common.dtsi > index faa95b5..b3f6e1f 100644 > --- a/arch/arm/boot/dts/omap4-panda-common.dtsi > +++ b/arch/arm/boot/dts/omap4-panda-common.dtsi > @@ -107,6 +107,16 @@ > */ > clock-frequency = <19200000>; > }; > + > + wilink_wl_en: fixedregulator@1 { > + compatible = "regulator-fixed"; > + regulator-name = "wilink_wl_en"; > + regulator-min-microvolt = <1800000>; > + regulator-max-microvolt = <1800000>; > + gpio = <&gpio2 11 0>; /* gpio line 43 */ > + startup-delay-us = <70000>; > + enable-active-high; > + }; > }; > > &omap4_pmx_wkup { > @@ -132,6 +142,7 @@ > &dss_hdmi_pins > &tpd12s015_pins > &hsusbb1_pins > + &wilink_pins > >; > > twl6030_pins: pinmux_twl6030_pins { > @@ -235,6 +246,19 @@ > 0x1c (PIN_OUTPUT | MUX_MODE3) /* gpio_wk8 */ > >; > }; > + > + wilink_pins: pinmux_wilink_pins { > + pinctrl-single,pins = < > + 0x7a 0x103 /* gpio_53 INPUT | MODE3 */ > + 0x66 0x3 /* gpio_43 OUTPUT | MODE3 */ > + 0x148 0x118 /* clk INPUT PULLUP | MODE0 */ > + 0x14a 0x118 /* cmd INPUT PULLUP | MODE0 */ > + 0x14c 0x118 /* dat0 INPUT PULLUP | MODE0 */ > + 0x14e 0x118 /* dat1 INPUT PULLUP | MODE0 */ > + 0x150 0x118 /* dat2 INPUT PULLUP | MODE0 */ > + 0x152 0x118 /* dat3 INPUT PULLUP | MODE0 */ Hi, Since the base for omap4_pmx_core is 0x4a100040, you need to offset 0x40 from pad address :-) and can you please use INPUT_EN / PIN_INPUT_PULLUP / MUX_MODEx macros (from dt-bindings/pinctrl/omap.h) -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/arm/boot/dts/omap4-panda-common.dtsi b/arch/arm/boot/dts/omap4-panda-common.dtsi index faa95b5..b3f6e1f 100644 --- a/arch/arm/boot/dts/omap4-panda-common.dtsi +++ b/arch/arm/boot/dts/omap4-panda-common.dtsi @@ -107,6 +107,16 @@ */ clock-frequency = <19200000>; }; + + wilink_wl_en: fixedregulator@1 { + compatible = "regulator-fixed"; + regulator-name = "wilink_wl_en"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + gpio = <&gpio2 11 0>; /* gpio line 43 */ + startup-delay-us = <70000>; + enable-active-high; + }; }; &omap4_pmx_wkup { @@ -132,6 +142,7 @@ &dss_hdmi_pins &tpd12s015_pins &hsusbb1_pins + &wilink_pins >; twl6030_pins: pinmux_twl6030_pins { @@ -235,6 +246,19 @@ 0x1c (PIN_OUTPUT | MUX_MODE3) /* gpio_wk8 */ >; }; + + wilink_pins: pinmux_wilink_pins { + pinctrl-single,pins = < + 0x7a 0x103 /* gpio_53 INPUT | MODE3 */ + 0x66 0x3 /* gpio_43 OUTPUT | MODE3 */ + 0x148 0x118 /* clk INPUT PULLUP | MODE0 */ + 0x14a 0x118 /* cmd INPUT PULLUP | MODE0 */ + 0x14c 0x118 /* dat0 INPUT PULLUP | MODE0 */ + 0x14e 0x118 /* dat1 INPUT PULLUP | MODE0 */ + 0x150 0x118 /* dat2 INPUT PULLUP | MODE0 */ + 0x152 0x118 /* dat3 INPUT PULLUP | MODE0 */ + >; + }; }; &i2c1 { @@ -314,8 +338,13 @@ }; &mmc5 { - ti,non-removable; + status = "okay"; + vmmc-supply = <&wilink_wl_en>; bus-width = <4>; + cap-power-off-card; + keep-power-in-suspend; + ti,non-removable; + ti,needs-special-hs-handling; }; &emif1 {
Add regulator, pin muxing and MMC5 configuration to be used by the on-board WiLink6 module. Signed-off-by: Luciano Coelho <coelho@ti.com> --- arch/arm/boot/dts/omap4-panda-common.dtsi | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-)