Merge tag 'rust-6.4' of https://github.com/Rust-for-Linux/linux

[sfrench/cifs-2.6.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index e2a91d04836537fe1291867b4094981b8ee17846..3889d1adf71fcd5f799f6d6afa95af253a8adc41 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2862,6 +2862,7 @@ F:        Documentation/devicetree/bindings/reset/sunplus,reset.yaml
 F:     arch/arm/boot/dts/sunplus-sp7021*.dts*
 F:     arch/arm/configs/sp7021_*defconfig
 F:     arch/arm/mach-sunplus/
+F:     drivers/clk/clk-sp7021.c
 F:     drivers/irqchip/irq-sp7021-intc.c
 F:     drivers/reset/reset-sunplus.c
 F:     include/dt-bindings/clock/sunplus,sp7021-clkc.h
@@ -12198,6 +12199,7 @@ M:      Yinbo Zhu <zhuyinbo@loongson.cn>
 L:     linux-clk@vger.kernel.org
 S:     Maintained
 F:     Documentation/devicetree/bindings/clock/loongson,ls2k-clk.yaml
+F:     drivers/clk/clk-loongson2.c
 F:     include/dt-bindings/clock/loongson,ls2k-clk.h
 
 LSILOGIC MPT FUSION DRIVERS (FC/SAS/SPI)
@@ -14096,7 +14098,6 @@ L:      linux-mips@vger.kernel.org
 S:     Maintained
 F:     arch/mips/include/asm/mach-loongson32/
 F:     arch/mips/loongson32/
-F:     drivers/*/*/*loongson1*
 F:     drivers/*/*loongson1*
 
 MIPS/LOONGSON2EF ARCHITECTURE
@@ -18345,6 +18346,7 @@ M:      Wedson Almeida Filho <wedsonaf@gmail.com>
 R:     Boqun Feng <boqun.feng@gmail.com>
 R:     Gary Guo <gary@garyguo.net>
 R:     Björn Roy Baron <bjorn3_gh@protonmail.com>
+R:     Benno Lossin <benno.lossin@proton.me>
 L:     rust-for-linux@vger.kernel.org
 S:     Supported
 W:     https://github.com/Rust-for-Linux/linux
@@ -20046,19 +20048,20 @@ S:    Maintained
 F:     Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.yaml
 F:     drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c
 
-STARFIVE JH7100 CLOCK DRIVERS
-M:     Emil Renner Berthing <kernel@esmil.dk>
-S:     Maintained
-F:     Documentation/devicetree/bindings/clock/starfive,jh7100-*.yaml
-F:     drivers/clk/starfive/clk-starfive-jh7100*
-F:     include/dt-bindings/clock/starfive-jh7100*.h
-
 STARFIVE JH7110 MMC/SD/SDIO DRIVER
 M:     William Qiu <william.qiu@starfivetech.com>
 S:     Supported
 F:     Documentation/devicetree/bindings/mmc/starfive*
 F:     drivers/mmc/host/dw_mmc-starfive.c
 
+STARFIVE JH71X0 CLOCK DRIVERS
+M:     Emil Renner Berthing <kernel@esmil.dk>
+M:     Hal Feng <hal.feng@starfivetech.com>
+S:     Maintained
+F:     Documentation/devicetree/bindings/clock/starfive,jh71*.yaml
+F:     drivers/clk/starfive/clk-starfive-jh71*
+F:     include/dt-bindings/clock/starfive?jh71*.h
+
 STARFIVE JH71X0 PINCTRL DRIVERS
 M:     Emil Renner Berthing <kernel@esmil.dk>
 M:     Jianlong Huang <jianlong.huang@starfivetech.com>
@@ -20069,12 +20072,13 @@ F:    drivers/pinctrl/starfive/pinctrl-starfive-jh71*
 F:     include/dt-bindings/pinctrl/pinctrl-starfive-jh7100.h
 F:     include/dt-bindings/pinctrl/starfive,jh7110-pinctrl.h
 
-STARFIVE JH7100 RESET CONTROLLER DRIVER
+STARFIVE JH71X0 RESET CONTROLLER DRIVERS
 M:     Emil Renner Berthing <kernel@esmil.dk>
+M:     Hal Feng <hal.feng@starfivetech.com>
 S:     Maintained
 F:     Documentation/devicetree/bindings/reset/starfive,jh7100-reset.yaml
-F:     drivers/reset/reset-starfive-jh7100.c
-F:     include/dt-bindings/reset/starfive-jh7100.h
+F:     drivers/reset/starfive/reset-starfive-jh71*
+F:     include/dt-bindings/reset/starfive?jh71*.h
 
 STARFIVE JH71XX PMU CONTROLLER DRIVER
 M:     Walker Chen <walker.chen@starfivetech.com>