| Message ID | CAK8P3a3jec5z=V8ZMTbqDp4pqZ-P0-dJ81qTdwCWa1rP9nieeQ@mail.gmail.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Headers | show |
| Series | ARM SoC branches for 5.15 | expand |
The pull request you sent on Wed, 1 Sep 2021 19:56:35 +0000:
> git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git tags/soc-5.15
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/634135a07b887a8ad8904da8c147407650747a38
Thank you!
The following changes since commit c500bee1c5b2f1d59b1081ac879d73268ab0ff17: Linux 5.14-rc4 (2021-08-01 17:04:17 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git tags/soc-5.15 for you to fetch changes up to 51e321fed0ff8d64eff809a4ee0547254cdcc4a1: soc: aspeed-lpc-ctrl: Fix clock cleanup in error path (2021-08-26 11:31:22 +0200) ---------------------------------------------------------------- ARM: SoC updates for 5.15 There are three noteworthy updates for 32-bit arm platforms this time: - The Microchip SAMA7 family based on Cortex-A7 gets introduced, a new cousin to the older SAM9 (ARM9xx based) and SAMA5 (Cortex-A5 based) SoCs. - The ixp4xx platform (based on Intel XScale) is finally converted to device tree, and all the old board files are getting removed now. - The Cirrus Logic EP93xx platform loses support for the old MaverickCrunch FPU. Support for compiling user space applications was already removed in gcc-4.9, and the kernel support for old applications could not be built with clang ias. After confirming that there are no remaining users, removing this from the kernel seemed better than adding support for unused features to clang. There are minor updates to the aspeed, omap and samsung platforms Signed-off-by: Arnd Bergmann <arnd@arndb.de> ---------------------------------------------------------------- Arnd Bergmann (6): ARM: ep93xx: remove MaverickCrunch support Merge tag 'at91-soc-5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux into arm/soc Merge tag 'omap-for-v5.15/soc-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into arm/soc Merge tag 'omap-for-v5.15/soc-late-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into arm/soc Merge tag 'ixp4xx-del-boardfiles-v5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik into arm/soc Merge tag 'aspeed-5.15-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc into arm/soc Claudiu Beznea (23): clk: at91: add register definition for sama7g5's master clock ARM: at91: pm: move pm_bu to soc_pm data structure ARM: at91: pm: move the setup of soc_pm.bu->suspended ARM: at91: pm: document at91_soc_pm structure ARM: at91: pm: check for different controllers in at91_pm_modes_init() ARM: at91: pm: do not initialize pdev ARM: at91: pm: use r7 instead of tmp1 ARM: at91: pm: avoid push and pop on stack while memory is in self-refersh ARM: at91: pm: s/CONFIG_SOC_SAM9X60/CONFIG_HAVE_AT91_SAM9X60_PLL/g ARM: at91: pm: add support for waiting MCK1..4 ARM: at91: sfrbu: add sfrbu registers definitions for sama7g5 ARM: at91: ddr: add registers definitions for sama7g5's ddr ARM: at91: pm: add self-refresh support for sama7g5 ARM: at91: pm: add support for MCK1..4 save/restore for ulp modes ARM: at91: pm: add support for 2.5V LDO regulator control ARM: at91: pm: wait for ddr power mode off ARM: at91: pm: add sama7g5 ddr controller ARM: at91: pm: add sama7g5 ddr phy controller ARM: at91: pm: save ddr phy calibration data to securam ARM: at91: pm: add backup mode support for SAMA7G5 ARM: at91: pm: add sama7g5's pmc ARM: at91: pm: add pm support for SAMA7G5 ARM: at91: pm: add sama7g5 shdwc Eugen Hristev (3): ARM: at91: add new SoC sama7g5 ARM: at91: debug: add sama7g5 low level debug uart ARM: at91: sama7: introduce sama7 SoC family Iwona Winiarska (2): soc: aspeed: lpc-ctrl: Fix boundary check for mmap soc: aspeed: p2a-ctrl: Fix boundary check for mmap Jason Wang (1): ARM: s3c: delete unneed local variable "delay" Joel Stanley (2): soc: aspeed: socinfo: Add AST2625 variant soc: aspeed: Re-enable FWH2AHB on AST2600 Linus Walleij (11): ARM: ixp4xx: Delete NSLU2 boardfiles ARM: ixp4xx: Delete NAS100D boardfiles ARM: ixp4xx: Delete the D-Link DSM-G600 boardfiles ARM: ixp4xx: Delete Omicron boardfiles ARM: ixp4xx: Delete Gateway WG302v2 boardfiles ARM: ixp4xx: Delete the Arcom Vulcan boardfiles ARM: ixp4xx: Delete Avila boardfiles ARM: ixp4xx: Delete Intel reference design boardfiles ARM: ixp4xx: Delete Coyote and IXDPG425 boardfiles ARM: ixp4xx: Delete GTWX5715 board files ARM: ixp4xx: Delete the Freecom FSG-3 boardfiles Paul Barker (1): MAINTAINERS: Adopt SanCloud dts files as supported Peter Robinson (3): arm: omap2: Drop MACH_OMAP3517EVM entry arm: omap2: Drop obsolete MACH_OMAP3_PANDORA entry arm: omap2: Drop the unused OMAP_PACKAGE_* KConfig entries Yang Yingliang (1): soc: aspeed-lpc-ctrl: Fix clock cleanup in error path MAINTAINERS | 6 + arch/arm/Kconfig.debug | 10 + arch/arm/configs/ep93xx_defconfig | 1 - arch/arm/include/asm/fpstate.h | 8 - arch/arm/include/asm/thread_info.h | 8 - arch/arm/include/asm/ucontext.h | 14 - arch/arm/include/uapi/asm/hwcap.h | 2 +- arch/arm/include/uapi/asm/ptrace.h | 4 +- arch/arm/kernel/asm-offsets.c | 3 - arch/arm/kernel/entry-armv.S | 6 - arch/arm/kernel/ptrace.c | 36 -- arch/arm/kernel/signal.c | 42 -- arch/arm/mach-at91/Kconfig | 18 + arch/arm/mach-at91/Makefile | 1 + arch/arm/mach-at91/generic.h | 2 + arch/arm/mach-at91/pm.c | 343 ++++++++++---- arch/arm/mach-at91/pm.h | 3 + arch/arm/mach-at91/pm_data-offsets.c | 2 + arch/arm/mach-at91/pm_suspend.S | 827 +++++++++++++++++++++++++--------- arch/arm/mach-at91/sama7.c | 33 ++ arch/arm/mach-ep93xx/Kconfig | 5 - arch/arm/mach-ep93xx/Makefile | 3 - arch/arm/mach-ep93xx/adssphere.c | 1 - arch/arm/mach-ep93xx/core.c | 5 - arch/arm/mach-ep93xx/crunch-bits.S | 310 ------------- arch/arm/mach-ep93xx/crunch.c | 86 ---- arch/arm/mach-ep93xx/edb93xx.c | 8 - arch/arm/mach-ep93xx/gesbc9312.c | 1 - arch/arm/mach-ep93xx/micro9.c | 4 - arch/arm/mach-ep93xx/platform.h | 7 - arch/arm/mach-ep93xx/simone.c | 1 - arch/arm/mach-ep93xx/snappercl15.c | 1 - arch/arm/mach-ep93xx/ts72xx.c | 2 - arch/arm/mach-ep93xx/vision_ep9307.c | 1 - arch/arm/mach-ixp4xx/Kconfig | 158 ------- arch/arm/mach-ixp4xx/Makefile | 26 -- arch/arm/mach-ixp4xx/avila-pci.c | 79 ---- arch/arm/mach-ixp4xx/avila-setup.c | 210 --------- arch/arm/mach-ixp4xx/coyote-pci.c | 62 --- arch/arm/mach-ixp4xx/coyote-setup.c | 144 ------ arch/arm/mach-ixp4xx/dsmg600-pci.c | 77 ---- arch/arm/mach-ixp4xx/dsmg600-setup.c | 304 ------------- arch/arm/mach-ixp4xx/fsg-pci.c | 73 --- arch/arm/mach-ixp4xx/fsg-setup.c | 311 ------------- arch/arm/mach-ixp4xx/gtwx5715-pci.c | 72 --- arch/arm/mach-ixp4xx/gtwx5715-setup.c | 167 ------- arch/arm/mach-ixp4xx/ixdp425-pci.c | 75 --- arch/arm/mach-ixp4xx/ixdp425-setup.c | 339 -------------- arch/arm/mach-ixp4xx/ixdpg425-pci.c | 56 --- arch/arm/mach-ixp4xx/miccpt-pci.c | 75 --- arch/arm/mach-ixp4xx/nas100d-pci.c | 73 --- arch/arm/mach-ixp4xx/nas100d-setup.c | 353 --------------- arch/arm/mach-ixp4xx/nslu2-pci.c | 69 --- arch/arm/mach-ixp4xx/nslu2-setup.c | 341 -------------- arch/arm/mach-ixp4xx/omixp-setup.c | 298 ------------ arch/arm/mach-ixp4xx/vulcan-pci.c | 70 --- arch/arm/mach-ixp4xx/vulcan-setup.c | 282 ------------ arch/arm/mach-ixp4xx/wg302v2-pci.c | 60 --- arch/arm/mach-ixp4xx/wg302v2-setup.c | 114 ----- arch/arm/mach-omap2/Kconfig | 23 - arch/arm/mach-s3c/mach-gta02.c | 3 +- arch/arm64/include/asm/hwcap.h | 2 +- drivers/soc/aspeed/aspeed-lpc-ctrl.c | 35 +- drivers/soc/aspeed/aspeed-p2a-ctrl.c | 2 +- drivers/soc/aspeed/aspeed-socinfo.c | 1 + include/linux/clk/at91_pmc.h | 26 ++ include/soc/at91/sama7-ddr.h | 80 ++++ include/soc/at91/sama7-sfrbu.h | 34 ++ 68 files changed, 1129 insertions(+), 4769 deletions(-) create mode 100644 arch/arm/mach-at91/sama7.c delete mode 100644 arch/arm/mach-ep93xx/crunch-bits.S delete mode 100644 arch/arm/mach-ep93xx/crunch.c delete mode 100644 arch/arm/mach-ixp4xx/avila-pci.c delete mode 100644 arch/arm/mach-ixp4xx/avila-setup.c delete mode 100644 arch/arm/mach-ixp4xx/coyote-pci.c delete mode 100644 arch/arm/mach-ixp4xx/coyote-setup.c delete mode 100644 arch/arm/mach-ixp4xx/dsmg600-pci.c delete mode 100644 arch/arm/mach-ixp4xx/dsmg600-setup.c delete mode 100644 arch/arm/mach-ixp4xx/fsg-pci.c delete mode 100644 arch/arm/mach-ixp4xx/fsg-setup.c delete mode 100644 arch/arm/mach-ixp4xx/gtwx5715-pci.c delete mode 100644 arch/arm/mach-ixp4xx/gtwx5715-setup.c delete mode 100644 arch/arm/mach-ixp4xx/ixdp425-pci.c delete mode 100644 arch/arm/mach-ixp4xx/ixdp425-setup.c delete mode 100644 arch/arm/mach-ixp4xx/ixdpg425-pci.c delete mode 100644 arch/arm/mach-ixp4xx/miccpt-pci.c delete mode 100644 arch/arm/mach-ixp4xx/nas100d-pci.c delete mode 100644 arch/arm/mach-ixp4xx/nas100d-setup.c delete mode 100644 arch/arm/mach-ixp4xx/nslu2-pci.c delete mode 100644 arch/arm/mach-ixp4xx/nslu2-setup.c delete mode 100644 arch/arm/mach-ixp4xx/omixp-setup.c delete mode 100644 arch/arm/mach-ixp4xx/vulcan-pci.c delete mode 100644 arch/arm/mach-ixp4xx/vulcan-setup.c delete mode 100644 arch/arm/mach-ixp4xx/wg302v2-pci.c delete mode 100644 arch/arm/mach-ixp4xx/wg302v2-setup.c create mode 100644 include/soc/at91/sama7-ddr.h create mode 100644 include/soc/at91/sama7-sfrbu.h