| Message ID | 20171125120200.23294-3-andre.przywara@arm.com |
|---|---|
| State | New |
| Headers | show |
| Series | pinctrl: sunxi: Fix H5 MMC access | expand |
On Sat, Nov 25, 2017 at 12:02:00PM +0000, Andre Przywara wrote: > All of the H5 boards in the kernel reference the MMC0 CD pin twice in > their DT, so strict mode will make the MMC driver fail to load. > To keep existing DTs working, disable strict mode in the H5 driver. > > Signed-off-by: Andre Przywara <andre.przywara@arm.com> > Reported-by: Chris Obbard <obbardc@gmail.com> Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com> Sorry for missing that one... Thanks! Maxime
On Sat, Nov 25, 2017 at 1:02 PM, Andre Przywara <andre.przywara@arm.com> wrote: > All of the H5 boards in the kernel reference the MMC0 CD pin twice in > their DT, so strict mode will make the MMC driver fail to load. > To keep existing DTs working, disable strict mode in the H5 driver. > > Signed-off-by: Andre Przywara <andre.przywara@arm.com> > Reported-by: Chris Obbard <obbardc@gmail.com> Patch applied with Maxime's ACK. Yours, Linus Walleij -- To unsubscribe from this list: send the line "unsubscribe linux-gpio" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi, On 30/11/17 15:51, Linus Walleij wrote: > On Sat, Nov 25, 2017 at 1:02 PM, Andre Przywara <andre.przywara@arm.com> wrote: > >> All of the H5 boards in the kernel reference the MMC0 CD pin twice in >> their DT, so strict mode will make the MMC driver fail to load. >> To keep existing DTs working, disable strict mode in the H5 driver. >> >> Signed-off-by: Andre Przywara <andre.przywara@arm.com> >> Reported-by: Chris Obbard <obbardc@gmail.com> > > Patch applied with Maxime's ACK. Thanks for that (also to Maxime and Chen-Yu) and the smooth handling! Sorry, I just see that I didn't point this out explicitly, but this is to fix a regression introduced in 4.15-rc1, so is this on a branch that will be pushed for 4.15-rc, still? (Couldn't find anything quickly on kernel.org) Cheers, Andre. -- To unsubscribe from this list: send the line "unsubscribe linux-gpio" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Thu, Nov 30, 2017 at 5:07 PM, Andre Przywara <andre.przywara@arm.com> wrote: > On 30/11/17 15:51, Linus Walleij wrote: >> On Sat, Nov 25, 2017 at 1:02 PM, Andre Przywara <andre.przywara@arm.com> wrote: >> >>> All of the H5 boards in the kernel reference the MMC0 CD pin twice in >>> their DT, so strict mode will make the MMC driver fail to load. >>> To keep existing DTs working, disable strict mode in the H5 driver. >>> >>> Signed-off-by: Andre Przywara <andre.przywara@arm.com> >>> Reported-by: Chris Obbard <obbardc@gmail.com> >> >> Patch applied with Maxime's ACK. > > Thanks for that (also to Maxime and Chen-Yu) and the smooth handling! > > Sorry, I just see that I didn't point this out explicitly, but this is > to fix a regression introduced in 4.15-rc1, so is this on a branch that > will be pushed for 4.15-rc, still? (Couldn't find anything quickly on > kernel.org) Should be upstream as: commit 07c43a382d7de3db01cc28bf2e17ed151cde2046 Yours, Linus Walleij -- To unsubscribe from this list: send the line "unsubscribe linux-gpio" 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/drivers/pinctrl/sunxi/pinctrl-sun50i-h5.c b/drivers/pinctrl/sunxi/pinctrl-sun50i-h5.c index 97b48336f84a..a78d7b922ef4 100644 --- a/drivers/pinctrl/sunxi/pinctrl-sun50i-h5.c +++ b/drivers/pinctrl/sunxi/pinctrl-sun50i-h5.c @@ -535,14 +535,16 @@ static const struct sunxi_pinctrl_desc sun50i_h5_pinctrl_data_broken = { .pins = sun50i_h5_pins, .npins = ARRAY_SIZE(sun50i_h5_pins), .irq_banks = 2, - .irq_read_needs_mux = true + .irq_read_needs_mux = true, + .disable_strict_mode = true, }; static const struct sunxi_pinctrl_desc sun50i_h5_pinctrl_data = { .pins = sun50i_h5_pins, .npins = ARRAY_SIZE(sun50i_h5_pins), .irq_banks = 3, - .irq_read_needs_mux = true + .irq_read_needs_mux = true, + .disable_strict_mode = true, }; static int sun50i_h5_pinctrl_probe(struct platform_device *pdev)
All of the H5 boards in the kernel reference the MMC0 CD pin twice in their DT, so strict mode will make the MMC driver fail to load. To keep existing DTs working, disable strict mode in the H5 driver. Signed-off-by: Andre Przywara <andre.przywara@arm.com> Reported-by: Chris Obbard <obbardc@gmail.com> --- drivers/pinctrl/sunxi/pinctrl-sun50i-h5.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)