Skip to content

Commit

Permalink
Merge branch 'update-joakim-zhang-entries'
Browse files Browse the repository at this point in the history
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]>
  • Loading branch information
kuba-moo committed Dec 12, 2022
2 parents 5f7d78b + fb21cad commit 84698da
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 3 additions & 1 deletion Documentation/devicetree/bindings/net/fsl,fec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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#
Expand Down
4 changes: 3 additions & 1 deletion Documentation/devicetree/bindings/net/nxp,dwmac-imx.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
5 changes: 4 additions & 1 deletion MAINTAINERS
Original file line number Diff line number Diff line change
Expand Up @@ -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]>
L: [email protected]
S: Maintained
F: Documentation/devicetree/bindings/net/fsl,fec.yaml
Expand Down

0 comments on commit 84698da

Please sign in to comment.