Merge remote-tracking branch 'spi/for-5.13' into spi-linus

diff --cc MAINTAINERS
index 9450e052f1b1307bcb4d34f733ada6d1d507cd9d,1c98272079492b4376fa43de2adf2b90e0e84472..299a9f458e3ae1c7fadbaadff632f1c36c835d72
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -8122,8 -8115,16 +8123,15 @@@ F:    drivers/crypto/hisilicon/sec2/sec_cr
  F:    drivers/crypto/hisilicon/sec2/sec_crypto.h
  F:    drivers/crypto/hisilicon/sec2/sec_main.c
  
+ HISILICON SPI Controller DRIVER FOR KUNPENG SOCS
+ M:    Jay Fang <f.fangjian@huawei.com>
+ L:    linux-spi@vger.kernel.org
+ S:    Maintained
+ W:    http://www.hisilicon.com
+ F:    drivers/spi/spi-hisi-kunpeng.c
+ 
  HISILICON STAGING DRIVERS FOR HIKEY 960/970
  M:    Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
 -L:    devel@driverdev.osuosl.org
  S:    Maintained
  F:    drivers/staging/hikey9xx/
  

diff --cc drivers/spi/spi-cadence-quadspi.c
Simple merge

diff --cc drivers/spi/spi.c
Simple merge