Merge tag 'devicetree-for-6.3' of git://git.kernel.org/pub/scm/linux/kernel/git/robh...

[linux-block.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 7e8258e321c1f0da35a082b7c8c515be5b21f348..02d2d33f507caa6b50c3f84ebf073a5805679bf4 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2265,7 +2265,7 @@ M:        Krzysztof Halasa <khalasa@piap.pl>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
 F:     Documentation/devicetree/bindings/arm/intel-ixp4xx.yaml
-F:     Documentation/devicetree/bindings/bus/intel,ixp4xx-expansion-bus-controller.yaml
+F:     Documentation/devicetree/bindings/memory-controllers/intel,ixp4xx-expansion*
 F:     Documentation/devicetree/bindings/gpio/intel,ixp4xx-gpio.txt
 F:     Documentation/devicetree/bindings/interrupt-controller/intel,ixp4xx-interrupt.yaml
 F:     Documentation/devicetree/bindings/timer/intel,ixp4xx-timer.yaml
@@ -2963,6 +2963,7 @@ S:        Maintained
 F:     Documentation/devicetree/bindings/arm/socionext/uniphier.yaml
 F:     Documentation/devicetree/bindings/gpio/socionext,uniphier-gpio.yaml
 F:     Documentation/devicetree/bindings/pinctrl/socionext,uniphier-pinctrl.yaml
+F:     Documentation/devicetree/bindings/soc/socionext/socionext,uniphier*.yaml
 F:     arch/arm/boot/dts/uniphier*
 F:     arch/arm/include/asm/hardware/cache-uniphier.h
 F:     arch/arm/mach-uniphier/
@@ -16270,7 +16271,7 @@ M:      Shawn Lin <shawn.lin@rock-chips.com>
 L:     linux-pci@vger.kernel.org
 L:     linux-rockchip@lists.infradead.org
 S:     Maintained
-F:     Documentation/devicetree/bindings/pci/rockchip-pcie*
+F:     Documentation/devicetree/bindings/pci/rockchip,rk3399-pcie*
 F:     drivers/pci/controller/pcie-rockchip*
 
 PCIE DRIVER FOR SOCIONEXT UNIPHIER
@@ -19297,7 +19298,7 @@ SOCIONEXT SYNQUACER I2C DRIVER
 M:     Ard Biesheuvel <ardb@kernel.org>
 L:     linux-i2c@vger.kernel.org
 S:     Maintained
-F:     Documentation/devicetree/bindings/i2c/i2c-synquacer.txt
+F:     Documentation/devicetree/bindings/i2c/socionext,synquacer-i2c.yaml
 F:     drivers/i2c/busses/i2c-synquacer.c
 
 SOCIONEXT UNIPHIER SOUND DRIVER