Skip to content

Commit 431946c

Browse files
jwrdegoedestorulf
authored andcommitted
mmc: sdhci-acpi: Add quirk to enable pull-up on the card-detect GPIO on Asus T100TA
The card-detect GPIO for the microSD slot on Asus T100TA / T100TAM models stopped working under Linux after commit 6fd03f0 ("gpiolib: acpi: support bias pull disable"). The GPIO in question is connected to a mechanical switch in the slot which shorts the pin to GND when a card is inserted. The GPIO pin correctly gets configured with a 20K pull-up by the BIOS, but there is a bug in the DSDT where the GpioInt for the card-detect is configured with a PullNone setting: GpioInt (Edge, ActiveBoth, SharedAndWake, PullNone, 0x2710, "\\_SB.GPO0", 0x00, ResourceConsumer, , ) { // Pin list 0x0026 } Linux now actually honors the PullNone setting and disables the 20K pull-up configured by the BIOS. Add a new DMI_QUIRK_SD_CD_ENABLE_PULL_UP quirk which when set calls mmc_gpiod_set_cd_config() to re-enable the pull-up and set this for the Asus T100TA models to fix this. Fixes: 6fd03f0 ("gpiolib: acpi: support bias pull disable") Reviewed-by: Andy Shevchenko <[email protected]> Signed-off-by: Hans de Goede <[email protected]> Acked-by: Adrian Hunter <[email protected]> Cc: [email protected] Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Ulf Hansson <[email protected]>
1 parent ef3eab7 commit 431946c

File tree

1 file changed

+13
-0
lines changed

1 file changed

+13
-0
lines changed

drivers/mmc/host/sdhci-acpi.c

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
#include <linux/export.h>
1111
#include <linux/module.h>
1212
#include <linux/device.h>
13+
#include <linux/pinctrl/pinconf-generic.h>
1314
#include <linux/platform_device.h>
1415
#include <linux/ioport.h>
1516
#include <linux/io.h>
@@ -81,6 +82,7 @@ enum {
8182
DMI_QUIRK_RESET_SD_SIGNAL_VOLT_ON_SUSP = BIT(0),
8283
DMI_QUIRK_SD_NO_WRITE_PROTECT = BIT(1),
8384
DMI_QUIRK_SD_CD_ACTIVE_HIGH = BIT(2),
85+
DMI_QUIRK_SD_CD_ENABLE_PULL_UP = BIT(3),
8486
};
8587

8688
static inline void *sdhci_acpi_priv(struct sdhci_acpi_host *c)
@@ -734,6 +736,14 @@ static const struct dmi_system_id sdhci_acpi_quirks[] = {
734736
},
735737
.driver_data = (void *)DMI_QUIRK_SD_NO_WRITE_PROTECT,
736738
},
739+
{
740+
/* Asus T100TA, needs pull-up for cd but DSDT GpioInt has NoPull set */
741+
.matches = {
742+
DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
743+
DMI_MATCH(DMI_PRODUCT_NAME, "T100TA"),
744+
},
745+
.driver_data = (void *)DMI_QUIRK_SD_CD_ENABLE_PULL_UP,
746+
},
737747
{
738748
/*
739749
* The Lenovo Miix 320-10ICR has a bug in the _PS0 method of
@@ -908,6 +918,9 @@ static int sdhci_acpi_probe(struct platform_device *pdev)
908918
goto err_free;
909919
dev_warn(dev, "failed to setup card detect gpio\n");
910920
c->use_runtime_pm = false;
921+
} else if (quirks & DMI_QUIRK_SD_CD_ENABLE_PULL_UP) {
922+
mmc_gpiod_set_cd_config(host->mmc,
923+
PIN_CONF_PACKED(PIN_CONFIG_BIAS_PULL_UP, 20000));
911924
}
912925

913926
if (quirks & DMI_QUIRK_RESET_SD_SIGNAL_VOLT_ON_SUSP)

0 commit comments

Comments
 (0)