lkml.org 
[lkml]   [2020]   [May]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
SubjectRe: [PATCH v2 6/6] spi: Move cadence-quadspi driver to drivers/spi/
Date
On Tuesday, May 26, 2020 12:36:04 PM 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%)

I get a conflict when applying this on top of spi-nor/next.

\
 
 \ /
  Last update: 2020-05-30 16:03    [W:0.128 / U:0.112 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site