| Message ID | 1378879946-13037-3-git-send-email-koen@dominion.thruhere.net (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Wednesday 11 September 2013 11:42 AM, Koen Kooi wrote: > Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> > --- > arch/arm/boot/dts/am335x-bone-common.dtsi | 7 +++++++ > arch/arm/boot/dts/am335x-boneblack.dts | 15 +++++++++++++++ > 2 files changed, 22 insertions(+) > > diff --git a/arch/arm/boot/dts/am335x-bone-common.dtsi b/arch/arm/boot/dts/am335x-bone-common.dtsi > index ced256c..9c61fef 100644 > --- a/arch/arm/boot/dts/am335x-bone-common.dtsi > +++ b/arch/arm/boot/dts/am335x-bone-common.dtsi > @@ -241,6 +241,13 @@ > regulator-always-on; > }; > }; > + > + vmmcsd_fixed: fixedregulator@0 { > + compatible = "regulator-fixed"; > + regulator-name = "vmmcsd_fixed"; > + regulator-min-microvolt = <3300000>; > + regulator-max-microvolt = <3300000>; > + }; > }; > > &cpsw_emac0 { > diff --git a/arch/arm/boot/dts/am335x-boneblack.dts b/arch/arm/boot/dts/am335x-boneblack.dts > index 197cadf..c09947a 100644 > --- a/arch/arm/boot/dts/am335x-boneblack.dts > +++ b/arch/arm/boot/dts/am335x-boneblack.dts > @@ -15,3 +15,18 @@ > regulator-max-microvolt = <1800000>; > regulator-always-on; > }; > + > +&mmc1 { > + vmmc-supply = <&vmmcsd_fixed>; > +}; > + > +&mmc2 { > + vmmc-supply = <&vmmcsd_fixed>; > + pinctrl-names = "default"; > + pinctrl-0 = <&emmc_pins>; > + bus-width = <8>; > + ti,non-removable; There is a standard binding available for this: "non-removable" There should not be a need to introduce a TI specific binding for this (I know this is not your fault). I will send a patch to change the existing .dts files and update the driver - can you drop this line for now so we don't introduce more incompatibilities? I can send a patch adding "non-removable" to this node as part of my clean-up series. Thanks, Sekhar
Op 11 sep. 2013, om 12:06 heeft Sekhar Nori <nsekhar@ti.com> het volgende geschreven: > On Wednesday 11 September 2013 11:42 AM, Koen Kooi wrote: >> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> >> --- >> arch/arm/boot/dts/am335x-bone-common.dtsi | 7 +++++++ >> arch/arm/boot/dts/am335x-boneblack.dts | 15 +++++++++++++++ >> 2 files changed, 22 insertions(+) >> >> diff --git a/arch/arm/boot/dts/am335x-bone-common.dtsi b/arch/arm/boot/dts/am335x-bone-common.dtsi >> index ced256c..9c61fef 100644 >> --- a/arch/arm/boot/dts/am335x-bone-common.dtsi >> +++ b/arch/arm/boot/dts/am335x-bone-common.dtsi >> @@ -241,6 +241,13 @@ >> regulator-always-on; >> }; >> }; >> + >> + vmmcsd_fixed: fixedregulator@0 { >> + compatible = "regulator-fixed"; >> + regulator-name = "vmmcsd_fixed"; >> + regulator-min-microvolt = <3300000>; >> + regulator-max-microvolt = <3300000>; >> + }; >> }; >> >> &cpsw_emac0 { >> diff --git a/arch/arm/boot/dts/am335x-boneblack.dts b/arch/arm/boot/dts/am335x-boneblack.dts >> index 197cadf..c09947a 100644 >> --- a/arch/arm/boot/dts/am335x-boneblack.dts >> +++ b/arch/arm/boot/dts/am335x-boneblack.dts >> @@ -15,3 +15,18 @@ >> regulator-max-microvolt = <1800000>; >> regulator-always-on; >> }; >> + >> +&mmc1 { >> + vmmc-supply = <&vmmcsd_fixed>; >> +}; >> + >> +&mmc2 { >> + vmmc-supply = <&vmmcsd_fixed>; >> + pinctrl-names = "default"; >> + pinctrl-0 = <&emmc_pins>; >> + bus-width = <8>; >> + ti,non-removable; > > There is a standard binding available for this: "non-removable" > There should not be a need to introduce a TI specific binding for this > (I know this is not your fault). > > I will send a patch to change the existing .dts files and update the > driver - can you drop this line for now so we don't introduce more > incompatibilities? I can send a patch adding "non-removable" to this > node as part of my clean-up series. Sure, I'll send a v2 shortly. Thank you very much for killing another ti, prefixed node! regards, Koen
diff --git a/arch/arm/boot/dts/am335x-bone-common.dtsi b/arch/arm/boot/dts/am335x-bone-common.dtsi index ced256c..9c61fef 100644 --- a/arch/arm/boot/dts/am335x-bone-common.dtsi +++ b/arch/arm/boot/dts/am335x-bone-common.dtsi @@ -241,6 +241,13 @@ regulator-always-on; }; }; + + vmmcsd_fixed: fixedregulator@0 { + compatible = "regulator-fixed"; + regulator-name = "vmmcsd_fixed"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + }; }; &cpsw_emac0 { diff --git a/arch/arm/boot/dts/am335x-boneblack.dts b/arch/arm/boot/dts/am335x-boneblack.dts index 197cadf..c09947a 100644 --- a/arch/arm/boot/dts/am335x-boneblack.dts +++ b/arch/arm/boot/dts/am335x-boneblack.dts @@ -15,3 +15,18 @@ regulator-max-microvolt = <1800000>; regulator-always-on; }; + +&mmc1 { + vmmc-supply = <&vmmcsd_fixed>; +}; + +&mmc2 { + vmmc-supply = <&vmmcsd_fixed>; + pinctrl-names = "default"; + pinctrl-0 = <&emmc_pins>; + bus-width = <8>; + ti,non-removable; + status = "okay"; + ti,vcc-aux-disable-is-sleep; +}; +
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> --- arch/arm/boot/dts/am335x-bone-common.dtsi | 7 +++++++ arch/arm/boot/dts/am335x-boneblack.dts | 15 +++++++++++++++ 2 files changed, 22 insertions(+)