Messages in this thread | | | Subject | Re: [PATCH AUTOSEL 5.10 11/47] mmc: sdhci-iproc: Add ACPI bindings for the RPi | From | Jeremy Linton <> | Date | Tue, 2 Mar 2021 10:16:59 -0600 |
| |
Hi,
On 3/2/21 5:56 AM, Sasha Levin wrote: > From: Jeremy Linton <jeremy.linton@arm.com> > > [ Upstream commit 4f9833d3ec8da34861cd0680b00c73e653877eb9 ] > > The RPi4 has an Arasan controller it carries over from the RPi3 and a newer > eMMC2 controller. Because of a couple of quirks, it seems wiser to bind > these controllers to the same driver that DT is using on this platform > rather than the generic sdhci_acpi driver with PNP0D40. > > So, BCM2847 describes the older Arasan and BRCME88C describes the newer > eMMC2. The older Arasan is reusing an existing ACPI _HID used by other OSes > booting these tables on the RPi. > > With this change, Linux is capable of utilizing the SD card slot, and the > Wi-Fi when booted with UEFI+ACPI on the RPi4.
For this to actually work on kernels < 5.11 you also need:
c5b1c6dc13da mmc: sdhci: Update firmware interface API
Which I don't see in 5.10 yet.
Thanks,
> > Signed-off-by: Jeremy Linton <jeremy.linton@arm.com> > Acked-by: Florian Fainelli <f.fainelli@gmail.com> > Link: https://lore.kernel.org/r/20210120000406.1843400-2-jeremy.linton@arm.com > Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> > Signed-off-by: Sasha Levin <sashal@kernel.org> > --- > drivers/mmc/host/sdhci-iproc.c | 18 ++++++++++++++++++ > 1 file changed, 18 insertions(+) > > diff --git a/drivers/mmc/host/sdhci-iproc.c b/drivers/mmc/host/sdhci-iproc.c > index c9434b461aab..ddeaf8e1f72f 100644 > --- a/drivers/mmc/host/sdhci-iproc.c > +++ b/drivers/mmc/host/sdhci-iproc.c > @@ -296,9 +296,27 @@ static const struct of_device_id sdhci_iproc_of_match[] = { > MODULE_DEVICE_TABLE(of, sdhci_iproc_of_match); > > #ifdef CONFIG_ACPI > +/* > + * This is a duplicate of bcm2835_(pltfrm_)data without caps quirks > + * which are provided by the ACPI table. > + */ > +static const struct sdhci_pltfm_data sdhci_bcm_arasan_data = { > + .quirks = SDHCI_QUIRK_BROKEN_CARD_DETECTION | > + SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK | > + SDHCI_QUIRK_NO_HISPD_BIT, > + .quirks2 = SDHCI_QUIRK2_PRESET_VALUE_BROKEN, > + .ops = &sdhci_iproc_32only_ops, > +}; > + > +static const struct sdhci_iproc_data bcm_arasan_data = { > + .pdata = &sdhci_bcm_arasan_data, > +}; > + > static const struct acpi_device_id sdhci_iproc_acpi_ids[] = { > { .id = "BRCM5871", .driver_data = (kernel_ulong_t)&iproc_cygnus_data }, > { .id = "BRCM5872", .driver_data = (kernel_ulong_t)&iproc_data }, > + { .id = "BCM2847", .driver_data = (kernel_ulong_t)&bcm_arasan_data }, > + { .id = "BRCME88C", .driver_data = (kernel_ulong_t)&bcm2711_data }, > { /* sentinel */ } > }; > MODULE_DEVICE_TABLE(acpi, sdhci_iproc_acpi_ids); >
| |