| Message ID | 20190131132554.28323-1-sr@denx.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [1/4] spi: mt7621: Move SPI driver out of staging | expand |
On Thu, Jan 31, 2019 at 02:25:51PM +0100, Stefan Roese wrote: > This patch moves the MT7621 SPI driver, which is used on some Ralink / > MediaTek MT76xx MIPS SoC's, out of the staging directory. No changes to > the source code are done in this patch. > > This driver version was tested successfully on an MT7688 based platform > with an SPI NOR on CS0 and an SPI NAND on CS1 without any issues (so > far). > > Signed-off-by: Stefan Roese <sr@denx.de> > Cc: Mark Brown <broonie@kernel.org> > Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> > Cc: NeilBrown <neil@brown.name> > Cc: Sankalp Negi <sankalpnegi2310@gmail.com> > Cc: Chuanhong Guo <gch981213@gmail.com> > Cc: John Crispin <john@phrozen.org> > --- > drivers/spi/Kconfig | 6 ++++++ > drivers/spi/Makefile | 1 + > drivers/{staging/mt7621-spi => spi}/spi-mt7621.c | 0 > drivers/staging/Kconfig | 2 -- > drivers/staging/Makefile | 1 - > drivers/staging/mt7621-spi/Kconfig | 6 ------ > drivers/staging/mt7621-spi/Makefile | 1 - > drivers/staging/mt7621-spi/TODO | 5 ----- > 8 files changed, 7 insertions(+), 15 deletions(-) > rename drivers/{staging/mt7621-spi => spi}/spi-mt7621.c (100%) > delete mode 100644 drivers/staging/mt7621-spi/Kconfig > delete mode 100644 drivers/staging/mt7621-spi/Makefile > delete mode 100644 drivers/staging/mt7621-spi/TODO Patches 2-4 should be merged first, before you move this out of the staging tree. Also, it's hard for the spi people to review such a thing, as they only see a "move". Most of the time, people just submit a brand new patch, adding the driver, and then when that gets accepted into the subsystem-specific tree, I take a patch that deletes this from the staging tree. That's more "obvious" what is going on and keeps it easier to review. thanks, greg k-h
diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig index 9f89cb134549..d392791846ca 100644 --- a/drivers/spi/Kconfig +++ b/drivers/spi/Kconfig @@ -406,6 +406,12 @@ config SPI_MT65XX say Y or M here.If you are not sure, say N. SPI drivers for Mediatek MT65XX and MT81XX series ARM SoCs. +config SPI_MT7621 + tristate "MediaTek MT7621 SPI Controller" + depends on RALINK + help + This selects a driver for the MediaTek MT7621 SPI Controller. + config SPI_NPCM_PSPI tristate "Nuvoton NPCM PSPI Controller" depends on ARCH_NPCM || COMPILE_TEST diff --git a/drivers/spi/Makefile b/drivers/spi/Makefile index f29627040dfb..4389e4941e1a 100644 --- a/drivers/spi/Makefile +++ b/drivers/spi/Makefile @@ -59,6 +59,7 @@ obj-$(CONFIG_SPI_MPC512x_PSC) += spi-mpc512x-psc.o obj-$(CONFIG_SPI_MPC52xx_PSC) += spi-mpc52xx-psc.o obj-$(CONFIG_SPI_MPC52xx) += spi-mpc52xx.o obj-$(CONFIG_SPI_MT65XX) += spi-mt65xx.o +obj-$(CONFIG_SPI_MT7621) += spi-mt7621.o obj-$(CONFIG_SPI_MXIC) += spi-mxic.o obj-$(CONFIG_SPI_MXS) += spi-mxs.o obj-$(CONFIG_SPI_NPCM_PSPI) += spi-npcm-pspi.o diff --git a/drivers/staging/mt7621-spi/spi-mt7621.c b/drivers/spi/spi-mt7621.c similarity index 100% rename from drivers/staging/mt7621-spi/spi-mt7621.c rename to drivers/spi/spi-mt7621.c diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig index e4f608815c05..4eec2aef925b 100644 --- a/drivers/staging/Kconfig +++ b/drivers/staging/Kconfig @@ -106,8 +106,6 @@ source "drivers/staging/mt7621-pci/Kconfig" source "drivers/staging/mt7621-pinctrl/Kconfig" -source "drivers/staging/mt7621-spi/Kconfig" - source "drivers/staging/mt7621-dma/Kconfig" source "drivers/staging/mt7621-mmc/Kconfig" diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile index 5868631e8f1b..f7c1947f7e02 100644 --- a/drivers/staging/Makefile +++ b/drivers/staging/Makefile @@ -43,7 +43,6 @@ obj-$(CONFIG_DRM_VBOXVIDEO) += vboxvideo/ obj-$(CONFIG_PI433) += pi433/ obj-$(CONFIG_SOC_MT7621) += mt7621-pci/ obj-$(CONFIG_SOC_MT7621) += mt7621-pinctrl/ -obj-$(CONFIG_SOC_MT7621) += mt7621-spi/ obj-$(CONFIG_SOC_MT7621) += mt7621-dma/ obj-$(CONFIG_SOC_MT7621) += mt7621-mmc/ obj-$(CONFIG_SOC_MT7621) += mt7621-eth/ diff --git a/drivers/staging/mt7621-spi/Kconfig b/drivers/staging/mt7621-spi/Kconfig deleted file mode 100644 index 0b90f4cfa426..000000000000 --- a/drivers/staging/mt7621-spi/Kconfig +++ /dev/null @@ -1,6 +0,0 @@ -config SPI_MT7621 - tristate "MediaTek MT7621 SPI Controller" - depends on RALINK - help - This selects a driver for the MediaTek MT7621 SPI Controller. - diff --git a/drivers/staging/mt7621-spi/Makefile b/drivers/staging/mt7621-spi/Makefile deleted file mode 100644 index 3be508f63bac..000000000000 --- a/drivers/staging/mt7621-spi/Makefile +++ /dev/null @@ -1 +0,0 @@ -obj-$(CONFIG_SPI_MT7621) += spi-mt7621.o diff --git a/drivers/staging/mt7621-spi/TODO b/drivers/staging/mt7621-spi/TODO deleted file mode 100644 index fdbc5002c32a..000000000000 --- a/drivers/staging/mt7621-spi/TODO +++ /dev/null @@ -1,5 +0,0 @@ - -- general code review and clean up -- ensure device-tree requirements are documented - -Cc: NeilBrown <neil@brown.name>
This patch moves the MT7621 SPI driver, which is used on some Ralink / MediaTek MT76xx MIPS SoC's, out of the staging directory. No changes to the source code are done in this patch. This driver version was tested successfully on an MT7688 based platform with an SPI NOR on CS0 and an SPI NAND on CS1 without any issues (so far). Signed-off-by: Stefan Roese <sr@denx.de> Cc: Mark Brown <broonie@kernel.org> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: NeilBrown <neil@brown.name> Cc: Sankalp Negi <sankalpnegi2310@gmail.com> Cc: Chuanhong Guo <gch981213@gmail.com> Cc: John Crispin <john@phrozen.org> --- drivers/spi/Kconfig | 6 ++++++ drivers/spi/Makefile | 1 + drivers/{staging/mt7621-spi => spi}/spi-mt7621.c | 0 drivers/staging/Kconfig | 2 -- drivers/staging/Makefile | 1 - drivers/staging/mt7621-spi/Kconfig | 6 ------ drivers/staging/mt7621-spi/Makefile | 1 - drivers/staging/mt7621-spi/TODO | 5 ----- 8 files changed, 7 insertions(+), 15 deletions(-) rename drivers/{staging/mt7621-spi => spi}/spi-mt7621.c (100%) delete mode 100644 drivers/staging/mt7621-spi/Kconfig delete mode 100644 drivers/staging/mt7621-spi/Makefile delete mode 100644 drivers/staging/mt7621-spi/TODO