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

Merge tag 'soc-fixes-5.18-1' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc 

Pull ARM SoC fixes from Arnd BergmannL
 "The introduction of vmap-stack on 32-bit arm caused a regression on a
  few omap3/omap4 machines that pass a stack variable into a firmware
  interface.

  The early pre-ACPI AMD Seattle machines have been broken for a while,
  Ard Biesheuvel has a series to bring them back for now.

  A few machines with multiple DMA channels used on a device have the
  channels in the wrong order according to the binding, which causes a
  harmless warning. Reversing the order is easier than fixing the tools
  to suppress the warning"

* tag 'soc-fixes-5.18-1' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc:
  arm64: dts: ls1046a: Update i2c node dma properties
  arm64: dts: ls1043a: Update i2c dma properties
  ARM: dts: spear1340: Update serial node properties
  ARM: dts: spear13xx: Update SPI dma properties
  ARM: OMAP2+: Fix regression for smc calls for vmap stack
  dt: amd-seattle: add a description of the CPUs and caches
  dt: amd-seattle: disable IPMI controller and some GPIO blocks on B0
  dt: amd-seattle: add description of the SATA/CCP SMMUs
  dt: amd-seattle: add a description of the PCIe SMMU
  dt: amd-seattle: fix PCIe legacy interrupt routing
  dt: amd-seattle: upgrade AMD Seattle XGBE to new SMMU binding
  dt: amd-seattle: remove Overdrive revision A0 support
  dt: amd-seattle: remove Husky platform
parents b012b323 eeeb4f10

arch/arm/boot/dts/spear1340.dtsi

+3 −3
Original line number Diff line number Diff line
@@ -134,9 +134,9 @@ serial@b4100000 { 
				reg = <0xb4100000 0x1000>;

				interrupts = <0 105 0x4>;

				status = "disabled";

				dmas = <&dwdma0 12 0 1>,

					<&dwdma0 13 1 0>;

				dma-names = "tx", "rx";

				dmas = <&dwdma0 13 0 1>,

					<&dwdma0 12 1 0>;

				dma-names = "rx", "tx";

			};



			thermal@e07008c4 {

arch/arm/boot/dts/spear13xx.dtsi

+3 −3
Original line number Diff line number Diff line
@@ -284,9 +284,9 @@ spi0: spi@e0100000 { 
				#size-cells = <0>;

				interrupts = <0 31 0x4>;

				status = "disabled";

				dmas = <&dwdma0 4 0 0>,

					<&dwdma0 5 0 0>;

				dma-names = "tx", "rx";

				dmas = <&dwdma0 5 0 0>,

					<&dwdma0 4 0 0>;

				dma-names = "rx", "tx";

			};



			rtc@e0580000 {

arch/arm/mach-omap2/omap-secure.c

+10 −3
Original line number Diff line number Diff line
@@ -59,8 +59,13 @@ static void __init omap_optee_init_check(void) 
u32 omap_secure_dispatcher(u32 idx, u32 flag, u32 nargs, u32 arg1, u32 arg2,

							 u32 arg3, u32 arg4)

{

	static u32 buf[NR_CPUS][5];

	u32 *param;

	int cpu;

	u32 ret;

	u32 param[5];



	cpu = get_cpu();

	param = buf[cpu];



	param[0] = nargs;

	param[1] = arg1;
@@ -76,6 +81,8 @@ u32 omap_secure_dispatcher(u32 idx, u32 flag, u32 nargs, u32 arg1, u32 arg2, 
	outer_clean_range(__pa(param), __pa(param + 5));

	ret = omap_smc2(idx, flag, __pa(param));



	put_cpu();



	return ret;

}
@@ -119,8 +126,8 @@ phys_addr_t omap_secure_ram_mempool_base(void) 
#if defined(CONFIG_ARCH_OMAP3) && defined(CONFIG_PM)

u32 omap3_save_secure_ram(void __iomem *addr, int size)

{

	static u32 param[5];

	u32 ret;

	u32 param[5];



	if (size != OMAP3_SAVE_SECURE_RAM_SZ)

		return OMAP3_SAVE_SECURE_RAM_SZ;
@@ -153,8 +160,8 @@ u32 omap3_save_secure_ram(void __iomem *addr, int size) 
u32 rx51_secure_dispatcher(u32 idx, u32 process, u32 flag, u32 nargs,

			   u32 arg1, u32 arg2, u32 arg3, u32 arg4)

{

	static u32 param[5];

	u32 ret;

	u32 param[5];



	param[0] = nargs+1; /* RX-51 needs number of arguments + 1 */

	param[1] = arg1;

arch/arm64/boot/dts/amd/Makefile

+1 −3
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

dtb-$(CONFIG_ARCH_SEATTLE) += amd-overdrive.dtb \

			amd-overdrive-rev-b0.dtb amd-overdrive-rev-b1.dtb \

			husky.dtb
 
dtb-$(CONFIG_ARCH_SEATTLE) += amd-overdrive-rev-b0.dtb amd-overdrive-rev-b1.dtb

arch/arm64/boot/dts/amd/amd-overdrive-rev-b0.dts

+1 −12
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
/dts-v1/;



/include/ "amd-seattle-soc.dtsi"

/include/ "amd-seattle-cpus.dtsi"



/ {

	model = "AMD Seattle (Rev.B0) Development Board (Overdrive)";
@@ -36,14 +37,6 @@ &gpio1 { 
	status = "ok";

};



&gpio2 {

	status = "ok";

};



&gpio3 {

	status = "ok";

};



&gpio4 {

	status = "ok";

};
@@ -79,10 +72,6 @@ sdcard0: sdcard@0 { 
	};

};



&ipmi_kcs {

	status = "ok";

};



&smb0 {

	/include/ "amd-seattle-xgbe-b.dtsi"

};