| Message ID | 1379000532-27376-2-git-send-email-koen@dominion.thruhere.net (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
nitpick minor comment: $subject: ARM: dts: am335x-bone: add card detect for mmc1 btw, please use V3 in $subject next time. --subject-prefix "PATCH V3" when generating patch should do the job. On 09/12/2013 10:42 AM, Koen Kooi wrote: > From: Alexander Holler <holler@ahsoftware.de> > > This enables the use of MMC cards even when no card was inserted at boot. > > Signed-off-by: Alexander Holler <holler@ahsoftware.de> > Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> > --- > > Changes since v2: > None, again a simple repost > > Changes since v1: > None, simple repost > > arch/arm/boot/dts/am335x-bone-common.dtsi | 14 ++++++++++++++ > arch/arm/boot/dts/am335x-bone.dts | 4 ---- > 2 files changed, 14 insertions(+), 4 deletions(-) > > diff --git a/arch/arm/boot/dts/am335x-bone-common.dtsi b/arch/arm/boot/dts/am335x-bone-common.dtsi > index 2f66ded..ced256c 100644 > --- a/arch/arm/boot/dts/am335x-bone-common.dtsi > +++ b/arch/arm/boot/dts/am335x-bone-common.dtsi > @@ -107,6 +107,11 @@ > 0x14c (PIN_INPUT_PULLDOWN | MUX_MODE7) > >; > }; An EOL here would be nice to separate the nodes. > + mmc1_pins: pinmux_mmc1_pins { > + pinctrl-single,pins = < > + 0x160 (PIN_INPUT | MUX_MODE7) /* GPIO0_6 */ > + >; > + }; > }; > > ocp { > @@ -260,3 +265,12 @@ > pinctrl-0 = <&davinci_mdio_default>; > pinctrl-1 = <&davinci_mdio_sleep>; > }; > + > +&mmc1 { > + status = "okay"; > + vmmc-supply = <&ldo3_reg>; > + pinctrl-names = "default"; > + pinctrl-0 = <&mmc1_pins>; > + cd-gpios = <&gpio0 6 GPIO_ACTIVE_HIGH>; > + cd-inverted; > +}; > diff --git a/arch/arm/boot/dts/am335x-bone.dts b/arch/arm/boot/dts/am335x-bone.dts > index d5f43fe..d34469c 100644 > --- a/arch/arm/boot/dts/am335x-bone.dts > +++ b/arch/arm/boot/dts/am335x-bone.dts > @@ -16,7 +16,3 @@ > regulator-always-on; > }; > > -&mmc1 { > - status = "okay"; > - vmmc-supply = <&ldo3_reg>; > -}; >
diff --git a/arch/arm/boot/dts/am335x-bone-common.dtsi b/arch/arm/boot/dts/am335x-bone-common.dtsi index 2f66ded..ced256c 100644 --- a/arch/arm/boot/dts/am335x-bone-common.dtsi +++ b/arch/arm/boot/dts/am335x-bone-common.dtsi @@ -107,6 +107,11 @@ 0x14c (PIN_INPUT_PULLDOWN | MUX_MODE7) >; }; + mmc1_pins: pinmux_mmc1_pins { + pinctrl-single,pins = < + 0x160 (PIN_INPUT | MUX_MODE7) /* GPIO0_6 */ + >; + }; }; ocp { @@ -260,3 +265,12 @@ pinctrl-0 = <&davinci_mdio_default>; pinctrl-1 = <&davinci_mdio_sleep>; }; + +&mmc1 { + status = "okay"; + vmmc-supply = <&ldo3_reg>; + pinctrl-names = "default"; + pinctrl-0 = <&mmc1_pins>; + cd-gpios = <&gpio0 6 GPIO_ACTIVE_HIGH>; + cd-inverted; +}; diff --git a/arch/arm/boot/dts/am335x-bone.dts b/arch/arm/boot/dts/am335x-bone.dts index d5f43fe..d34469c 100644 --- a/arch/arm/boot/dts/am335x-bone.dts +++ b/arch/arm/boot/dts/am335x-bone.dts @@ -16,7 +16,3 @@ regulator-always-on; }; -&mmc1 { - status = "okay"; - vmmc-supply = <&ldo3_reg>; -};