| Message ID | 1355790269-10596-3-git-send-email-sebastian.hesselbarth@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Sebastian, On Tue, Dec 18, 2012 at 01:24:29AM +0100, Sebastian Hesselbarth wrote: > Card detect for sdhci on Cubox is connected to the wrong pin > (sdio1_cd instead of sdio0_cd). With support for cd-gpios and > pinctrl add the corresponding properties to DT for Cubox. > > Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> > --- > Cc: Russell King <linux@arm.linux.org.uk> > Cc: Jason Cooper <jason@lakedaemon.net> > Cc: Andrew Lunn <andrew@lunn.ch> > Cc: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> > Cc: linux-arm-kernel@lists.infradead.org > Cc: linux-kernel@vger.kernel.org > --- > arch/arm/boot/dts/dove-cubox.dts | 14 ++++++++++++-- > 1 file changed, 12 insertions(+), 2 deletions(-) > > diff --git a/arch/arm/boot/dts/dove-cubox.dts b/arch/arm/boot/dts/dove-cubox.dts > index fed7d3f..cdee96f 100644 > --- a/arch/arm/boot/dts/dove-cubox.dts > +++ b/arch/arm/boot/dts/dove-cubox.dts > @@ -26,10 +26,15 @@ > }; > > &uart0 { status = "okay"; }; > -&sdio0 { status = "okay"; }; > &sata0 { status = "okay"; }; > &i2c0 { status = "okay"; }; > > +&sdio0 { > + status = "okay"; > + /* sdio0 card detect is connected to wrong pin on CuBox */ > + cd-gpios = <&gpio0 12 1>; this looks like a fix that should be merged into v3.8, I'll cue it up for v3.8-rc2. thx, Jason. > +}; > + > &spi0 { > status = "okay"; > > @@ -42,9 +47,14 @@ > }; > > &pinctrl { > - pinctrl-0 = <&pmx_gpio_18>; > + pinctrl-0 = <&pmx_gpio_12 &pmx_gpio_18>; > pinctrl-names = "default"; > > + pmx_gpio_12: pmx-gpio-12 { > + marvell,pins = "mpp12"; > + marvell,function = "gpio"; > + }; > + > pmx_gpio_18: pmx-gpio-18 { > marvell,pins = "mpp18"; > marvell,function = "gpio"; > -- > 1.7.10.4 >
On 12/18/2012 01:38 AM, Jason Cooper wrote: > On Tue, Dec 18, 2012 at 01:24:29AM +0100, Sebastian Hesselbarth wrote: >> Card detect for sdhci on Cubox is connected to the wrong pin >> (sdio1_cd instead of sdio0_cd). With support for cd-gpios and >> pinctrl add the corresponding properties to DT for Cubox. >> >> Signed-off-by: Sebastian Hesselbarth<sebastian.hesselbarth@gmail.com> >> ... >> +&sdio0 { >> + status = "okay"; >> + /* sdio0 card detect is connected to wrong pin on CuBox */ >> + cd-gpios =<&gpio0 12 1>; > > this looks like a fix that should be merged into v3.8, I'll cue it up > for v3.8-rc2. Jason, it is more a feature than a fix, as gpio-cd support for sdhci-dove moved in lately. You want me to split this patch from the other two (that I'll reorder as requested)? Sebastian
On Tue, Dec 18, 2012 at 01:50:12AM +0100, Sebastian Hesselbarth wrote: > On 12/18/2012 01:38 AM, Jason Cooper wrote: > > On Tue, Dec 18, 2012 at 01:24:29AM +0100, Sebastian Hesselbarth wrote: > >> Card detect for sdhci on Cubox is connected to the wrong pin > >> (sdio1_cd instead of sdio0_cd). With support for cd-gpios and > >> pinctrl add the corresponding properties to DT for Cubox. > >> > >> Signed-off-by: Sebastian Hesselbarth<sebastian.hesselbarth@gmail.com> > >> ... > >> +&sdio0 { > >> + status = "okay"; > >> + /* sdio0 card detect is connected to wrong pin on CuBox */ > >> + cd-gpios =<&gpio0 12 1>; > > > > this looks like a fix that should be merged into v3.8, I'll cue it up > > for v3.8-rc2. > > Jason, > > it is more a feature than a fix, as gpio-cd support for sdhci-dove > moved in lately. You want me to split this patch from the other two > (that I'll reorder as requested)? I was referring to the code more than the physical feature itself. You appear to remove the default &sdio0, and replace it with a working version. Looked like a fix to me ;-) No need to send it separate, I'll apply it as is once v3.8-rc1 drops. thx, Jason.
On Tue, Dec 18, 2012 at 01:24:29AM +0100, Sebastian Hesselbarth wrote: > Card detect for sdhci on Cubox is connected to the wrong pin > (sdio1_cd instead of sdio0_cd). With support for cd-gpios and > pinctrl add the corresponding properties to DT for Cubox. > > Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> > --- > Cc: Russell King <linux@arm.linux.org.uk> > Cc: Jason Cooper <jason@lakedaemon.net> > Cc: Andrew Lunn <andrew@lunn.ch> > Cc: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> > Cc: linux-arm-kernel@lists.infradead.org > Cc: linux-kernel@vger.kernel.org > --- > arch/arm/boot/dts/dove-cubox.dts | 14 ++++++++++++-- > 1 file changed, 12 insertions(+), 2 deletions(-) Applied to mvebu/fixes thx, Jason.
diff --git a/arch/arm/boot/dts/dove-cubox.dts b/arch/arm/boot/dts/dove-cubox.dts index fed7d3f..cdee96f 100644 --- a/arch/arm/boot/dts/dove-cubox.dts +++ b/arch/arm/boot/dts/dove-cubox.dts @@ -26,10 +26,15 @@ }; &uart0 { status = "okay"; }; -&sdio0 { status = "okay"; }; &sata0 { status = "okay"; }; &i2c0 { status = "okay"; }; +&sdio0 { + status = "okay"; + /* sdio0 card detect is connected to wrong pin on CuBox */ + cd-gpios = <&gpio0 12 1>; +}; + &spi0 { status = "okay"; @@ -42,9 +47,14 @@ }; &pinctrl { - pinctrl-0 = <&pmx_gpio_18>; + pinctrl-0 = <&pmx_gpio_12 &pmx_gpio_18>; pinctrl-names = "default"; + pmx_gpio_12: pmx-gpio-12 { + marvell,pins = "mpp12"; + marvell,function = "gpio"; + }; + pmx_gpio_18: pmx-gpio-18 { marvell,pins = "mpp18"; marvell,function = "gpio";
Card detect for sdhci on Cubox is connected to the wrong pin (sdio1_cd instead of sdio0_cd). With support for cd-gpios and pinctrl add the corresponding properties to DT for Cubox. Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> --- Cc: Russell King <linux@arm.linux.org.uk> Cc: Jason Cooper <jason@lakedaemon.net> Cc: Andrew Lunn <andrew@lunn.ch> Cc: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> Cc: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org --- arch/arm/boot/dts/dove-cubox.dts | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-)