diff options
| author | Linus Torvalds | 2024-03-12 10:47:33 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2024-03-12 10:47:33 -0700 |
| commit | a60816720d754883978c8548308c92f24ced86dd (patch) | |
| tree | 9da7696bd91b58a666741b3c9835d4a3155345ca /MAINTAINERS | |
| parent | 2184dbcde47aefd5358b14463a0d993013f5609e (diff) | |
| parent | 98dcb872779f8bea30cd34716c7fdeb0963e3606 (diff) | |
Merge tag 'soc-arm-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
Pull ARM SoC code updates from Arnd Bergmann:
"These are mostly minor updates, including a number of kerneldoc fixes
from Randy Dunlap across multiple platforms. OMAP gets a few bugfixes,
and the MAINTAINERS file gets updated for AMD Zynq and NXP S32G"
* tag 'soc-arm-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (23 commits)
ARM: s32c: update MAINTAINERS entry
ARM: AM33xx: PRM: Implement REBOOT_COLD
ARM: AM33xx: PRM: Remove redundand defines
ARM: omap1: remove duplicated 'select ARCH_OMAP'
ARM: s3c64xx: make bus_type const
ARM: imx: Remove usage of the deprecated ida_simple_xx() API
ARM: OMAP2+: fix kernel-doc warnings
ARM: OMAP2+: fix kernel-doc warnings
ARM: OMAP2+: fix a kernel-doc warning
ARM: OMAP2+: PRM: fix kernel-doc warnings
ARM: OMAP2+: prm44xx: fix a kernel-doc warning
ARM: OMAP2+: pmic-cpcap: fix kernel-doc warnings
ARM: OMAP2+: hwmod: fix kernel-doc warnings
ARM: OMAP2+: hwmod: remove misuse of kernel-doc
ARM: OMAP2+: CMINST: use matching function name in kernel-doc
ARM: OMAP2+: cm33xx: use matching function name in kernel-doc
ARM: OMAP2+: clock: fix a function name in kernel-doc
ARM: OMAP2+: clockdomain: fix kernel-doc warnings
ARM: OMAP2+: am33xx-restart: fix function name in kernel-doc
soc: xilinx: update maintainer of event manager driver
...
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index a8457e441f18..c660e9be8ce6 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2549,13 +2549,14 @@ F: drivers/*/*/*wpcm* F: drivers/*/*wpcm* ARM/NXP S32G ARCHITECTURE -M: Chester Lin <chester62515@gmail.com> -R: Andreas Färber <afaerber@suse.de> +R: Chester Lin <chester62515@gmail.com> R: Matthias Brugger <mbrugger@suse.com> -R: NXP S32 Linux Team <s32@nxp.com> +R: Ghennadi Procopciuc <ghennadi.procopciuc@oss.nxp.com> +L: NXP S32 Linux Team <s32@nxp.com> L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) S: Maintained F: arch/arm64/boot/dts/freescale/s32g*.dts* +F: drivers/pinctrl/nxp/ ARM/Orion SoC/Technologic Systems TS-78xx platform support M: Alexander Clouter <alex@digriz.org.uk> @@ -17290,9 +17291,12 @@ M: Shawn Guo <shawnguo@kernel.org> M: Jacky Bai <ping.bai@nxp.com> R: Pengutronix Kernel Team <kernel@pengutronix.de> L: linux-gpio@vger.kernel.org +L: NXP S32 Linux Team <s32@nxp.com> S: Maintained F: Documentation/devicetree/bindings/pinctrl/fsl,* +F: Documentation/devicetree/bindings/pinctrl/nxp,s32* F: drivers/pinctrl/freescale/ +F: drivers/pinctrl/nxp/ PIN CONTROLLER - INTEL M: Mika Westerberg <mika.westerberg@linux.intel.com> @@ -17346,14 +17350,6 @@ S: Supported F: drivers/gpio/gpio-sama5d2-piobu.c F: drivers/pinctrl/pinctrl-at91* -PIN CONTROLLER - NXP S32 -M: Chester Lin <clin@suse.com> -R: NXP S32 Linux Team <s32@nxp.com> -L: linux-gpio@vger.kernel.org -S: Maintained -F: Documentation/devicetree/bindings/pinctrl/nxp,s32* -F: drivers/pinctrl/nxp/ - PIN CONTROLLER - QUALCOMM M: Bjorn Andersson <andersson@kernel.org> L: linux-arm-msm@vger.kernel.org @@ -24159,7 +24155,7 @@ F: Documentation/devicetree/bindings/net/can/xilinx,can.yaml F: drivers/net/can/xilinx_can.c XILINX EVENT MANAGEMENT DRIVER -M: Abhyuday Godhasara <abhyuday.godhasara@xilinx.com> +M: Michal Simek <michal.simek@amd.com> S: Maintained F: drivers/soc/xilinx/xlnx_event_manager.c F: include/linux/firmware/xlnx-event-manager.h |