| Message ID | 20210315132501.441681-4-Jerome.Pouiller@silabs.com (mailing list archive) |
|---|---|
| State | Awaiting Upstream |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | wfx: get out from the staging area | expand |
| Context | Check | Description |
|---|---|---|
| netdev/tree_selection | success | Not a local patch |
On Mon, Mar 15, 2021 at 02:24:40PM +0100, Jerome Pouiller wrote: > From: Jérôme Pouiller <jerome.pouiller@silabs.com> > > Signed-off-by: Jérôme Pouiller <jerome.pouiller@silabs.com> > --- > drivers/net/wireless/silabs/wfx/Kconfig | 12 +++++++++++ > drivers/net/wireless/silabs/wfx/Makefile | 26 ++++++++++++++++++++++++ > 2 files changed, 38 insertions(+) > create mode 100644 drivers/net/wireless/silabs/wfx/Kconfig > create mode 100644 drivers/net/wireless/silabs/wfx/Makefile > > diff --git a/drivers/net/wireless/silabs/wfx/Kconfig b/drivers/net/wireless/silabs/wfx/Kconfig > new file mode 100644 > index 000000000000..3be4b1e735e1 > --- /dev/null > +++ b/drivers/net/wireless/silabs/wfx/Kconfig > @@ -0,0 +1,12 @@ > +config WFX > + tristate "Silicon Labs wireless chips WF200 and further" > + depends on MAC80211 > + depends on MMC || !MMC # do not allow WFX=y if MMC=m > + depends on (SPI || MMC) > + help > + This is a driver for Silicons Labs WFxxx series (WF200 and further) > + chipsets. This chip can be found on SPI or SDIO buses. > + > + Silabs does not use a reliable SDIO vendor ID. So, to avoid conflicts, > + the driver won't probe the device if it is not also declared in the > + Device Tree. > diff --git a/drivers/net/wireless/silabs/wfx/Makefile b/drivers/net/wireless/silabs/wfx/Makefile > new file mode 100644 > index 000000000000..f399962c8619 > --- /dev/null > +++ b/drivers/net/wireless/silabs/wfx/Makefile > @@ -0,0 +1,26 @@ > +# SPDX-License-Identifier: GPL-2.0 > + > +# Necessary for CREATE_TRACE_POINTS > +CFLAGS_debug.o = -I$(src) I wonder if it is still relevant outside of the staging tree. Thanks
Hi Leon, On Monday 15 March 2021 16:11:52 CET Leon Romanovsky wrote: > On Mon, Mar 15, 2021 at 02:24:40PM +0100, Jerome Pouiller wrote: > > From: Jérôme Pouiller <jerome.pouiller@silabs.com> > > > > Signed-off-by: Jérôme Pouiller <jerome.pouiller@silabs.com> > > --- > > drivers/net/wireless/silabs/wfx/Kconfig | 12 +++++++++++ > > drivers/net/wireless/silabs/wfx/Makefile | 26 ++++++++++++++++++++++++ > > 2 files changed, 38 insertions(+) > > create mode 100644 drivers/net/wireless/silabs/wfx/Kconfig > > create mode 100644 drivers/net/wireless/silabs/wfx/Makefile > > > > diff --git a/drivers/net/wireless/silabs/wfx/Kconfig b/drivers/net/wireless/silabs/wfx/Kconfig > > new file mode 100644 > > index 000000000000..3be4b1e735e1 > > --- /dev/null > > +++ b/drivers/net/wireless/silabs/wfx/Kconfig > > @@ -0,0 +1,12 @@ > > +config WFX > > + tristate "Silicon Labs wireless chips WF200 and further" > > + depends on MAC80211 > > + depends on MMC || !MMC # do not allow WFX=y if MMC=m > > + depends on (SPI || MMC) > > + help > > + This is a driver for Silicons Labs WFxxx series (WF200 and further) > > + chipsets. This chip can be found on SPI or SDIO buses. > > + > > + Silabs does not use a reliable SDIO vendor ID. So, to avoid conflicts, > > + the driver won't probe the device if it is not also declared in the > > + Device Tree. > > diff --git a/drivers/net/wireless/silabs/wfx/Makefile b/drivers/net/wireless/silabs/wfx/Makefile > > new file mode 100644 > > index 000000000000..f399962c8619 > > --- /dev/null > > +++ b/drivers/net/wireless/silabs/wfx/Makefile > > @@ -0,0 +1,26 @@ > > +# SPDX-License-Identifier: GPL-2.0 > > + > > +# Necessary for CREATE_TRACE_POINTS > > +CFLAGS_debug.o = -I$(src) > > I wonder if it is still relevant outside of the staging tree. It seems this pattern is common in the main tree. You suggest to relocate trace.h to include/trace/events?
On Mon, Mar 15, 2021 at 05:21:35PM +0100, Jérôme Pouiller wrote: > Hi Leon, > > On Monday 15 March 2021 16:11:52 CET Leon Romanovsky wrote: > > On Mon, Mar 15, 2021 at 02:24:40PM +0100, Jerome Pouiller wrote: > > > From: Jérôme Pouiller <jerome.pouiller@silabs.com> > > > > > > Signed-off-by: Jérôme Pouiller <jerome.pouiller@silabs.com> > > > --- > > > drivers/net/wireless/silabs/wfx/Kconfig | 12 +++++++++++ > > > drivers/net/wireless/silabs/wfx/Makefile | 26 ++++++++++++++++++++++++ > > > 2 files changed, 38 insertions(+) > > > create mode 100644 drivers/net/wireless/silabs/wfx/Kconfig > > > create mode 100644 drivers/net/wireless/silabs/wfx/Makefile > > > > > > diff --git a/drivers/net/wireless/silabs/wfx/Kconfig b/drivers/net/wireless/silabs/wfx/Kconfig > > > new file mode 100644 > > > index 000000000000..3be4b1e735e1 > > > --- /dev/null > > > +++ b/drivers/net/wireless/silabs/wfx/Kconfig > > > @@ -0,0 +1,12 @@ > > > +config WFX > > > + tristate "Silicon Labs wireless chips WF200 and further" > > > + depends on MAC80211 > > > + depends on MMC || !MMC # do not allow WFX=y if MMC=m > > > + depends on (SPI || MMC) > > > + help > > > + This is a driver for Silicons Labs WFxxx series (WF200 and further) > > > + chipsets. This chip can be found on SPI or SDIO buses. > > > + > > > + Silabs does not use a reliable SDIO vendor ID. So, to avoid conflicts, > > > + the driver won't probe the device if it is not also declared in the > > > + Device Tree. > > > diff --git a/drivers/net/wireless/silabs/wfx/Makefile b/drivers/net/wireless/silabs/wfx/Makefile > > > new file mode 100644 > > > index 000000000000..f399962c8619 > > > --- /dev/null > > > +++ b/drivers/net/wireless/silabs/wfx/Makefile > > > @@ -0,0 +1,26 @@ > > > +# SPDX-License-Identifier: GPL-2.0 > > > + > > > +# Necessary for CREATE_TRACE_POINTS > > > +CFLAGS_debug.o = -I$(src) > > > > I wonder if it is still relevant outside of the staging tree. > > It seems this pattern is common in the main tree. You suggest to relocate > trace.h to include/trace/events? No, leave it as it. Sorry for the noise. Thanks > > -- > Jérôme Pouiller > >
diff --git a/drivers/net/wireless/silabs/wfx/Kconfig b/drivers/net/wireless/silabs/wfx/Kconfig new file mode 100644 index 000000000000..3be4b1e735e1 --- /dev/null +++ b/drivers/net/wireless/silabs/wfx/Kconfig @@ -0,0 +1,12 @@ +config WFX + tristate "Silicon Labs wireless chips WF200 and further" + depends on MAC80211 + depends on MMC || !MMC # do not allow WFX=y if MMC=m + depends on (SPI || MMC) + help + This is a driver for Silicons Labs WFxxx series (WF200 and further) + chipsets. This chip can be found on SPI or SDIO buses. + + Silabs does not use a reliable SDIO vendor ID. So, to avoid conflicts, + the driver won't probe the device if it is not also declared in the + Device Tree. diff --git a/drivers/net/wireless/silabs/wfx/Makefile b/drivers/net/wireless/silabs/wfx/Makefile new file mode 100644 index 000000000000..f399962c8619 --- /dev/null +++ b/drivers/net/wireless/silabs/wfx/Makefile @@ -0,0 +1,26 @@ +# SPDX-License-Identifier: GPL-2.0 + +# Necessary for CREATE_TRACE_POINTS +CFLAGS_debug.o = -I$(src) + +wfx-y := \ + bh.o \ + hwio.o \ + fwio.o \ + hif_tx_mib.o \ + hif_tx.o \ + hif_rx.o \ + queue.o \ + data_tx.o \ + data_rx.o \ + scan.o \ + sta.o \ + key.o \ + main.o \ + sta.o \ + debug.o +wfx-$(CONFIG_SPI) += bus_spi.o +# When CONFIG_MMC == m, append to 'wfx-y' (and not to 'wfx-m') +wfx-$(subst m,y,$(CONFIG_MMC)) += bus_sdio.o + +obj-$(CONFIG_WFX) += wfx.o