Commit a6081672 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
  ...
parents 2184dbcd 98dcb872

MAINTAINERS

+8 −12
Original line number Diff line number Diff line
@@ -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

























arch/arm/mach-imx/mmdc.c



+3
−3






























Original line number
Diff line number
Diff line







@@ -452,7 +452,7 @@ static int mmdc_pmu_init(struct mmdc_pmu *pmu_mmdc,







		.active_events = 0,









	};



















	pmu_mmdc->id = ida_simple_get(&mmdc_ida, 0, 0, GFP_KERNEL);









	pmu_mmdc->id = ida_alloc(&mmdc_ida, GFP_KERNEL);



















	return pmu_mmdc->id;









}








@@ -461,7 +461,7 @@ static void imx_mmdc_remove(struct platform_device *pdev)







{









	struct mmdc_pmu *pmu_mmdc = platform_get_drvdata(pdev);



















	ida_simple_remove(&mmdc_ida, pmu_mmdc->id);









	ida_free(&mmdc_ida, pmu_mmdc->id);









	cpuhp_state_remove_instance_nocalls(cpuhp_mmdc_state, &pmu_mmdc->node);









	perf_pmu_unregister(&pmu_mmdc->pmu);









	iounmap(pmu_mmdc->mmdc_base);








@@ -529,7 +529,7 @@ static int imx_mmdc_perf_init(struct platform_device *pdev, void __iomem *mmdc_b







	cpuhp_state_remove_instance_nocalls(cpuhp_mmdc_state, &pmu_mmdc->node);









	hrtimer_cancel(&pmu_mmdc->hrtimer);









pmu_release_id:









	ida_simple_remove(&mmdc_ida, pmu_mmdc->id);









	ida_free(&mmdc_ida, pmu_mmdc->id);









pmu_free:









	kfree(pmu_mmdc);









	return ret;
































arch/arm/mach-omap1/Kconfig



+0
−1






























Original line number
Diff line number
Diff line







@@ -4,7 +4,6 @@ menuconfig ARCH_OMAP1







	depends on ARCH_MULTI_V4T || ARCH_MULTI_V5









	depends on CPU_LITTLE_ENDIAN









	depends on ATAGS









	select ARCH_OMAP









	select ARCH_HAS_HOLES_MEMORYMODEL









	select ARCH_OMAP









	select CLKSRC_MMIO
































arch/arm/mach-omap2/am33xx-restart.c



+3
−2






























Original line number
Diff line number
Diff line







@@ -9,7 +9,7 @@







#include "prm.h"



















/**









 * am3xx_restart - trigger a software restart of the SoC









 * am33xx_restart - trigger a software restart of the SoC









 * @mode: the "reboot mode", see arch/arm/kernel/{setup,process}.c









 * @cmd: passed from the userspace program rebooting the system (if provided)









 *








@@ -18,7 +18,8 @@







 */









void am33xx_restart(enum reboot_mode mode, const char *cmd)









{









	/* TODO: Handle mode and cmd if necessary */









	/* TODO: Handle cmd if necessary */









	prm_reboot_mode = mode;



















	omap_prm_reset_system();









}
























arch/arm/mach-omap2/board-generic.c



+6
−0






























Original line number
Diff line number
Diff line







@@ -246,6 +246,12 @@ DT_MACHINE_START(AM33XX_DT, "Generic AM33XX (Flattened Device Tree)")







	.init_time	= omap_init_time_of,









	.dt_compat	= am33xx_boards_compat,









	.restart	= am33xx_restart,









	/*









	 * Historically am33xx supported only REBOOT_WARM even though default









	 * reboot_mode was REBOOT_COLD. Reflect legacy de-facto behaviour in









	 * SYSFS.









	 */









	.reboot_mode	= REBOOT_WARM,









MACHINE_END









#endif