diff mbox series

[5.4,084/102] mmc: core: fix wl1251 sdio quirks

Message ID	20200124092819.363720236@linuxfoundation.org
State	New
Headers	show Return-Path: <SRS0=xW8Y=3N=vger.kernel.org=stable-owner@kernel.org> From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org, "H. Nikolaus Schaller" <hns@goldelico.com>, Ulf Hansson <ulf.hansson@linaro.org>, Sasha Levin <sashal@kernel.org> Subject: [PATCH 5.4 084/102] mmc: core: fix wl1251 sdio quirks Date: Fri, 24 Jan 2020 10:31:25 +0100 Message-Id: <20200124092819.363720236@linuxfoundation.org> In-Reply-To: <20200124092806.004582306@linuxfoundation.org> References: <20200124092806.004582306@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk
Series	None \| expand [5.4,003/102] libbpf: Fix memory leak/double free issue [5.4,005/102] libbpf: Fix another potential overflow issue in bpf_prog_linfo [5.4,006/102] libbpf: Make btf__resolve_size logic always check size error condition [5.4,008/102] bpf: Force .BTF section start to zero when dumping from vmlinux [5.4,009/102] samples: bpf: update map definition to new syntax BTF-defined map [5.4,010/102] samples/bpf: Fix broken xdp_rxq_info due to map order assumptions [5.4,011/102] ARM: dts: logicpd-torpedo-37xx-devkit-28: Reference new DRM panel [5.4,013/102] xfs: Sanity check flags of Q_XQUOTARM call [5.4,014/102] i2c: stm32f7: rework slave_id allocation [5.4,016/102] mfd: intel-lpss: Add default I2C device properties for Gemini Lake [5.4,020/102] powerpc/pseries: Enable support for ibm,drc-info property [5.4,022/102] powerpc/archrandom: fix arch_get_random_seed_int() [5.4,024/102] tipc: update mons self addr when node addr generated [5.4,026/102] tipc: fix wrong socket reference counter after tipc_sk_timeout() returns [5.4,027/102] tipc: fix wrong timeout input for tipc_wait_for_cond() [5.4,033/102] mt7601u: fix bbp version check in mt7601u_wait_bbp_ready [5.4,035/102] s390/pkey: fix memory leak within _copy_apqns_from_user() [5.4,037/102] crypto: amcc - restore CRYPTO_AES dependency [5.4,039/102] perf map: No need to adjust the long name of modules [5.4,040/102] leds: tlc591xx: update the maximum brightness [5.4,042/102] soc: qcom: llcc: Name regmaps to avoid collisions [5.4,044/102] soc: aspeed: Fix snoop_file_poll()s return type [5.4,045/102] watchdog: sprd: Fix the incorrect pointer getting from driver data [5.4,048/102] gpiolib: No need to call gpiochip_remove_pin_ranges() twice [5.4,049/102] rtw88: fix beaconing mode rsvd_page memory violation issue [5.4,051/102] drm/panfrost: Add missing check for pfdev->regulator [5.4,053/102] drm/amdgpu: remove excess function parameter description [5.4,055/102] dpaa2-eth: Fix minor bug in ethtool stats reporting [5.4,057/102] software node: Get reference to parent swnode in get_parent op [5.4,059/102] drm: rcar_lvds: Fix color mismatches on R-Car H2 ES2.0 and later [5.4,061/102] ACPI: platform: Unregister stale platform devices [5.4,063/102] regulator: bd70528: Add MODULE_ALIAS to allow module auto loading [5.4,064/102] drm/amdgpu/vi: silence an uninitialized variable warning [5.4,066/102] firmware: imx: Remove call to devm_of_platform_populate [5.4,068/102] rcu: Fix uninitialized variable in nocb_gp_wait() [5.4,070/102] dpaa_eth: avoid timestamp read on error paths [5.4,073/102] hv_netvsc: flag software created hash value [5.4,075/102] net: neigh: use long type to store jiffies delta [5.4,079/102] packet: fix data-race in fanout_flow_is_huge() [5.4,080/102] i2c: stm32f7: report dma error during probe [5.4,081/102] kselftests: cgroup: Avoid the reuse of fd after it is deallocated [5.4,084/102] mmc: core: fix wl1251 sdio quirks [5.4,085/102] tee: optee: Fix dynamic shm pool allocations [5.4,087/102] workqueue: Add RCU annotation for pwq list walk [5.4,088/102] SUNRPC: Fix another issue with MIC buffer space [5.4,091/102] dma-direct: dont check swiotlb=force in dma_direct_map_resource [5.4,092/102] afs: Remove set but not used variables before, after [5.4,095/102] xdp: Fix cleanup on map free for devmap_hash map type [5.4,098/102] s390/qeth: fix dangling IO buffers after halt/clear [5.4,099/102] net-sysfs: Call dev_hold always in netdev_queue_add_kobject [5.4,100/102] gpio: aspeed: avoid return type warning [5.4,102/102] optee: Fix multi page dynamic shm pool alloc

Commit Message

Greg KH Jan. 24, 2020, 9:31 a.m. UTC

From: H. Nikolaus Schaller <hns@goldelico.com>

[ Upstream commit 16568b4a4f0c34bd35cfadac63303c7af7812764 ]

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: Sasha Levin <sashal@kernel.org>
---
 drivers/mmc/core/quirks.h | 7 +++++++
 1 file changed, 7 insertions(+)

diff mbox series

Patch

diff --git a/drivers/mmc/core/quirks.h b/drivers/mmc/core/quirks.h
index 2d2d9ea8be4f3..3dba15bccce25 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),