| Message ID | 20200310182537.8156-1-nick.hudson@gmx.co.uk (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 6687c201fdc3139315c2ea7ef96c157672805cdc |
| Headers | show |
| Series | ARM: bcm2835-rpi-zero-w: Add missing pinctrl name | expand |
On Tue, 2020-03-10 at 18:25 +0000, nick.hudson@gmx.co.uk wrote: > From: Nick Hudson <nick.hudson@gmx.co.uk> > > Define the sdhci pinctrl state as "default" so it gets applied > correctly and to match all other RPis. > > Fixes: 2c7c040c73e9 ("ARM: dts: bcm2835: Add Raspberry Pi Zero W") > > Signed-off-by: Nick Hudson <skrll@netbsd.org> I think this one has everything right. As a nitpick, there is no need to add a space between the Fixes tag and the Signed-off-by tag, but it's OK as is. Florian, can we channel this as a fix for v5.6 or are we too late? Regards, Nicolas
On 3/11/20 4:28 AM, Nicolas Saenz Julienne wrote: > On Tue, 2020-03-10 at 18:25 +0000, nick.hudson@gmx.co.uk wrote: >> From: Nick Hudson <nick.hudson@gmx.co.uk> >> >> Define the sdhci pinctrl state as "default" so it gets applied >> correctly and to match all other RPis. >> >> Fixes: 2c7c040c73e9 ("ARM: dts: bcm2835: Add Raspberry Pi Zero W") >> >> Signed-off-by: Nick Hudson <skrll@netbsd.org> > > I think this one has everything right. As a nitpick, there is no need to add a > space between the Fixes tag and the Signed-off-by tag, but it's OK as is. > > Florian, can we channel this as a fix for v5.6 or are we too late? We can try, let me queue this today.
On Wed, 2020-03-11 at 09:37 -0700, Florian Fainelli wrote: > On 3/11/20 4:28 AM, Nicolas Saenz Julienne wrote: > > On Tue, 2020-03-10 at 18:25 +0000, nick.hudson@gmx.co.uk wrote: > > > From: Nick Hudson <nick.hudson@gmx.co.uk> > > > > > > Define the sdhci pinctrl state as "default" so it gets applied > > > correctly and to match all other RPis. > > > > > > Fixes: 2c7c040c73e9 ("ARM: dts: bcm2835: Add Raspberry Pi Zero W") > > > > > > Signed-off-by: Nick Hudson <skrll@netbsd.org> > > > > I think this one has everything right. As a nitpick, there is no need to add > > a > > space between the Fixes tag and the Signed-off-by tag, but it's OK as is. > > > > Florian, can we channel this as a fix for v5.6 or are we too late? > > We can try, let me queue this today. Cool, in that case you can add my: Acked-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de> Regards, Nicolas
On Tue, 10 Mar 2020 18:25:37 +0000, nick.hudson@gmx.co.uk wrote: > From: Nick Hudson <nick.hudson@gmx.co.uk> > > Define the sdhci pinctrl state as "default" so it gets applied > correctly and to match all other RPis. > > Fixes: 2c7c040c73e9 ("ARM: dts: bcm2835: Add Raspberry Pi Zero W") > > Signed-off-by: Nick Hudson <skrll@netbsd.org> > --- Applied to devicetree/fixes, thanks! -- Florian
On 3/11/20 2:24 PM, Florian Fainelli wrote: > On Tue, 10 Mar 2020 18:25:37 +0000, nick.hudson@gmx.co.uk wrote: >> From: Nick Hudson <nick.hudson@gmx.co.uk> >> >> Define the sdhci pinctrl state as "default" so it gets applied >> correctly and to match all other RPis. >> >> Fixes: 2c7c040c73e9 ("ARM: dts: bcm2835: Add Raspberry Pi Zero W") >> >> Signed-off-by: Nick Hudson <skrll@netbsd.org> >> --- > > Applied to devicetree/fixes, thanks! Actually, no, taken back, my pre-commit checks failed with: Missing Signed-off-by from author. Your From and Signed-off-by are different, can you resubmit?
diff --git a/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts b/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts index b75af21069f9..4c3f606e5b8d 100644 --- a/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts +++ b/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts @@ -112,6 +112,7 @@ &sdhci { #address-cells = <1>; #size-cells = <0>; + pinctrl-names = "default"; pinctrl-0 = <&emmc_gpio34 &gpclk2_gpio43>; bus-width = <4>; mmc-pwrseq = <&wifi_pwrseq>;