Merge patch series "Add support for Allwinner D1 CAN controllers"

[platform/kernel/linux-starfive.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 019b801..c4f95a9 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1865,9 +1865,11 @@ M:       Martin Povišer <povik+lin@cutebit.org>
 L:     asahi@lists.linux.dev
 L:     alsa-devel@alsa-project.org (moderated for non-subscribers)
 S:     Maintained
+F:     Documentation/devicetree/bindings/sound/adi,ssm3515.yaml
 F:     Documentation/devicetree/bindings/sound/apple,*
 F:     sound/soc/apple/*
 F:     sound/soc/codecs/cs42l83-i2c.c
+F:     sound/soc/codecs/ssm3515.c
 
 ARM/APPLE MACHINE SUPPORT
 M:     Hector Martin <marcan@marcan.st>
@@ -3838,6 +3840,15 @@ S:       Maintained
 F:     kernel/bpf/stackmap.c
 F:     kernel/trace/bpf_trace.c
 
+BROADCOM ASP 2.0 ETHERNET DRIVER
+M:     Justin Chen <justin.chen@broadcom.com>
+M:     Florian Fainelli <florian.fainelli@broadcom.com>
+L:     bcm-kernel-feedback-list@broadcom.com
+L:     netdev@vger.kernel.org
+S:     Supported
+F:     Documentation/devicetree/bindings/net/brcm,asp-v2.0.yaml
+F:     drivers/net/ethernet/broadcom/asp2/
+
 BROADCOM B44 10/100 ETHERNET DRIVER
 M:     Michael Chan <michael.chan@broadcom.com>
 L:     netdev@vger.kernel.org
@@ -4155,15 +4166,6 @@ F:       drivers/net/mdio/mdio-bcm-unimac.c
 F:     include/linux/platform_data/bcmgenet.h
 F:     include/linux/platform_data/mdio-bcm-unimac.h
 
-BROADCOM ASP 2.0 ETHERNET DRIVER
-M:     Justin Chen <justin.chen@broadcom.com>
-M:     Florian Fainelli <florian.fainelli@broadcom.com>
-L:     bcm-kernel-feedback-list@broadcom.com
-L:     netdev@vger.kernel.org
-S:     Supported
-F:     Documentation/devicetree/bindings/net/brcm,asp-v2.0.yaml
-F:     drivers/net/ethernet/broadcom/asp2/
-
 BROADCOM IPROC ARM ARCHITECTURE
 M:     Ray Jui <rjui@broadcom.com>
 M:     Scott Branden <sbranden@broadcom.com>
@@ -7604,6 +7606,13 @@ L:       linux-mmc@vger.kernel.org
 S:     Supported
 F:     drivers/mmc/host/cqhci*
 
+EMS CPC-PCI CAN DRIVER
+M:     Gerhard Uttenthaler <uttenthaler@ems-wuensche.com>
+M:     support@ems-wuensche.com
+L:     linux-can@vger.kernel.org
+S:     Maintained
+F:     drivers/net/can/sja1000/ems_pci.c
+
 EMULEX 10Gbps iSCSI - OneConnect DRIVER
 M:     Ketan Mukadam <ketan.mukadam@broadcom.com>
 L:     linux-scsi@vger.kernel.org