Commit 6ef9d231 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'arm-fixes-5.16-2' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc 

Pull ARM SoC fixes from Arnd Bergmann:
 "There are only a few devicetree fixes this time:

   - one outdated devicetree property that slipped into the newly added
     ExynosAutov9 support

   - three changes to Broadcom SoCs that had incorrect number values for
     interrupts or irqchips.

  In the MAINTAINERS file, Nishanth Menon gets listed for TI K3 SoCs,
  while Taichi Sugaya and Takao Orito take ownership of the Socionext
  Milbeaut platform.

  All other changes are for SoC specific drivers, fixing:

   - A missing NULL pointer check in the mediatek memory driver

   - An integer overflow issue in the Arm smccc firwmare interface

   - A false-positive fortify-source check

   - Error handling fixes for optee and smci

   - Incorrect message format in one SCMI call"

* tag 'arm-fixes-5.16-2' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc:
  memory: mtk-smi: Fix a null dereference for the ostd
  arm64: dts: exynos: drop samsung,ufs-shareability-reg-offset in ExynosAutov9
  MAINTAINERS: Update maintainer entry for keystone platforms
  MAINTAINERS: Add entry to MAINTAINERS for Milbeaut
  firmware: smccc: Fix check for ARCH_SOC_ID not implemented
  ARM: socfpga: Fix crash with CONFIG_FORTIRY_SOURCE
  firmware: arm_scmi: Fix type error assignment in voltage protocol
  firmware: arm_scmi: Fix type error in sensor protocol
  firmware: arm_scmi: pm: Propagate return value to caller
  firmware: arm_scmi: Fix base agent discover response
  optee: fix kfree NULL pointer
  ARM: dts: bcm2711: Fix PCIe interrupts
  ARM: dts: BCM5301X: Add interrupt properties to GPIO node
  ARM: dts: BCM5301X: Fix I2C controller interrupt
  firmware: arm_scmi: Fix null de-reference on error path
parents 79941493 383a44ae

MAINTAINERS

+13 −2
Original line number Diff line number Diff line
@@ -2263,6 +2263,15 @@ L: linux-iio@vger.kernel.org 
S:	Maintained

F:	drivers/counter/microchip-tcb-capture.c









ARM/MILBEAUT ARCHITECTURE









M:	Taichi Sugaya <sugaya.taichi@socionext.com>









M:	Takao Orito <orito.takao@socionext.com>









L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)









S:	Maintained









F:	arch/arm/boot/dts/milbeaut*









F:	arch/arm/mach-milbeaut/









N:	milbeaut

















ARM/MIOA701 MACHINE SUPPORT









M:	Robert Jarzmik <robert.jarzmik@free.fr>









L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)








@@ -2729,10 +2738,11 @@ S:	Maintained







