Merge tag 'spi-v5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi
[sfrench/cifs-2.6.git] / MAINTAINERS
index 723992aba09af45fe2b839d9303eba49dbe42ca8..83c2b1867586142b7d5fb13c114825bc835c3169 100644 (file)
@@ -3736,7 +3736,7 @@ BROADCOM SPI DRIVER
 M:     Kamal Dasu <kdasu.kdev@gmail.com>
 M:     bcm-kernel-feedback-list@broadcom.com
 S:     Maintained
-F:     Documentation/devicetree/bindings/spi/brcm,spi-bcm-qspi.txt
+F:     Documentation/devicetree/bindings/spi/brcm,spi-bcm-qspi.yaml
 F:     drivers/spi/spi-bcm-qspi.*
 F:     drivers/spi/spi-brcmstb-qspi.c
 F:     drivers/spi/spi-iproc-qspi.c
@@ -7231,6 +7231,7 @@ FREESCALE QUAD SPI DRIVER
 M:     Han Xu <han.xu@nxp.com>
 L:     linux-spi@vger.kernel.org
 S:     Maintained
+F:     Documentation/devicetree/bindings/spi/fsl,spi-fsl-qspi.yaml
 F:     drivers/spi/spi-fsl-qspi.c
 
 FREESCALE QUICC ENGINE LIBRARY
@@ -8189,6 +8190,13 @@ F:       drivers/crypto/hisilicon/sec2/sec_crypto.c
 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>
 S:     Maintained