From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7492FC2D0DB for ; Fri, 24 Jan 2020 10:08:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 42443214DB for ; Fri, 24 Jan 2020 10:08:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579860483; bh=S8Eus9jI/arsBwdGaZ6vNyF/QSEsSBCx2WmCt29V/5M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=BF646lVMLVTezZtHlEamSsT+6PmzFKbJkE7Aya34XgXxDs6CwCscuWGJS37HK7fl2 NTdivVcfJ13LA86EebN5H45ZENIgJvqpO2h9rSGBty/I2QoPKseWfyx3hnYcVrUUnb g1CGadyhlisSncRlWDFM2VRR/vlYeDyrRu+xTK74= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732913AbgAXKIC (ORCPT ); Fri, 24 Jan 2020 05:08:02 -0500 Received: from mail.kernel.org ([198.145.29.99]:44758 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389261AbgAXKIB (ORCPT ); Fri, 24 Jan 2020 05:08:01 -0500 Received: from localhost (unknown [145.15.244.15]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 029252087E; Fri, 24 Jan 2020 10:07:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579860480; bh=S8Eus9jI/arsBwdGaZ6vNyF/QSEsSBCx2WmCt29V/5M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AegUd5hxnUIelFWNlbyqHzSGi90U41QmJwGBHWyXnfsIAwR3UbWiXUniwpxQ6qOY4 51u1DzUHSTA3hE9P7rXBD6NtdsGGg4Ddo3eftaEIuzNw8aCQhndHFnVw7ejh4yFQwh sgdTP785Cw5CUvMgwuN3OalC+qd2aU+0kPIVL/sY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, "H. Nikolaus Schaller" , Ulf Hansson , Sasha Levin Subject: [PATCH 4.14 336/343] mmc: core: fix wl1251 sdio quirks Date: Fri, 24 Jan 2020 10:32:34 +0100 Message-Id: <20200124093003.956726053@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200124092919.490687572@linuxfoundation.org> References: <20200124092919.490687572@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 List-ID: X-Mailing-List: stable@vger.kernel.org From: H. Nikolaus Schaller [ 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 Cc: # v4.11+ Signed-off-by: Ulf Hansson Signed-off-by: Sasha Levin --- drivers/mmc/core/quirks.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/mmc/core/quirks.h b/drivers/mmc/core/quirks.h index 5153577754f02..09897abb79ed6 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.20.1