| From db64f26545cf22b693c309699a654ad83b266144 Mon Sep 17 00:00:00 2001 |
| From: "H. Nikolaus Schaller" <hns@goldelico.com> |
| Date: Thu, 7 Nov 2019 11:30:42 +0100 |
| Subject: [PATCH] mmc: sdio: fix wl1251 vendor id |
| |
| commit e5db673e7fe2f971ec82039a28dc0811c2100e87 upstream. |
| |
| v4.11-rc1 did introduce a patch series that rearranged the |
| sdio quirks into a header file. Unfortunately this did forget |
| to handle SDIO_VENDOR_ID_TI differently between wl1251 and |
| wl1271 with the result that although the wl1251 was found on |
| the sdio bus, the firmware did not load any more and there was |
| no interface registration. |
| |
| This patch defines separate constants to be used by sdio quirks |
| and drivers. |
| |
| 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/include/linux/mmc/sdio_ids.h b/include/linux/mmc/sdio_ids.h |
| index d1a5d5df02f5..08b25c02b5a1 100644 |
| --- a/include/linux/mmc/sdio_ids.h |
| +++ b/include/linux/mmc/sdio_ids.h |
| @@ -71,6 +71,8 @@ |
| |
| #define SDIO_VENDOR_ID_TI 0x0097 |
| #define SDIO_DEVICE_ID_TI_WL1271 0x4076 |
| +#define SDIO_VENDOR_ID_TI_WL1251 0x104c |
| +#define SDIO_DEVICE_ID_TI_WL1251 0x9066 |
| |
| #define SDIO_VENDOR_ID_STE 0x0020 |
| #define SDIO_DEVICE_ID_STE_CW1200 0x2280 |
| -- |
| 2.7.4 |
| |
