hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ARM: SoC fixes for v5.11 

There are only two remaining non-urgent ARM SoC bug fixes that
 could still apply for v5.11, or for the v5.12 merge window:
 
 - 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.
 
 Signed-off-by: Arnd Bergmann <arnd@arndb.de>
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEiK/NIGsWEZVxh/FrYKtH/8kJUicFAmApjr8ACgkQYKtH/8kJ
 UieeaA//WgS/VXoglCj1qQ3fiILia30yRpcPI0I2h4Q0DpNpZSGh9Fn+x21pW2+E
 7uUm1LysLuRZPN41pfeLIO3+k5uj5W7ndMpRY6faANCvwG64i4iB3fX2nzC/o0ZL
 Hq1Eb7LXeG2m5gDpUUnrfyXK8wekVNd6cPp1ttZe+USxieY0DI7tSdSNnyOKyFxO
 RIKsa5R/X4e+jOJPricWOIFKWFNwvBv96Cw3Yi8v93MtIMRNLndbv2B7hL/RNqIg
 NwQcJ4r15iF776aWqdRdY6F9j+QlsL7j4Fvq7vGA7A6Xg4yRZ/ZijTO+dmlt02M2
 cO1a1ZXOyex2W0ZygsrLdSH+FYOxx5ovwts/PxmZtLWcn38vYrl63AScxrj8oF+S
 xk82MC5cnyaVTM7hIWDzFb8I1pFZ9RzdDK6gVJ1almDYuZEDFwhXOpsMpUmJNRxt
 lDAqmdUKe2hAoLxyF9BUnXMdyFRr45MVMuocS7zvIBQCsDjg5kBnFbWj5gdIb+qR
 4fZ47vp2Vjy3PFf41WzOq6UiodDhxIV3557Thsu5JJtKvXVPFTGOTrR55hHG6U0d
 d196jTkfxEJMtBg1k83P+1f0wKssHuxsaDndvnbXegxtjxQG9h/MmLeV4lbA6TFS
 L8/zPJOQgjCnor8PPJBe4zTPQQrQIMcJ0C8WK6CsRHtGBGkGLsg=
 =/6ia
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Linus Torvalds 2021-02-20 18:09:40 -08:00
parent 51e6d17809 090e502e4e
commit 7ddfe9a6a3
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-at91/pm_suspend.S
View File

@ -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. */

4
arch/arm64/boot/dts/intel/socfpga_agilex.dtsi
View File

@ -166,7 +166,7 @@
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 @@
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";