| Message ID | 20200601070444.16923-1-vigneshr@ti.com (mailing list archive) |
|---|---|
| Headers | show |
| Series | mtd: spi-nor: Move cadence-qaudspi to spi-mem framework | expand |
On Mon, Jun 01, 2020 at 12:34:36PM +0530, Vignesh Raghavendra wrote: > This series is a subset of "[PATCH v12 0/4] spi: cadence-quadspi: Add > support for the Cadence QSPI controller" by Ramuthevar,Vadivel MuruganX > <vadivel.muruganx.ramuthevar@linux.intel.com> that intended to move > cadence-quadspi driver to spi-mem framework Are people OK with me applying this to the SPI tree?
On 6/19/20 1:57 PM, Mark Brown wrote: >> This series is a subset of "[PATCH v12 0/4] spi: cadence-quadspi: Add >> support for the Cadence QSPI controller" by Ramuthevar,Vadivel MuruganX >> <vadivel.muruganx.ramuthevar@linux.intel.com> that intended to move >> cadence-quadspi driver to spi-mem framework > Are people OK with me applying this to the SPI tree? There's a small conflict on 8/8 when applying on top of v5.8-rc1. With that addressed: Acked-by: Tudor Ambarus <tudor.ambarus@microchip.com> Would you please provide an immutable tag on top of v5.8-rc1 so that I can merge back in spi-nor/next? Cheers, ta
On Mon, 1 Jun 2020 12:34:36 +0530, Vignesh Raghavendra wrote: > This series is a subset of "[PATCH v12 0/4] spi: cadence-quadspi: Add > support for the Cadence QSPI controller" by Ramuthevar,Vadivel MuruganX > <vadivel.muruganx.ramuthevar@linux.intel.com> that intended to move > cadence-quadspi driver to spi-mem framework > > Those patches were trying to accomplish too many things in a single set > of patches and need to split into smaller patches. This is reduced > version of above series. > > [...] Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git for-next Thanks! [1/8] mtd: spi-nor: cadence-quadspi: Make driver independent of flash geometry commit: 834b4e8d344139ba64cda22099b2b2ef6c9a542d [2/8] mtd: spi-nor: cadence-quadspi: Provide a way to disable DAC mode commit: a99705079a91e6373122bd0ca2fc129b688fc5b3 [3/8] mtd: spi-nor: cadence-quadspi: Don't initialize rx_dma_complete on failure commit: 48aae57f0f9f57797772bd462b4d64902b1b4ae1 [4/8] mtd: spi-nor: cadence-quadspi: Fix error path on failure to acquire reset lines commit: c61088d1f9932940af780b674f028140eda09a94 [5/8] mtd: spi-nor: cadence-quadspi: Handle probe deferral while requesting DMA channel commit: 935da5e5100f57d843cac4781b21f1c235059aa0 [6/8] mtd: spi-nor: cadence-quadspi: Drop redundant WREN in erase path commit: 41b5ed6e677ca73cb031b7657eefb5cf27071be3 [7/8] mtd: spi-nor: Convert cadence-quadspi to use spi-mem framework commit: a314f6367787ee1d767df9a2120f17e4511144d0 [8/8] spi: Move cadence-quadspi driver to drivers/spi/ commit: 31fb632b5d43ca16713095b3a4fe17e3d7331e28 All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark
On Fri, Jun 19, 2020 at 11:47:08AM +0000, Tudor.Ambarus@microchip.com wrote: > Would you please provide an immutable tag on top of v5.8-rc1 so that I > can merge back in spi-nor/next? Here you go: The following changes since commit b3a9e3b9622ae10064826dccb4f7a52bd88c7407: Linux 5.8-rc1 (2020-06-14 12:45:04 -0700) are available in the Git repository at: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git tags/cadence-mtd-spi-move for you to fetch changes up to 31fb632b5d43ca16713095b3a4fe17e3d7331e28: spi: Move cadence-quadspi driver to drivers/spi/ (2020-06-19 14:26:54 +0100) ---------------------------------------------------------------- mtd/spi: Move the cadence-quadspi driver to spi-mem ---------------------------------------------------------------- Ramuthevar Vadivel Murugan (2): mtd: spi-nor: Convert cadence-quadspi to use spi-mem framework spi: Move cadence-quadspi driver to drivers/spi/ Vignesh Raghavendra (6): mtd: spi-nor: cadence-quadspi: Make driver independent of flash geometry mtd: spi-nor: cadence-quadspi: Provide a way to disable DAC mode mtd: spi-nor: cadence-quadspi: Don't initialize rx_dma_complete on failure mtd: spi-nor: cadence-quadspi: Fix error path on failure to acquire reset lines mtd: spi-nor: cadence-quadspi: Handle probe deferral while requesting DMA channel mtd: spi-nor: cadence-quadspi: Drop redundant WREN in erase path 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} | 541 ++++++++------------- 5 files changed, 222 insertions(+), 343 deletions(-) rename drivers/{mtd/spi-nor/controllers/cadence-quadspi.c => spi/spi-cadence-quadspi.c} (74%)
On 6/19/20 6:17 PM, Mark Brown wrote: >> Would you please provide an immutable tag on top of v5.8-rc1 so that I >> can merge back in spi-nor/next? > Here you go: > > The following changes since commit b3a9e3b9622ae10064826dccb4f7a52bd88c7407: > > Linux 5.8-rc1 (2020-06-14 12:45:04 -0700) > > are available in the Git repository at: > > https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git tags/cadence-mtd-spi-move > > for you to fetch changes up to 31fb632b5d43ca16713095b3a4fe17e3d7331e28: > > spi: Move cadence-quadspi driver to drivers/spi/ (2020-06-19 14:26:54 +0100) > > ---------------------------------------------------------------- > mtd/spi: Move the cadence-quadspi driver to spi-mem > > ---------------------------------------------------------------- > Ramuthevar Vadivel Murugan (2): > mtd: spi-nor: Convert cadence-quadspi to use spi-mem framework > spi: Move cadence-quadspi driver to drivers/spi/ > > Vignesh Raghavendra (6): > mtd: spi-nor: cadence-quadspi: Make driver independent of flash geometry > mtd: spi-nor: cadence-quadspi: Provide a way to disable DAC mode > mtd: spi-nor: cadence-quadspi: Don't initialize rx_dma_complete on failure > mtd: spi-nor: cadence-quadspi: Fix error path on failure to acquire reset lines > mtd: spi-nor: cadence-quadspi: Handle probe deferral while requesting DMA channel > mtd: spi-nor: cadence-quadspi: Drop redundant WREN in erase path > > 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} | 541 ++++++++------------- > 5 files changed, 222 insertions(+), 343 deletions(-) > rename drivers/{mtd/spi-nor/controllers/cadence-quadspi.c => spi/spi-cadence-quadspi.c} (74%) Merged also in spi-nor/next in order to avoid conflicts during the release cycle. Thanks, ta
This series is a subset of "[PATCH v12 0/4] spi: cadence-quadspi: Add support for the Cadence QSPI controller" by Ramuthevar,Vadivel MuruganX <vadivel.muruganx.ramuthevar@linux.intel.com> that intended to move cadence-quadspi driver to spi-mem framework Those patches were trying to accomplish too many things in a single set of patches and need to split into smaller patches. This is reduced version of above series. Changes that are intended to make migration easy are split into separate patches. Patches 1 to 3 drop features that cannot be supported under spi-mem at the moment (backward compatibility is maintained). Patch 4-5 are trivial cleanups. Patch 6 does the actual conversion to spi-mem and patch 7 moves the driver to drivers/spi folder. I have tested both INDAC mode (used by non TI platforms like Altera SoCFPGA) and DAC mode (used by TI platforms) on TI EVMs. Patches to move move bindings over to "Documentation/devicetree/bindings/spi/" directory and also conversion of bindig doc to YAML will be posted separately. Support for Intel platform would follow that. Resend v3: Rebased onto v5.7-c1 v3: Split handling of probe deferral into separate patch (out of 5/6) Split dropping of redundant WREN to separate patch (out of 5/6) Fix a possible memleak due to lack of spi_master_put() Parse all SPI slave nodes in cqspi_setup_flash() Address misc comments from Tudor on v2 Rebase onto latest spi-nor/next v2: Rework patch 1/6 to keep "cdns,is-decoded-cs" property supported. Ramuthevar Vadivel Murugan (2): mtd: spi-nor: Convert cadence-quadspi to use spi-mem framework spi: Move cadence-quadspi driver to drivers/spi/ Vignesh Raghavendra (6): mtd: spi-nor: cadence-quadspi: Make driver independent of flash geometry mtd: spi-nor: cadence-quadspi: Provide a way to disable DAC mode mtd: spi-nor: cadence-quadspi: Don't initialize rx_dma_complete on failure mtd: spi-nor: cadence-quadspi: Fix error path on failure to acquire reset lines mtd: spi-nor: cadence-quadspi: Handle probe deferral while requesting DMA channel mtd: spi-nor: cadence-quadspi: Drop redundant WREN in erase path 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} | 541 +++++++----------- 5 files changed, 222 insertions(+), 343 deletions(-) rename drivers/{mtd/spi-nor/controllers/cadence-quadspi.c => spi/spi-cadence-quadspi.c} (74%)