Commit 84698dad authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

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/20221209220519.1542872-1-f.fainelli@gmail.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 5f7d78b2 fb21cad2

Documentation/devicetree/bindings/interrupt-controller/fsl,intmux.yaml

+2 −1
Original line number Diff line number Diff line
@@ -7,7 +7,8 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# 
title: Freescale INTMUX interrupt multiplexer



maintainers:

  - Joakim Zhang <qiangqing.zhang@nxp.com>

  - Shawn Guo <shawnguo@kernel.org>

  - NXP Linux Team <linux-imx@nxp.com>



properties:

  compatible:

Documentation/devicetree/bindings/net/fsl,fec.yaml

+3 −1
Original line number Diff line number Diff line
@@ -7,7 +7,9 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# 
title: Freescale Fast Ethernet Controller (FEC)



maintainers:

  - Joakim Zhang <qiangqing.zhang@nxp.com>

  - Shawn Guo <shawnguo@kernel.org>

  - Wei Fang <wei.fang@nxp.com>

  - NXP Linux Team <linux-imx@nxp.com>



allOf:

  - $ref: ethernet-controller.yaml#

Documentation/devicetree/bindings/net/nxp,dwmac-imx.yaml

+3 −1
Original line number Diff line number Diff line
@@ -7,7 +7,9 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# 
title: NXP i.MX8 DWMAC glue layer



maintainers:

  - Joakim Zhang <qiangqing.zhang@nxp.com>

  - Clark Wang <xiaoning.wang@nxp.com>

  - Shawn Guo <shawnguo@kernel.org>

  - NXP Linux Team <linux-imx@nxp.com>



# We need a select here so we don't match all nodes with 'snps,dwmac'

select:

MAINTAINERS

+4 −1
Original line number Diff line number Diff line
@@ -8183,7 +8183,10 @@ S: Maintained 
F:	drivers/i2c/busses/i2c-cpm.c









FREESCALE IMX / MXC FEC DRIVER









M:	Joakim Zhang <qiangqing.zhang@nxp.com>









M:	Wei Fang <wei.fang@nxp.com>









R:	Shenwei Wang <shenwei.wang@nxp.com>









R:	Clark Wang <xiaoning.wang@nxp.com>









R:	NXP Linux Team <linux-imx@nxp.com>









L:	netdev@vger.kernel.org









S:	Maintained









F:	Documentation/devicetree/bindings/net/fsl,fec.yaml