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 ACF65C2D0DB for ; Fri, 24 Jan 2020 10:08:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 847EE2077C for ; Fri, 24 Jan 2020 10:08:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579860481; bh=XdR6PI94VJdxjtj1eCaRWt9mOPcxk9zlNHMeuFMf050=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=qILi6olwE+tP8ze/MJL50x7H8nZV5aLeyIdIYfnsZxnpLiYYz8IYh873UziSux2gh nEv+6cyNBgIBPUDUnNxqqx3jnZqw+6ixj9gZeqOpLpg1vSW+xMfAtQoBCZYVJLQ0k5 r0JEDDbe+8mNyPGcWbsfe0PiDcfbb2yGfPjuJZ5c= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389225AbgAXKIA (ORCPT ); Fri, 24 Jan 2020 05:08:00 -0500 Received: from mail.kernel.org ([198.145.29.99]:44696 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389449AbgAXKH6 (ORCPT ); Fri, 24 Jan 2020 05:07:58 -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 89F2921556; Fri, 24 Jan 2020 10:07:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579860477; bh=XdR6PI94VJdxjtj1eCaRWt9mOPcxk9zlNHMeuFMf050=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PAoiAy+/mS+Krq9LS4JdhHqaPjamnQE3x12PfvABObsGOhGOucd4VN9a7NRITgzC0 C5bDzXbrCByJjY0xMbtBul1wx+SVByx9QiAovv2wOOT1lP28TRhsLjNycrVnvXoOKg 1xBbTvM0TeGEB6M1PbemZ2UY7rum8TFrNeS8qoRQ= 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 335/343] mmc: sdio: fix wl1251 vendor id Date: Fri, 24 Jan 2020 10:32:33 +0100 Message-Id: <20200124093003.831679533@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: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: H. Nikolaus Schaller [ Upstream commit e5db673e7fe2f971ec82039a28dc0811c2100e87 ] 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 Cc: # v4.11+ Signed-off-by: Ulf Hansson Signed-off-by: Sasha Levin --- include/linux/mmc/sdio_ids.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/linux/mmc/sdio_ids.h b/include/linux/mmc/sdio_ids.h index 0a7abe8a407ff..68bbbd9edc08e 100644 --- a/include/linux/mmc/sdio_ids.h +++ b/include/linux/mmc/sdio_ids.h @@ -67,6 +67,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.20.1