2020-07-17 05:15:37

by Ajay Singh

Subject: [PATCH] wilc1000: Move wilc1000 SDIO ID's from driver source to common header file

From: Ajay Singh <[email protected]>

Moved macros used for Vendor/Device ID from wilc1000 driver to common
header file and changed macro name for consistency with other macros.

Signed-off-by: Ajay Singh <[email protected]>
---
drivers/net/wireless/microchip/wilc1000/sdio.c | 6 ++----
include/linux/mmc/sdio_ids.h | 3 +++
2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/drivers/net/wireless/microchip/wilc1000/sdio.c b/drivers/net/wireless/microchip/wilc1000/sdio.c
index 36eb589263bf..3ece7b0b0392 100644
--- a/drivers/net/wireless/microchip/wilc1000/sdio.c
+++ b/drivers/net/wireless/microchip/wilc1000/sdio.c
@@ -6,6 +6,7 @@

#include <linux/clk.h>
#include <linux/mmc/sdio_func.h>
+#include <linux/mmc/sdio_ids.h>
#include <linux/mmc/host.h>
#include <linux/mmc/sdio.h>
#include <linux/of_irq.h>
@@ -15,11 +16,8 @@

#define SDIO_MODALIAS "wilc1000_sdio"

-#define SDIO_VENDOR_ID_WILC 0x0296
-#define SDIO_DEVICE_ID_WILC 0x5347
-
static const struct sdio_device_id wilc_sdio_ids[] = {
- { SDIO_DEVICE(SDIO_VENDOR_ID_WILC, SDIO_DEVICE_ID_WILC) },
+ { SDIO_DEVICE(SDIO_VENDOR_ID_MICROCHIP_WILC, SDIO_DEVICE_ID_MICROCHIP_WILC1000) },
{ },
};

diff --git a/include/linux/mmc/sdio_ids.h b/include/linux/mmc/sdio_ids.h
index 15ed8ce9d394..519820d18e62 100644
--- a/include/linux/mmc/sdio_ids.h
+++ b/include/linux/mmc/sdio_ids.h
@@ -105,6 +105,9 @@
#define SDIO_DEVICE_ID_MEDIATEK_MT7663 0x7663
#define SDIO_DEVICE_ID_MEDIATEK_MT7668 0x7668

+#define SDIO_VENDOR_ID_MICROCHIP_WILC 0x0296
+#define SDIO_DEVICE_ID_MICROCHIP_WILC1000 0x5347
+
#define SDIO_VENDOR_ID_SIANO 0x039a
#define SDIO_DEVICE_ID_SIANO_NOVA_B0 0x0201
#define SDIO_DEVICE_ID_SIANO_NICE 0x0202
--
2.24.0

2020-07-18 09:30:29

by Ulf Hansson

Subject: Re: [PATCH] wilc1000: Move wilc1000 SDIO ID's from driver source to common header file

On Fri, 17 Jul 2020 at 07:11, <[email protected]> wrote:
>
> From: Ajay Singh <[email protected]>
>
> Moved macros used for Vendor/Device ID from wilc1000 driver to common
> header file and changed macro name for consistency with other macros.
>
> Signed-off-by: Ajay Singh <[email protected]>

Acked-by: Ulf Hansson <[email protected]>

Kind regards
Uffe

> ---
> drivers/net/wireless/microchip/wilc1000/sdio.c | 6 ++----
> include/linux/mmc/sdio_ids.h | 3 +++
> 2 files changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/net/wireless/microchip/wilc1000/sdio.c b/drivers/net/wireless/microchip/wilc1000/sdio.c
> index 36eb589263bf..3ece7b0b0392 100644
> --- a/drivers/net/wireless/microchip/wilc1000/sdio.c
> +++ b/drivers/net/wireless/microchip/wilc1000/sdio.c
> @@ -6,6 +6,7 @@
>
> #include <linux/clk.h>
> #include <linux/mmc/sdio_func.h>
> +#include <linux/mmc/sdio_ids.h>
> #include <linux/mmc/host.h>
> #include <linux/mmc/sdio.h>
> #include <linux/of_irq.h>
> @@ -15,11 +16,8 @@
>
> #define SDIO_MODALIAS "wilc1000_sdio"
>
> -#define SDIO_VENDOR_ID_WILC 0x0296
> -#define SDIO_DEVICE_ID_WILC 0x5347
> -
> static const struct sdio_device_id wilc_sdio_ids[] = {
> - { SDIO_DEVICE(SDIO_VENDOR_ID_WILC, SDIO_DEVICE_ID_WILC) },
> + { SDIO_DEVICE(SDIO_VENDOR_ID_MICROCHIP_WILC, SDIO_DEVICE_ID_MICROCHIP_WILC1000) },
> { },
> };
>
> diff --git a/include/linux/mmc/sdio_ids.h b/include/linux/mmc/sdio_ids.h
> index 15ed8ce9d394..519820d18e62 100644
> --- a/include/linux/mmc/sdio_ids.h
> +++ b/include/linux/mmc/sdio_ids.h
> @@ -105,6 +105,9 @@
> #define SDIO_DEVICE_ID_MEDIATEK_MT7663 0x7663
> #define SDIO_DEVICE_ID_MEDIATEK_MT7668 0x7668
>
> +#define SDIO_VENDOR_ID_MICROCHIP_WILC 0x0296
> +#define SDIO_DEVICE_ID_MICROCHIP_WILC1000 0x5347
> +
> #define SDIO_VENDOR_ID_SIANO 0x039a
> #define SDIO_DEVICE_ID_SIANO_NOVA_B0 0x0201
> #define SDIO_DEVICE_ID_SIANO_NICE 0x0202
> --
> 2.24.0

