aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakub Kicinski <[email protected]>2022-12-12 13:04:54 -0800
committerJakub Kicinski <[email protected]>2022-12-12 13:04:54 -0800
commit84698dad0641ffdb7273f3b31664ce32a2e1386c (patch)
tree7f8b842404d04366146768be0e4777c664a3a23b
parent5f7d78b2b12a9d561f48fa00bab29b40f4616dad (diff)
parentfb21cad28489137a384c25b045d1c5e178f6610b (diff)
Merge branch 'update-joakim-zhang-entries'
Florian Fainelli says: ==================== Update Joakim Zhang entries Shawn, since you are the i.MX maintainer I added you and the NXP Linux Team as the de-facto maintainers for those entries, however there may be other people to list, thanks! ==================== Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
-rw-r--r--Documentation/devicetree/bindings/interrupt-controller/fsl,intmux.yaml3
-rw-r--r--Documentation/devicetree/bindings/net/fsl,fec.yaml4
-rw-r--r--Documentation/devicetree/bindings/net/nxp,dwmac-imx.yaml4
-rw-r--r--MAINTAINERS5
4 files changed, 12 insertions, 4 deletions
diff --git a/Documentation/devicetree/bindings/interrupt-controller/fsl,intmux.yaml b/Documentation/devicetree/bindings/interrupt-controller/fsl,intmux.yaml
index 1d6e0f64a807..985bfa4f6fda 100644
--- a/Documentation/devicetree/bindings/interrupt-controller/fsl,intmux.yaml
+++ b/Documentation/devicetree/bindings/interrupt-controller/fsl,intmux.yaml
@@ -7,7 +7,8 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
title: Freescale INTMUX interrupt multiplexer
maintainers:
- - Joakim Zhang <[email protected]>
+ - Shawn Guo <[email protected]>
+ - NXP Linux Team <[email protected]>
properties:
compatible:
diff --git a/Documentation/devicetree/bindings/net/fsl,fec.yaml b/Documentation/devicetree/bindings/net/fsl,fec.yaml
index e0f376f7e274..77e5f32cb62f 100644
--- a/Documentation/devicetree/bindings/net/fsl,fec.yaml
+++ b/Documentation/devicetree/bindings/net/fsl,fec.yaml
@@ -7,7 +7,9 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
title: Freescale Fast Ethernet Controller (FEC)
maintainers:
- - Joakim Zhang <[email protected]>
+ - Shawn Guo <[email protected]>
+ - Wei Fang <[email protected]>
+ - NXP Linux Team <[email protected]>
allOf:
- $ref: ethernet-controller.yaml#
diff --git a/Documentation/devicetree/bindings/net/nxp,dwmac-imx.yaml b/Documentation/devicetree/bindings/net/nxp,dwmac-imx.yaml
index 4c155441acbf..1857cb4b7139 100644
--- a/Documentation/devicetree/bindings/net/nxp,dwmac-imx.yaml
+++ b/Documentation/devicetree/bindings/net/nxp,dwmac-imx.yaml
@@ -7,7 +7,9 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
title: NXP i.MX8 DWMAC glue layer
maintainers:
- - Joakim Zhang <[email protected]>
+ - Clark Wang <[email protected]>
+ - Shawn Guo <[email protected]>
+ - NXP Linux Team <[email protected]>
# We need a select here so we don't match all nodes with 'snps,dwmac'
select:
diff --git a/MAINTAINERS b/MAINTAINERS
index 1daadaa4d48b..78d8928741ed 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -8183,7 +8183,10 @@ S: Maintained
F: drivers/i2c/busses/i2c-cpm.c
FREESCALE IMX / MXC FEC DRIVER
-M: Joakim Zhang <[email protected]>
+M: Wei Fang <[email protected]>
+R: Shenwei Wang <[email protected]>
+R: Clark Wang <[email protected]>
+R: NXP Linux Team <[email protected]>
S: Maintained
F: Documentation/devicetree/bindings/net/fsl,fec.yaml