From patchwork Wed Nov 25 18:33:00 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brian O'Keefe X-Patchwork-Id: 333449 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=-15.2 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_SANE_1 autolearn=unavailable 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 69054C56201 for ; Wed, 25 Nov 2020 18:33:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 188D820656 for ; Wed, 25 Nov 2020 18:33:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732040AbgKYSdI (ORCPT ); Wed, 25 Nov 2020 13:33:08 -0500 Received: from mail-lf1-f47.google.com ([209.85.167.47]:39134 "EHLO mail-lf1-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726039AbgKYSdI (ORCPT ); Wed, 25 Nov 2020 13:33:08 -0500 Received: by mail-lf1-f47.google.com with SMTP id j205so4495287lfj.6; Wed, 25 Nov 2020 10:33:06 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:from:to:cc:references:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=Iq/rhGtKw9JfHDyuXwJuAjCDQ6lH2DHrNUXy2SU1nX8=; b=rK4HULC0P8YCtdufKouei7J8LqZD5qS6PyYzQxwwJMMovDEuZ1VO77Y+ePfi7v0UOW ogKkP9FwebieIhyeIXLQVs3dihCX5+Bdm7XThe6tUrN/1+vFTsm41owdBFEQgUXZ6ZGE 4n9UCUdmhTNN5PLyaiW7eFH7Fd8bgmAyFTVuY71/Y29HnhgyhzvbxeVBEY19hbnvAiJQ kzcMzW/FLnVCG5yAWdmtMXrqotNNB12DnoNnP7PV+IXX0ugRzVfARlmcpnhU8jNHrUIq T3HSFhGDp+QAGaEE6nRZXxnkCDamkpBWxlQrxTwHPGeIu1fnenppYxV6DwNjPrkvXXEP vO8g== X-Gm-Message-State: AOAM531Kl8BiIqQRC1Usilwh21sYXMfslvtVOnqtIOCYbJqQQusDrdXG aXXkYmm1X9iIJsSuxw7r/hY= X-Google-Smtp-Source: ABdhPJxxlTR7u7CExRGAjdVX/PKhoSgEB0Wt9pVoREtd/Sug6bk1fv0aMignqU347J7H7e3HAnuPgQ== X-Received: by 2002:a19:c21a:: with SMTP id l26mr71698lfc.590.1606329185521; Wed, 25 Nov 2020 10:33:05 -0800 (PST) Received: from [172.16.128.221] ([4.34.229.34]) by smtp.gmail.com with ESMTPSA id p21sm330177ljj.13.2020.11.25.10.33.02 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 25 Nov 2020 10:33:04 -0800 (PST) Subject: [PATCH 1/2] mmc: sdio: Move SDIO IDs from rtl8723bs, driver to common include file From: Brian O'Keefe To: Ulf Hansson , linux-mmc@vger.kernel.org Cc: linux-wireless@vger.kernel.org, Arend Van Spriel , Greg Kroah-Hartman , Hans de Goede , Larry Finger References: <16529bfd-0308-5da9-f7ce-4ffa9f77b4d0@alum.wpi.edu> Message-ID: Date: Wed, 25 Nov 2020 13:33:00 -0500 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.4.1 MIME-Version: 1.0 In-Reply-To: <16529bfd-0308-5da9-f7ce-4ffa9f77b4d0@alum.wpi.edu> Content-Language: en-US Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org Macro names were derived from the Windows driver, as that was the best available source. Signed-off-by: Brian O'Keefe --- With apologies; something I did mangled spacing in the previous version of the first patch. --- include/linux/mmc/sdio_ids.h | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/include/linux/mmc/sdio_ids.h b/include/linux/mmc/sdio_ids.h index 12036619346c..97ccb0ac5e43 100644 --- a/include/linux/mmc/sdio_ids.h +++ b/include/linux/mmc/sdio_ids.h @@ -42,6 +42,20 @@ #define SDIO_VENDOR_ID_TI 0x0097 #define SDIO_DEVICE_ID_TI_WL1271 0x4076 +#define SDIO_VENDOR_ID_REALTEK 0x024c +#define SDIO_DEVICE_ID_REALTEK_BESTBUY_0 0x0240 +#define SDIO_DEVICE_ID_REALTEK_BESTBUY_1 0x0241 +#define SDIO_DEVICE_ID_REALTEK_HP 0x0523 +#define SDIO_DEVICE_ID_REALTEK_ECS 0x0524 +#define SDIO_DEVICE_ID_REALTEK_TCL 0x0525 +#define SDIO_DEVICE_ID_REALTEK_ACER 0x0623 +#define SDIO_DEVICE_ID_REALTEK_RSVD 0x0624 +#define SDIO_DEVICE_ID_REALTEK_ROCKCHIP 0x0625 +#define SDIO_DEVICE_ID_REALTEK_BRASWELL 0x0626 +#define SDIO_DEVICE_ID_REALTEK_ACER_PWR_LIMIT 0x0627 +#define SDIO_DEVICE_ID_REALTEK_COMMON_01 0x8753 +#define SDIO_DEVICE_ID_REALTEK_COMMON_02 0xb723 + #define SDIO_VENDOR_ID_ATHEROS 0x0271 #define SDIO_DEVICE_ID_ATHEROS_AR6003_00 0x0300 #define SDIO_DEVICE_ID_ATHEROS_AR6003_01 0x0301 From patchwork Wed Nov 25 18:25:58 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brian O'Keefe X-Patchwork-Id: 332760 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=-15.2 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_SANE_1 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 DDC50C64E7B for ; Wed, 25 Nov 2020 18:26:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 97891206CA for ; Wed, 25 Nov 2020 18:26:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730821AbgKYS0E (ORCPT ); Wed, 25 Nov 2020 13:26:04 -0500 Received: from mail-lj1-f193.google.com ([209.85.208.193]:41527 "EHLO mail-lj1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726039AbgKYS0E (ORCPT ); Wed, 25 Nov 2020 13:26:04 -0500 Received: by mail-lj1-f193.google.com with SMTP id y7so3286369lji.8; Wed, 25 Nov 2020 10:26:02 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:from:to:cc:references:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=NmSzTuh8Arl5nV5ZYE05LYJSV8JmR8q2m0gM3oS3fiE=; b=UU6MI5gRAHRnArBjVMYNUpOuLb1t5L/u4ffMBQzZPa1R5UXoFF7cP+9qCA+QfJipGZ 9NJg7q2FyG9UWMmWSWwECXEWjUmJQ3U3abwQ/amvqmxKLWgK8wGMxVuTDAtaVRIeuABY IMCK9DKaqzgeTlk+KS+l28a3AEhNxgxQex/KZ0Kd3kX/qSjzEGC6zC34YS1vRdyOhMsN Ibw5btHRxJe17b1d51wc9eUSQOHtUUhpBLryU1/2iaAF6G2Q5v7az3BAzMfi1AOsjJ+1 MMSb3QFTXgjIisyn0f2dHloo2WnYFz+LuxxgL5ivS+uR7V+qrqg0pfkCADgXa6Lsrzln iLXQ== X-Gm-Message-State: AOAM530Igs5v2LV7jSN/1naqDhpsXbQBCrkntF77Xd7qYQlkq3ozHTub 5iCHCMLTwrhBHnfpSUiMGSs= X-Google-Smtp-Source: ABdhPJw3kY56t8HqoPsxIwp+H3hOaVeaaCm1QfpKYzi+7ibpXovQpwYfBg+dahgjYAXy2ELrrpq69w== X-Received: by 2002:a2e:9689:: with SMTP id q9mr1927919lji.197.1606328762189; Wed, 25 Nov 2020 10:26:02 -0800 (PST) Received: from [172.16.128.221] ([4.34.229.34]) by smtp.gmail.com with ESMTPSA id m22sm11626lfl.14.2020.11.25.10.26.00 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 25 Nov 2020 10:26:01 -0800 (PST) Subject: [PATCH 2/2] mmc: sdio: Move SDIO IDs from rtl8723bs, driver to common include file From: Brian O'Keefe To: linux-wireless@vger.kernel.org, Greg Kroah-Hartman , Hans de Goede , Larry Finger Cc: Ulf Hansson , linux-mmc@vger.kernel.org, Arend Van Spriel References: <16529bfd-0308-5da9-f7ce-4ffa9f77b4d0@alum.wpi.edu> Message-ID: <6762a763-5284-04dc-e636-486c74dedd34@alum.wpi.edu> Date: Wed, 25 Nov 2020 13:25:58 -0500 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.4.1 MIME-Version: 1.0 In-Reply-To: <16529bfd-0308-5da9-f7ce-4ffa9f77b4d0@alum.wpi.edu> Content-Language: en-US Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org Macro names were derived from the Windows driver, as that was the best available source. Signed-off-by: Brian O'Keefe --- drivers/staging/rtl8723bs/os_dep/sdio_intf.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) }; MODULE_DEVICE_TABLE(sdio, sdio_ids); diff --git a/drivers/staging/rtl8723bs/os_dep/sdio_intf.c b/drivers/staging/rtl8723bs/os_dep/sdio_intf.c index b2208e5f190a..8dd3763d1a33 100644 --- a/drivers/staging/rtl8723bs/os_dep/sdio_intf.c +++ b/drivers/staging/rtl8723bs/os_dep/sdio_intf.c @@ -10,18 +10,19 @@ #include #include #include +#include #ifndef dev_to_sdio_func #define dev_to_sdio_func(d) container_of(d, struct sdio_func, dev) #endif static const struct sdio_device_id sdio_ids[] = { - { SDIO_DEVICE(0x024c, 0x0523), }, - { SDIO_DEVICE(0x024c, 0x0525), }, - { SDIO_DEVICE(0x024c, 0x0623), }, - { SDIO_DEVICE(0x024c, 0x0626), }, - { SDIO_DEVICE(0x024c, 0x0627), }, - { SDIO_DEVICE(0x024c, 0xb723), }, + { SDIO_DEVICE(SDIO_VENDOR_ID_REALTEK, SDIO_DEVICE_ID_REALTEK_HP), }, + { SDIO_DEVICE(SDIO_VENDOR_ID_REALTEK, SDIO_DEVICE_ID_REALTEK_TCL), }, + { SDIO_DEVICE(SDIO_VENDOR_ID_REALTEK, SDIO_DEVICE_ID_REALTEK_ACER), }, + { SDIO_DEVICE(SDIO_VENDOR_ID_REALTEK, SDIO_DEVICE_ID_REALTEK_BRASWELL), }, + { SDIO_DEVICE(SDIO_VENDOR_ID_REALTEK, SDIO_DEVICE_ID_REALTEK_ACER_PWR_LIMIT), }, + { SDIO_DEVICE(SDIO_VENDOR_ID_REALTEK, SDIO_DEVICE_ID_REALTEK_COMMON_02), }, { /* end: all zeroes */ },