From: Hans de Goede <hdegoede@redhat.com>
To: Adrian Hunter <adrian.hunter@intel.com>,
Ulf Hansson <ulf.hansson@linaro.org>,
Mika Westerberg <mika.westerberg@linux.intel.com>,
Andy Shevchenko <andy@kernel.org>
Cc: "Hans de Goede" <hdegoede@redhat.com>,
linux-mmc@vger.kernel.org, linux-gpio@vger.kernel.org,
"Nuno Sá" <nuno.sa@analog.com>
Subject: [PATCH 6/6] mmc: sdhci-acpi: Add quirk to enable pull-up on the card-detect GPIO on Asus T100TA
Date: Sun, 7 Apr 2024 22:04:53 +0200 [thread overview]
Message-ID: <20240407200453.40829-6-hdegoede@redhat.com> (raw)
In-Reply-To: <20240407200453.40829-1-hdegoede@redhat.com>
The card-detect GPIO for the microSD slot on Asus T100TA / T100TAM models
stopped working under Linux after commit 6fd03f024828 ("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 NoPull 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.
Cc: Nuno Sá <nuno.sa@analog.com>
Fixes: 6fd03f024828 ("gpiolib: acpi: support bias pull disable")
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
drivers/mmc/host/sdhci-acpi.c | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/drivers/mmc/host/sdhci-acpi.c b/drivers/mmc/host/sdhci-acpi.c
index ff45114bf886..2450617e99f0 100644
--- a/drivers/mmc/host/sdhci-acpi.c
+++ b/drivers/mmc/host/sdhci-acpi.c
@@ -10,6 +10,7 @@
#include <linux/export.h>
#include <linux/module.h>
#include <linux/device.h>
+#include <linux/pinctrl/pinconf-generic.h>
#include <linux/platform_device.h>
#include <linux/ioport.h>
#include <linux/io.h>
@@ -82,6 +83,7 @@ enum {
DMI_QUIRK_SD_NO_WRITE_PROTECT = BIT(1),
DMI_QUIRK_SD_NO_1_8_V = BIT(2),
DMI_QUIRK_SD_CD_ACTIVE_HIGH = BIT(3),
+ DMI_QUIRK_SD_CD_ENABLE_PULL_UP = BIT(4),
};
static inline void *sdhci_acpi_priv(struct sdhci_acpi_host *c)
@@ -735,6 +737,14 @@ static const struct dmi_system_id sdhci_acpi_quirks[] = {
},
.driver_data = (void *)DMI_QUIRK_SD_NO_WRITE_PROTECT,
},
+ {
+ /* Asus T100TA, needs pull-up for cd but DSDT GpioInt has NoPull set */
+ .matches = {
+ DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
+ DMI_MATCH(DMI_PRODUCT_NAME, "T100TA"),
+ },
+ .driver_data = (void *)DMI_QUIRK_SD_CD_ENABLE_PULL_UP,
+ },
{
/*
* The Lenovo Miix 320-10ICR has a bug in the _PS0 method of
@@ -928,7 +938,9 @@ static int sdhci_acpi_probe(struct platform_device *pdev)
goto err_free;
dev_warn(dev, "failed to setup card detect gpio\n");
c->use_runtime_pm = false;
- }
+ } else if (quirks & DMI_QUIRK_SD_CD_ENABLE_PULL_UP)
+ mmc_gpiod_set_cd_config(host->mmc,
+ PIN_CONF_PACKED(PIN_CONFIG_BIAS_PULL_UP, 20000));
if (quirks & DMI_QUIRK_RESET_SD_SIGNAL_VOLT_ON_SUSP)
c->reset_signal_volt_on_suspend = true;
--
2.44.0
next prev parent reply other threads:[~2024-04-07 20:05 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-07 20:04 [PATCH 1/6] mmc: core: Add mmc_gpiod_set_cd_config() function Hans de Goede
2024-04-07 20:04 ` [PATCH 2/6] mmc: sdhci-acpi: Sort DMI quirks alphabetically Hans de Goede
2024-04-07 20:04 ` [PATCH 3/6] mmc: sdhci-acpi: Fix Lenovo Yoga Tablet 2 Pro 1380 sdcard slot not working Hans de Goede
2024-04-07 20:04 ` [PATCH 4/6] mmc: sdhci-acpi: Disable UHS/1.8V modes on Lenovo Yoga Tablet 2 series sdcard slot Hans de Goede
2024-04-08 15:19 ` Andy Shevchenko
2024-04-08 15:22 ` Hans de Goede
2024-04-08 15:26 ` Andy Shevchenko
2024-04-07 20:04 ` [PATCH 5/6] mmc: sdhci-acpi: Disable write protect detection on Toshiba WT10-A Hans de Goede
2024-04-07 20:04 ` Hans de Goede [this message]
2024-04-08 15:22 ` [PATCH 6/6] mmc: sdhci-acpi: Add quirk to enable pull-up on the card-detect GPIO on Asus T100TA Andy Shevchenko
2024-04-08 15:16 ` [PATCH 1/6] mmc: core: Add mmc_gpiod_set_cd_config() function Andy Shevchenko
2024-04-08 15:21 ` Hans de Goede
2024-04-08 15:23 ` Andy Shevchenko
2024-04-08 15:27 ` Hans de Goede
2024-04-08 15:35 ` Andy Shevchenko
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240407200453.40829-6-hdegoede@redhat.com \
--to=hdegoede@redhat.com \
--cc=adrian.hunter@intel.com \
--cc=andy@kernel.org \
--cc=linux-gpio@vger.kernel.org \
--cc=linux-mmc@vger.kernel.org \
--cc=mika.westerberg@linux.intel.com \
--cc=nuno.sa@analog.com \
--cc=ulf.hansson@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).