| Message ID | 20210709234054.10288-1-olof@lixom.net (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 6e207b882159ed3e35a4cd4ff0fc155cce5e3cbc |
| Headers | show |
| Series | [GIT,PULL,1/4] ARM: SoC changes for 5.14 | expand |
The pull request you sent on Fri, 9 Jul 2021 16:40:51 -0700:
> git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git tags/arm-soc-5.14
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/6e207b882159ed3e35a4cd4ff0fc155cce5e3cbc
Thank you!
Hello: This pull request was applied to soc/soc.git (refs/heads/arm/fixes): On Fri, 9 Jul 2021 16:40:51 -0700 you wrote: > A few SoC (code) changes have queued up this cycle, mostly for minor > changes and some refactoring and cleanup of legacy platforms. This > branch also contains a few of the fixes that weren't sent in by the end > of the release (all fairly minor). > > - Adding an additional maintainer for the TEE subsystem (Sumit Garg) > > [...] Here is the summary with links: - [GIT,PULL,1/4] ARM: SoC changes for 5.14 https://git.kernel.org/soc/soc/c/6e207b882159 - [GIT,PULL,2/4] ARM: Devicetree material for 5.14 https://git.kernel.org/soc/soc/c/e083bbd6040f - [GIT,PULL,3/4] ARM: Drivers for 5.14 https://git.kernel.org/soc/soc/c/071e5aceebeb - [GIT,PULL,4/4] ARM: Defconfig changes for 5.14 https://git.kernel.org/soc/soc/c/af4cf6a5689a You are awesome, thank you! -- Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
A few SoC (code) changes have queued up this cycle, mostly for minor changes and some refactoring and cleanup of legacy platforms. This branch also contains a few of the fixes that weren't sent in by the end of the release (all fairly minor). - Adding an additional maintainer for the TEE subsystem (Sumit Garg) - Quite a significant modernization of the IXP4xx platforms by Linus Walleij, revisiting with a new PCI host driver/binding, removing legacy mach/* include dependencies and moving platform detection/config to drivers/soc. Also some updates/cleanup of platform data. - Core power domain support for Tegra platforms, and some improvements in build test coverage by adding stubs for compile test targets. - A handful of updates to i.MX platforms, adding legacy (non-PSCI) SMP support on i.MX7D, SoC ID setup for i.MX50, removal of platform data and board fixups for iMX6/7. ... and a few smaller changes and fixes for Samsung, OMAP, Allwinner, Rockchip. ---------------------------------------------------------------- The following changes since commit 50be9417e23af5a8ac860d998e1e3f06b8fd79d7: Merge tag 'io_uring-5.14-2021-07-09' of git://git.kernel.dk/linux-block are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git tags/arm-soc-5.14 for you to fetch changes up to 42accadb3265f4569620cde217ff448b568b2822: Merge branch 'arm/fixes' into arm/soc ---------------------------------------------------------------- Alejandro Lucero (1): ARM: OMAP2+: remove duplicated prototype Anson Huang (1): ARM: imx: add smp support for imx7d Arnd Bergmann (3): soc: ixp4xx: move cpu detection to linux/soc/ixp4xx/cpu.h pata: ixp4xx: split platform data to its own header hw_random: ixp4xx: enable compile-testing Colin Ian King (1): ixp4xx: fix spelling mistake in Kconfig "Devce" -> "Device" Daniel Palmer (1): MAINTAINERS: ARM/MStar/Sigmastar SoCs: Add a link to the MStar tree Dario Binacchi (2): ARM: OMAP2+: CM: remove omap2_set_globals_cm() ARM: OMAP2+: remove omap2_set_globals_control() Dmitry Osipenko (7): soc/tegra: regulators: Bump voltages on system reboot soc/tegra: Add stub for soc_is_tegra() soc/tegra: Add devm_tegra_core_dev_init_opp_table() soc/tegra: fuse: Add stubs needed for compile-testing soc/tegra: pmc: Add core power domain soc/tegra: pmc: Add driver state syncing soc/tegra: regulators: Support core domain state syncing Gowtham Tammana (1): ARM: dts: dra7: Fix duplicate USB4 target module node Icenowy Zheng (1): arm64: dts: allwinner: a64-sopine-baseboard: change RGMII mode to TXID Jonathan Neuschäfer (2): ARM: imx: pm-imx5: Fix references to imx5_cpu_suspend_info ARM: imx: Initialize SoC ID on i.MX50 Juerg Haefliger (1): ARM: OMAP1: Remove leading spaces in Kconfig Krzysztof Kozlowski (3): ARM: exynos: add missing of_node_put for loop iteration soc: samsung: pmu: drop EXYNOS_CENTRAL_SEQ_OPTION defines MAINTAINERS: Include Samsung PWM in Samsung SoC entry Linus Walleij (9): ARM: dts: ux500: Fix LED probing ARM/ixp4xx: Move the virtual IObases ARM/ixp4xx: Make NEED_MACH_IO_H optional PCI: ixp4xx: Add device tree bindings for IXP4xx PCI: ixp4xx: Add a new driver for IXP4xx hw_random: ixp4xx: Use SPDX license tag hw_random: ixp4xx: Turn into a module hw_random: ixp4xx: Add DT bindings hw_random: ixp4xx: Add OF support Lukas Bulwahn (1): MAINTAINERS: remove obsolete OMAP HWMOD DATA FOR OMAP4-BASED DEVICES Manivannan Sadhasivam (2): ARM: dts: qcom: sdx55-t55: Represent secure-regions as 64-bit elements ARM: dts: qcom: sdx55-telit: Represent secure-regions as 64-bit elements Marco Felsch (1): ARM: imx6q: drop of_platform_default_populate() from init_machine Oleksij Rempel (7): ARM: imx6q: remove PHY fixup for KSZ9031 ARM: imx6q: remove part of ar8031_phy_fixup() ARM: imx6q: remove BMCR_PDOWN handler in ar8035_phy_fixup() ARM: imx6q: remove clk-out fixup for the Atheros AR8031 and AR8035 PHYs ARM: imx6q: remove Atheros AR8035 SmartEEE fixup ARM: imx6sx: remove Atheros AR8031 PHY fixup ARM: imx7d: remove Atheros AR8031 PHY fixup Olof Johansson (13): Merge tag 'omap-for-v5.14/cleanup-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into arm/soc Merge tag 'samsung-soc-5.14' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into arm/soc Merge tag 'sunxi-fixes-for-5.13-1' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into arm/fixes Merge tag 'sunxi-core-for-5.14-1' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into arm/soc Merge tag 'v5.13-rockchip-dtsfixes1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into arm/fixes Merge tag 'imx-soc-5.14' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into arm/soc Merge tag 'qcom-dts-fixes-for-5.13' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into arm/fixes Merge tag 'tegra-for-5.14-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into arm/soc Merge tag 'omap-for-v5.13/fixes-rc6-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into arm/fixes Merge tag 'omap-for-v5.14/fixes-not-urgent-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into arm/soc Merge tag 'ixp4xx-arm-soc-v5.14' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik into arm/soc Merge tag 'tee-reviewer-for-v5.13' of git://git.linaro.org:/people/jens.wiklander/linux-tee into arm/fixes Merge branch 'arm/fixes' into arm/soc Punit Agrawal (1): arm64: dts: rockchip: Update RK3399 PCI host bridge window to 32-bit address memory Romain Perier (1): ARM: debug: add UART early console support for MSTAR SoCs Salvatore Bonaccorso (1): ARM: dts: sun8i: h3: orangepi-plus: Fix ethernet phy-mode Samuel Holland (1): arm64: sunxi: Build the sun4i timer driver Sumit Garg (1): MAINTAINERS: Add myself as TEE subsystem reviewer Thierry Reding (2): Merge branch 'for-5.14/regulator' into for-5.14/soc soc/tegra: fuse: Fix Tegra234-only builds Tony Lindgren (2): Merge branch 'omap-for-v5.13/genpd-cleanup' into omap-for-v5.14/cleanup ARM: OMAP2+: Block suspend for am3 and am4 if PM is not configured Wan Jiabing (1): ARM: s3c: Remove unnecessary break in RX1950 Yang Yingliang (1): soc/tegra: fuse: Don't return -ENOMEM when allocate lookups failed .../bindings/pci/intel,ixp4xx-pci.yaml | 100 +++ .../bindings/rng/intel,ixp46x-rng.yaml | 36 + MAINTAINERS | 18 +- arch/arm/Kconfig | 3 +- arch/arm/Kconfig.debug | 15 +- arch/arm/boot/dts/am5718.dtsi | 6 +- arch/arm/boot/dts/dra7-l4.dtsi | 22 - arch/arm/boot/dts/dra71x.dtsi | 4 - arch/arm/boot/dts/dra72x.dtsi | 4 - arch/arm/boot/dts/dra74x.dtsi | 92 +-- arch/arm/boot/dts/qcom-sdx55-t55.dts | 2 +- .../arm/boot/dts/qcom-sdx55-telit-fn980-tlb.dts | 4 +- arch/arm/boot/dts/ste-href.dtsi | 7 + arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts | 2 +- arch/arm/mach-exynos/exynos.c | 2 + arch/arm/mach-imx/Makefile | 2 +- arch/arm/mach-imx/common.h | 3 + arch/arm/mach-imx/headsmp.S | 9 + arch/arm/mach-imx/hotplug.c | 3 + arch/arm/mach-imx/mach-imx50.c | 7 + arch/arm/mach-imx/mach-imx6q.c | 88 --- arch/arm/mach-imx/mach-imx6sx.c | 26 - arch/arm/mach-imx/mach-imx7d.c | 25 +- arch/arm/mach-imx/platsmp.c | 26 + arch/arm/mach-imx/src.c | 101 ++- arch/arm/mach-imx/suspend-imx53.S | 4 +- arch/arm/mach-ixp4xx/Kconfig | 35 +- arch/arm/mach-ixp4xx/avila-setup.c | 1 + arch/arm/mach-ixp4xx/common.c | 47 +- arch/arm/mach-ixp4xx/fsg-setup.c | 1 + arch/arm/mach-ixp4xx/include/mach/cpu.h | 54 -- arch/arm/mach-ixp4xx/include/mach/hardware.h | 2 +- arch/arm/mach-ixp4xx/include/mach/ixp4xx-regs.h | 61 +- arch/arm/mach-ixp4xx/include/mach/platform.h | 14 - arch/arm/mach-ixp4xx/ixp4xx-of.c | 8 +- arch/arm/mach-ixp4xx/nas100d-setup.c | 1 + arch/arm/mach-ixp4xx/nslu2-setup.c | 1 + arch/arm/mach-omap1/Kconfig | 12 +- arch/arm/mach-omap2/cm.h | 1 - arch/arm/mach-omap2/cm_common.c | 13 - arch/arm/mach-omap2/common.h | 1 - arch/arm/mach-omap2/control.c | 5 - arch/arm/mach-omap2/control.h | 1 - arch/arm/mach-omap2/pm33xx-core.c | 40 ++ arch/arm/mach-s3c/mach-rx1950.c | 1 - arch/arm64/Kconfig.platforms | 1 + .../allwinner/sun50i-a64-sopine-baseboard.dts | 2 +- arch/arm64/boot/dts/rockchip/rk3399.dtsi | 2 +- drivers/ata/Kconfig | 2 +- drivers/ata/pata_ixp4xx_cf.c | 1 + drivers/char/hw_random/Kconfig | 2 +- drivers/char/hw_random/ixp4xx-rng.c | 53 +- drivers/crypto/ixp4xx_crypto.c | 4 + drivers/net/ethernet/xscale/ixp4xx_eth.c | 2 + drivers/net/ethernet/xscale/ptp_ixp46x.c | 3 +- drivers/net/wan/ixp4xx_hss.c | 1 + drivers/pci/controller/Kconfig | 8 + drivers/pci/controller/Makefile | 1 + drivers/pci/controller/pci-ixp4xx.c | 671 +++++++++++++++++++ drivers/soc/imx/soc-imx.c | 3 + drivers/soc/ixp4xx/ixp4xx-npe.c | 2 + drivers/soc/ixp4xx/ixp4xx-qmgr.c | 2 + drivers/soc/tegra/Kconfig | 2 + drivers/soc/tegra/common.c | 97 +++ drivers/soc/tegra/fuse/fuse-tegra.c | 6 +- drivers/soc/tegra/fuse/fuse-tegra30.c | 3 +- drivers/soc/tegra/pmc.c | 144 ++++ drivers/soc/tegra/regulators-tegra20.c | 94 ++- drivers/soc/tegra/regulators-tegra30.c | 93 ++- include/linux/platform_data/pata_ixp4xx_cf.h | 21 + include/linux/soc/ixp4xx/cpu.h | 106 +++ include/linux/soc/samsung/exynos-regs-pmu.h | 6 - include/soc/imx/cpu.h | 1 + include/soc/tegra/common.h | 31 + include/soc/tegra/fuse.h | 20 +- include/soc/tegra/pmc.h | 7 + 76 files changed, 1841 insertions(+), 460 deletions(-) create mode 100644 Documentation/devicetree/bindings/pci/intel,ixp4xx-pci.yaml create mode 100644 Documentation/devicetree/bindings/rng/intel,ixp46x-rng.yaml delete mode 100644 arch/arm/mach-ixp4xx/include/mach/cpu.h create mode 100644 drivers/pci/controller/pci-ixp4xx.c create mode 100644 include/linux/platform_data/pata_ixp4xx_cf.h create mode 100644 include/linux/soc/ixp4xx/cpu.h