mmc: sdhci-acpi: Disable write protect detection on Acer Aspire Switch 10 (SW5-012)

[sfrench/cifs-2.6.git] / drivers / mmc / host / sdhci-acpi.c

diff --git a/drivers/mmc/host/sdhci-acpi.c b/drivers/mmc/host/sdhci-acpi.c
index b4c1b236706670ddb972eaeb7cd21e7d30c53d65..2a2173d953f584d283eecc7845147e88d152435e 100644 (file)
--- a/drivers/mmc/host/sdhci-acpi.c
+++ b/drivers/mmc/host/sdhci-acpi.c
@@ -80,6 +80,7 @@ struct sdhci_acpi_host {
 
 enum {
        DMI_QUIRK_RESET_SD_SIGNAL_VOLT_ON_SUSP                  = BIT(0),
 
 enum {
        DMI_QUIRK_RESET_SD_SIGNAL_VOLT_ON_SUSP                  = BIT(0),

+       DMI_QUIRK_SD_NO_WRITE_PROTECT                           = BIT(1),

 };
 
 static inline void *sdhci_acpi_priv(struct sdhci_acpi_host *c)
 };
 
 static inline void *sdhci_acpi_priv(struct sdhci_acpi_host *c)


@@ -671,6 +672,18 @@ static const struct dmi_system_id sdhci_acpi_quirks[] = {
                },
                .driver_data = (void *)DMI_QUIRK_RESET_SD_SIGNAL_VOLT_ON_SUSP,
        },
                },
                .driver_data = (void *)DMI_QUIRK_RESET_SD_SIGNAL_VOLT_ON_SUSP,
        },

+       {
+               /*
+                * The Acer Aspire Switch 10 (SW5-012) microSD slot always
+                * reports the card being write-protected even though microSD
+                * cards do not have a write-protect switch at all.
+                */
+               .matches = {
+                       DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "Aspire SW5-012"),
+               },
+               .driver_data = (void *)DMI_QUIRK_SD_NO_WRITE_PROTECT,
+       },

        {} /* Terminating entry */
 };
 
        {} /* Terminating entry */
 };
 


@@ -795,6 +808,9 @@ static int sdhci_acpi_probe(struct platform_device *pdev)
 
                if (quirks & DMI_QUIRK_RESET_SD_SIGNAL_VOLT_ON_SUSP)
                        c->reset_signal_volt_on_suspend = true;
 
                if (quirks & DMI_QUIRK_RESET_SD_SIGNAL_VOLT_ON_SUSP)
                        c->reset_signal_volt_on_suspend = true;

+
+               if (quirks & DMI_QUIRK_SD_NO_WRITE_PROTECT)
+                       host->mmc->caps2 |= MMC_CAP2_NO_WRITE_PROTECT;

        }
 
        err = sdhci_setup_host(host);
        }
 
        err = sdhci_setup_host(host);