2020-07-20 07:36:04

by Pali Rohár

Subject: Re: [PATCH] wilc1000: Move wilc1000 SDIO ID's from driver source to common header file

On Friday 17 July 2020 05:11:38 [email protected] wrote:
> From: Ajay Singh <[email protected]>
>
> Moved macros used for Vendor/Device ID from wilc1000 driver to common
> header file and changed macro name for consistency with other macros.
>
> Signed-off-by: Ajay Singh <[email protected]>

Acked-by: Pali Rohár <[email protected]>

> ---
> drivers/net/wireless/microchip/wilc1000/sdio.c | 6 ++----
> include/linux/mmc/sdio_ids.h | 3 +++
> 2 files changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/net/wireless/microchip/wilc1000/sdio.c b/drivers/net/wireless/microchip/wilc1000/sdio.c
> index 36eb589263bf..3ece7b0b0392 100644
> --- a/drivers/net/wireless/microchip/wilc1000/sdio.c
> +++ b/drivers/net/wireless/microchip/wilc1000/sdio.c
> @@ -6,6 +6,7 @@
>
> #include <linux/clk.h>
> #include <linux/mmc/sdio_func.h>
> +#include <linux/mmc/sdio_ids.h>
> #include <linux/mmc/host.h>
> #include <linux/mmc/sdio.h>
> #include <linux/of_irq.h>
> @@ -15,11 +16,8 @@
>
> #define SDIO_MODALIAS "wilc1000_sdio"
>
> -#define SDIO_VENDOR_ID_WILC 0x0296
> -#define SDIO_DEVICE_ID_WILC 0x5347
> -
> static const struct sdio_device_id wilc_sdio_ids[] = {
> - { SDIO_DEVICE(SDIO_VENDOR_ID_WILC, SDIO_DEVICE_ID_WILC) },
> + { SDIO_DEVICE(SDIO_VENDOR_ID_MICROCHIP_WILC, SDIO_DEVICE_ID_MICROCHIP_WILC1000) },
> { },
> };
>
> diff --git a/include/linux/mmc/sdio_ids.h b/include/linux/mmc/sdio_ids.h
> index 15ed8ce9d394..519820d18e62 100644
> --- a/include/linux/mmc/sdio_ids.h
> +++ b/include/linux/mmc/sdio_ids.h
> @@ -105,6 +105,9 @@
> #define SDIO_DEVICE_ID_MEDIATEK_MT7663 0x7663
> #define SDIO_DEVICE_ID_MEDIATEK_MT7668 0x7668
>
> +#define SDIO_VENDOR_ID_MICROCHIP_WILC 0x0296
> +#define SDIO_DEVICE_ID_MICROCHIP_WILC1000 0x5347
> +
> #define SDIO_VENDOR_ID_SIANO 0x039a
> #define SDIO_DEVICE_ID_SIANO_NOVA_B0 0x0201
> #define SDIO_DEVICE_ID_SIANO_NICE 0x0202
> --
> 2.24.0

2020-07-20 09:52:15

by Kalle Valo

Subject: Re: [PATCH] wilc1000: Move wilc1000 SDIO ID's from driver source to common header file

Ulf Hansson <[email protected]> writes:

> On Fri, 17 Jul 2020 at 07:11, <[email protected]> wrote:
>>
>> From: Ajay Singh <[email protected]>
>>
>> Moved macros used for Vendor/Device ID from wilc1000 driver to common
>> header file and changed macro name for consistency with other macros.
>>
>> Signed-off-by: Ajay Singh <[email protected]>
>
> Acked-by: Ulf Hansson <[email protected]>

Just so that I have understood correctly, so the plan is to take this
via wireless-drivers-next?

--
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches

2020-08-02 15:14:06

by Kalle Valo

Subject: Re: [PATCH] wilc1000: Move wilc1000 SDIO ID's from driver source to common header file

<[email protected]> wrote:

> From: Ajay Singh <[email protected]>
>
> Moved macros used for Vendor/Device ID from wilc1000 driver to common
> header file and changed macro name for consistency with other macros.
>
> Signed-off-by: Ajay Singh <[email protected]>
> Acked-by: Ulf Hansson <[email protected]>
> Acked-by: Pali Rohár <[email protected]>

Patch applied to wireless-drivers-next.git, thanks.

c83e2a6e2fbb wilc1000: Move wilc1000 SDIO ID's from driver source to common header file

--
https://patchwork.kernel.org/patch/11668967/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches