| From 47836fbc367cfbb05fcd308baf4e12723761ead5 Mon Sep 17 00:00:00 2001 |
| From: "H. Nikolaus Schaller" <hns@goldelico.com> |
| Date: Thu, 7 Nov 2019 11:30:43 +0100 |
| Subject: [PATCH] mmc: core: fix wl1251 sdio quirks |
| |
| commit 16568b4a4f0c34bd35cfadac63303c7af7812764 upstream. |
| |
| wl1251 and wl1271 have different vendor id and device id. |
| So we need to handle both with sdio quirks. |
| |
| Fixes: 884f38607897 ("mmc: core: move some sdio IDs out of quirks file") |
| Signed-off-by: H. Nikolaus Schaller <hns@goldelico.com> |
| Cc: <stable@vger.kernel.org> # v4.11+ |
| Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/mmc/core/quirks.h b/drivers/mmc/core/quirks.h |
| index 2d2d9ea8be4f..3dba15bccce2 100644 |
| --- a/drivers/mmc/core/quirks.h |
| +++ b/drivers/mmc/core/quirks.h |
| @@ -119,7 +119,14 @@ static const struct mmc_fixup mmc_ext_csd_fixups[] = { |
| END_FIXUP |
| }; |
| |
| + |
| static const struct mmc_fixup sdio_fixup_methods[] = { |
| + SDIO_FIXUP(SDIO_VENDOR_ID_TI_WL1251, SDIO_DEVICE_ID_TI_WL1251, |
| + add_quirk, MMC_QUIRK_NONSTD_FUNC_IF), |
| + |
| + SDIO_FIXUP(SDIO_VENDOR_ID_TI_WL1251, SDIO_DEVICE_ID_TI_WL1251, |
| + add_quirk, MMC_QUIRK_DISABLE_CD), |
| + |
| SDIO_FIXUP(SDIO_VENDOR_ID_TI, SDIO_DEVICE_ID_TI_WL1271, |
| add_quirk, MMC_QUIRK_NONSTD_FUNC_IF), |
| |
| -- |
| 2.7.4 |
| |
