Skip to content

Commit 471cf45

Browse files
wojtas-marcinUlf Hansson
authored andcommitted
mmc: sdhci-xenon: introduce ACPI support
Previous patches dropped the strict dependency on the OF_* in the sdhci-xenon driver. As a result the ACPI support can be introduced (except for the XENON_A3700 variant) by adding the necessary ID's in the acpi_match_table. Signed-off-by: Marcin Wojtas <mw@semihalf.com> Link: https://lore.kernel.org/r/20201204171626.10935-5-mw@semihalf.com Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
1 parent 1542488 commit 471cf45

1 file changed

Lines changed: 12 additions & 0 deletions

File tree

drivers/mmc/host/sdhci-xenon.c

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
* Special thanks to Video BG4 project team.
1212
*/
1313

14+
#include <linux/acpi.h>
1415
#include <linux/delay.h>
1516
#include <linux/ktime.h>
1617
#include <linux/module.h>
@@ -689,11 +690,22 @@ static const struct of_device_id sdhci_xenon_dt_ids[] = {
689690
};
690691
MODULE_DEVICE_TABLE(of, sdhci_xenon_dt_ids);
691692

693+
#ifdef CONFIG_ACPI
694+
static const struct acpi_device_id sdhci_xenon_acpi_ids[] = {
695+
{ .id = "MRVL0002", XENON_AP806},
696+
{ .id = "MRVL0003", XENON_AP807},
697+
{ .id = "MRVL0004", XENON_CP110},
698+
{}
699+
};
700+
MODULE_DEVICE_TABLE(acpi, sdhci_xenon_acpi_ids);
701+
#endif
702+
692703
static struct platform_driver sdhci_xenon_driver = {
693704
.driver = {
694705
.name = "xenon-sdhci",
695706
.probe_type = PROBE_PREFER_ASYNCHRONOUS,
696707
.of_match_table = sdhci_xenon_dt_ids,
708+
.acpi_match_table = ACPI_PTR(sdhci_xenon_acpi_ids),
697709
.pm = &sdhci_xenon_dev_pm_ops,
698710
},
699711
.probe = xenon_probe,

0 commit comments

Comments
 (0)