| Message ID | 20200601054725.2060-9-vigneshr@ti.com |
|---|---|
| State | Superseded |
| Delegated to: | Ambarus Tudor |
| Headers | show |
| Series | mtd: spi-nor: Move cadence-qaudspi to spi-mem framework | expand |
Hi, Mark, On Monday, June 1, 2020 8:47:25 AM EEST Vignesh Raghavendra wrote: > From: Ramuthevar Vadivel Murugan > <vadivel.muruganx.ramuthevar@linux.intel.com> > > Now that cadence-quadspi has been converted to use spi-mem framework, > move it under drivers/spi/ > > Update license header to match SPI subsystem style > > Signed-off-by: Ramuthevar Vadivel Murugan > <vadivel.muruganx.ramuthevar@linux.intel.com> Signed-off-by: Vignesh > Raghavendra <vigneshr@ti.com> > --- > drivers/mtd/spi-nor/controllers/Kconfig | 11 ----------- > drivers/mtd/spi-nor/controllers/Makefile | 1 - > drivers/spi/Kconfig | 11 +++++++++++ > drivers/spi/Makefile | 1 + > .../spi-cadence-quadspi.c} | 14 +++++++------- > 5 files changed, 19 insertions(+), 19 deletions(-) > rename drivers/{mtd/spi-nor/controllers/cadence-quadspi.c => > spi/spi-cadence-quadspi.c} (99%) If this patch set looks good to you, would you take it through the SPI tree? If so, I would need an immutable tag, so I can merge back in spi-nor/next in order to fix a small conflict that will appear in drivers/mtd/spi-nor/ controllers/Kconfig. Vignesh would have to respin this patch on top of v5.7- rc1. With this addressed: Reviewed-by: Tudor Ambarus <tudor.ambarus@microchip.com>
On 01/06/20 12:30 pm, Tudor.Ambarus@microchip.com wrote: > Hi, Mark, > > On Monday, June 1, 2020 8:47:25 AM EEST Vignesh Raghavendra wrote: >> From: Ramuthevar Vadivel Murugan >> <vadivel.muruganx.ramuthevar@linux.intel.com> >> >> Now that cadence-quadspi has been converted to use spi-mem framework, >> move it under drivers/spi/ >> >> Update license header to match SPI subsystem style >> >> Signed-off-by: Ramuthevar Vadivel Murugan >> <vadivel.muruganx.ramuthevar@linux.intel.com> Signed-off-by: Vignesh >> Raghavendra <vigneshr@ti.com> >> --- >> drivers/mtd/spi-nor/controllers/Kconfig | 11 ----------- >> drivers/mtd/spi-nor/controllers/Makefile | 1 - >> drivers/spi/Kconfig | 11 +++++++++++ >> drivers/spi/Makefile | 1 + >> .../spi-cadence-quadspi.c} | 14 +++++++------- >> 5 files changed, 19 insertions(+), 19 deletions(-) >> rename drivers/{mtd/spi-nor/controllers/cadence-quadspi.c => >> spi/spi-cadence-quadspi.c} (99%) > > If this patch set looks good to you, would you take it through the SPI tree? > If so, I would need an immutable tag, so I can merge back in spi-nor/next in > order to fix a small conflict that will appear in drivers/mtd/spi-nor/ > controllers/Kconfig. Vignesh would have to respin this patch on top of v5.7- > rc1. With this addressed: > > Reviewed-by: Tudor Ambarus <tudor.ambarus@microchip.com> > I have resent v3 on top of v5.7-rc1 (also applies cleanly on spi tree's for-next branch): https://lore.kernel.org/linux-spi/20200601070444.16923-1-vigneshr@ti.com/T/#t
diff --git a/drivers/mtd/spi-nor/controllers/Kconfig b/drivers/mtd/spi-nor/controllers/Kconfig index d89a5ea9446a..5c0e0ec2e6d1 100644 --- a/drivers/mtd/spi-nor/controllers/Kconfig +++ b/drivers/mtd/spi-nor/controllers/Kconfig @@ -9,17 +9,6 @@ config SPI_ASPEED_SMC and support for the SPI flash memory controller (SPI) for the host firmware. The implementation only supports SPI NOR. -config SPI_CADENCE_QUADSPI - tristate "Cadence Quad SPI controller" - depends on OF && (ARM || ARM64 || COMPILE_TEST) - help - Enable support for the Cadence Quad SPI Flash controller. - - Cadence QSPI is a specialized controller for connecting an SPI - Flash over 1/2/4-bit wide bus. Enable this option if you have a - device with a Cadence QSPI controller and want to access the - Flash as an MTD device. - config SPI_HISI_SFC tristate "Hisilicon FMC SPI NOR Flash Controller(SFC)" depends on ARCH_HISI || COMPILE_TEST diff --git a/drivers/mtd/spi-nor/controllers/Makefile b/drivers/mtd/spi-nor/controllers/Makefile index 46e6fbe586e3..e7abba491d98 100644 --- a/drivers/mtd/spi-nor/controllers/Makefile +++ b/drivers/mtd/spi-nor/controllers/Makefile @@ -1,6 +1,5 @@ # SPDX-License-Identifier: GPL-2.0 obj-$(CONFIG_SPI_ASPEED_SMC) += aspeed-smc.o -obj-$(CONFIG_SPI_CADENCE_QUADSPI) += cadence-quadspi.o obj-$(CONFIG_SPI_HISI_SFC) += hisi-sfc.o obj-$(CONFIG_SPI_NXP_SPIFI) += nxp-spifi.o obj-$(CONFIG_SPI_INTEL_SPI) += intel-spi.o diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig index 099d6a75a371..2de8098b26c1 100644 --- a/drivers/spi/Kconfig +++ b/drivers/spi/Kconfig @@ -200,6 +200,17 @@ config SPI_CADENCE This selects the Cadence SPI controller master driver used by Xilinx Zynq and ZynqMP. +config SPI_CADENCE_QUADSPI + tristate "Cadence Quad SPI controller" + depends on OF && (ARM || ARM64 || COMPILE_TEST) + help + Enable support for the Cadence Quad SPI Flash controller. + + Cadence QSPI is a specialized controller for connecting an SPI + Flash over 1/2/4-bit wide bus. Enable this option if you have a + device with a Cadence QSPI controller and want to access the + Flash as an MTD device. + config SPI_CLPS711X tristate "CLPS711X host SPI controller" depends on ARCH_CLPS711X || COMPILE_TEST diff --git a/drivers/spi/Makefile b/drivers/spi/Makefile index 889368f4ad53..f03834d1d312 100644 --- a/drivers/spi/Makefile +++ b/drivers/spi/Makefile @@ -31,6 +31,7 @@ obj-$(CONFIG_SPI_BCM_QSPI) += spi-iproc-qspi.o spi-brcmstb-qspi.o spi-bcm-qspi. obj-$(CONFIG_SPI_BITBANG) += spi-bitbang.o obj-$(CONFIG_SPI_BUTTERFLY) += spi-butterfly.o obj-$(CONFIG_SPI_CADENCE) += spi-cadence.o +obj-$(CONFIG_SPI_CADENCE_QUADSPI) += spi-cadence-quadspi.o obj-$(CONFIG_SPI_CLPS711X) += spi-clps711x.o obj-$(CONFIG_SPI_COLDFIRE_QSPI) += spi-coldfire-qspi.o obj-$(CONFIG_SPI_DAVINCI) += spi-davinci.o diff --git a/drivers/mtd/spi-nor/controllers/cadence-quadspi.c b/drivers/spi/spi-cadence-quadspi.c similarity index 99% rename from drivers/mtd/spi-nor/controllers/cadence-quadspi.c rename to drivers/spi/spi-cadence-quadspi.c index c12a1c0191b9..1c1a9d17eec0 100644 --- a/drivers/mtd/spi-nor/controllers/cadence-quadspi.c +++ b/drivers/spi/spi-cadence-quadspi.c @@ -1,11 +1,11 @@ // SPDX-License-Identifier: GPL-2.0-only -/* - * Driver for Cadence QSPI Controller - * - * Copyright Altera Corporation (C) 2012-2014. All rights reserved. - * Copyright Intel Corporation (C) 2019-2020. All rights reserved. - * Copyright (C) 2020 Texas Instruments Incorporated - http://www.ti.com - */ +// +// Driver for Cadence QSPI Controller +// +// Copyright Altera Corporation (C) 2012-2014. All rights reserved. +// Copyright Intel Corporation (C) 2019-2020. All rights reserved. +// Copyright (C) 2020 Texas Instruments Incorporated - http://www.ti.com + #include <linux/clk.h> #include <linux/completion.h> #include <linux/delay.h>