Commit 7ddfe9a6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull ARM SoC fixes from Arnd Bergmann:
 "There are only two left-over remaining non-urgent ARM SoC bug fixes:

   - A build fix for the Atmel SAM9 platform to allow building with the
     clang integrated assembler

   - A DT fix for ethernet on Intel SoCFPGA, this has been broken since
     it was added in v5.4"

* tag 'arm-fixes-v5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc:
  ARM: at91: use proper asm syntax in pm_suspend
  arm64: dts: agilex: fix phy interface bit shift for gmac1 and gmac2
parents 51e6d178 090e502e

arch/arm/mach-at91/pm_suspend.S

+1 −1
Original line number Diff line number Diff line
@@ -442,7 +442,7 @@ ENDPROC(at91_backup_mode) 
	str	tmp1, [pmc, #AT91_PMC_PLL_UPDT]



	/* step 2. */

	ldr	tmp1, =#AT91_PMC_PLL_ACR_DEFAULT_PLLA

	ldr	tmp1, =AT91_PMC_PLL_ACR_DEFAULT_PLLA

	str	tmp1, [pmc, #AT91_PMC_PLL_ACR]



	/* step 3. */

arch/arm64/boot/dts/intel/socfpga_agilex.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -166,7 +166,7 @@ gmac1: ethernet@ff802000 { 
			rx-fifo-depth = <16384>;

			snps,multicast-filter-bins = <256>;

			iommus = <&smmu 2>;

			altr,sysmgr-syscon = <&sysmgr 0x48 8>;

			altr,sysmgr-syscon = <&sysmgr 0x48 0>;

			clocks = <&clkmgr AGILEX_EMAC1_CLK>, <&clkmgr AGILEX_EMAC_PTP_CLK>;

			clock-names = "stmmaceth", "ptp_ref";

			status = "disabled";
@@ -184,7 +184,7 @@ gmac2: ethernet@ff804000 { 
			rx-fifo-depth = <16384>;

			snps,multicast-filter-bins = <256>;

			iommus = <&smmu 3>;

			altr,sysmgr-syscon = <&sysmgr 0x4c 16>;

			altr,sysmgr-syscon = <&sysmgr 0x4c 0>;

			clocks = <&clkmgr AGILEX_EMAC2_CLK>, <&clkmgr AGILEX_EMAC_PTP_CLK>;

			clock-names = "stmmaceth", "ptp_ref";

			status = "disabled";