F:	drivers/memory/*emif*

















ARM/TEXAS INSTRUMENT KEYSTONE ARCHITECTURE









M:	Nishanth Menon <nm@ti.com>









M:	Santosh Shilimkar <ssantosh@kernel.org>









L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)









S:	Maintained









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/ti/linux.git









F:	arch/arm/boot/dts/keystone-*









F:	arch/arm/mach-keystone/
















@@ -19031,11 +19041,12 @@ F:	drivers/mmc/host/tifm_sd.c







F:	include/linux/tifm.h

















TI KEYSTONE MULTICORE NAVIGATOR DRIVERS









M:	Nishanth Menon <nm@ti.com>









M:	Santosh Shilimkar <ssantosh@kernel.org>









L:	linux-kernel@vger.kernel.org









L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)









S:	Maintained









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/ti/linux.git









F:	drivers/soc/ti/*

















TI LM49xxx FAMILY ASoC CODEC DRIVERS

























arch/arm/boot/dts/bcm2711.dtsi



+7
−1






























Original line number
Diff line number
Diff line







@@ -506,11 +506,17 @@







			#address-cells = <3>;









			#interrupt-cells = <1>;









			#size-cells = <2>;









			interrupts = <GIC_SPI 148 IRQ_TYPE_LEVEL_HIGH>,









			interrupts = <GIC_SPI 147 IRQ_TYPE_LEVEL_HIGH>,









				     <GIC_SPI 148 IRQ_TYPE_LEVEL_HIGH>;









			interrupt-names = "pcie", "msi";









			interrupt-map-mask = <0x0 0x0 0x0 0x7>;









			interrupt-map = <0 0 0 1 &gicv2 GIC_SPI 143









							IRQ_TYPE_LEVEL_HIGH>,









					<0 0 0 2 &gicv2 GIC_SPI 144









							IRQ_TYPE_LEVEL_HIGH>,









					<0 0 0 3 &gicv2 GIC_SPI 145









							IRQ_TYPE_LEVEL_HIGH>,









					<0 0 0 4 &gicv2 GIC_SPI 146









							IRQ_TYPE_LEVEL_HIGH>;









			msi-controller;









			msi-parent = <&pcie0>;
































arch/arm/boot/dts/bcm5301x.dtsi



+3
−1






























Original line number
Diff line number
Diff line







@@ -242,6 +242,8 @@

















			gpio-controller;









			#gpio-cells = <2>;









			interrupt-controller;









			#interrupt-cells = <2>;









		};



















		pcie0: pcie@12000 {








@@ -408,7 +410,7 @@







	i2c0: i2c@18009000 {









		compatible = "brcm,iproc-i2c";









		reg = <0x18009000 0x50>;









		interrupts = <GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH>;









		interrupts = <GIC_SPI 89 IRQ_TYPE_LEVEL_HIGH>;









		#address-cells = <1>;









		#size-cells = <0>;









		clock-frequency = <100000>;
































arch/arm/mach-socfpga/core.h



+1
−1






























Original line number
Diff line number
Diff line







@@ -33,7 +33,7 @@ extern void __iomem *sdr_ctl_base_addr;







u32 socfpga_sdram_self_refresh(u32 sdr_base);









extern unsigned int socfpga_sdram_self_refresh_sz;



















extern char secondary_trampoline, secondary_trampoline_end;









extern char secondary_trampoline[], secondary_trampoline_end[];



















extern unsigned long socfpga_cpu1start_addr;










































arch/arm/mach-socfpga/platsmp.c



+4
−4






























Original line number
Diff line number
Diff line







@@ -20,14 +20,14 @@

















static int socfpga_boot_secondary(unsigned int cpu, struct task_struct *idle)









{









	int trampoline_size = &secondary_trampoline_end - &secondary_trampoline;









	int trampoline_size = secondary_trampoline_end - secondary_trampoline;



















	if (socfpga_cpu1start_addr) {









		/* This will put CPU #1 into reset. */









		writel(RSTMGR_MPUMODRST_CPU1,









		       rst_manager_base_addr + SOCFPGA_RSTMGR_MODMPURST);



















		memcpy(phys_to_virt(0), &secondary_trampoline, trampoline_size);









		memcpy(phys_to_virt(0), secondary_trampoline, trampoline_size);



















		writel(__pa_symbol(secondary_startup),









		       sys_manager_base_addr + (socfpga_cpu1start_addr & 0x000000ff));








@@ -45,12 +45,12 @@ static int socfpga_boot_secondary(unsigned int cpu, struct task_struct *idle)

















static int socfpga_a10_boot_secondary(unsigned int cpu, struct task_struct *idle)









{









	int trampoline_size = &secondary_trampoline_end - &secondary_trampoline;









	int trampoline_size = secondary_trampoline_end - secondary_trampoline;



















	if (socfpga_cpu1start_addr) {









		writel(RSTMGR_MPUMODRST_CPU1, rst_manager_base_addr +









		       SOCFPGA_A10_RSTMGR_MODMPURST);









		memcpy(phys_to_virt(0), &secondary_trampoline, trampoline_size);









		memcpy(phys_to_virt(0), secondary_trampoline, trampoline_size);



















		writel(__pa_symbol(secondary_startup),









		       sys_manager_base_addr + (socfpga_cpu1start_addr & 0x00000fff));