From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 24 Mar 2022 01:20:09 +0000 (-0700)
Subject: Merge tag 'arm-soc-5.18' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
X-Git-Tag: v6.1-rc5~1757
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=baaa68a9796ef2cadfe5caaf4c730412eda0f31c;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'arm-soc-5.18' of git://git./linux/kernel/git/soc/soc

Pull ARM SoC updates from Arnd Bergmann:
 "SoC specific code is generally used for older platforms that don't
  (yet) use device tree to do the same things.

   - Support is added for i.MXRT10xx, a Cortex-M7 based microcontroller
     from NXP. At the moment this is still incomplete as other portions
     are merged through different trees.

   - Long abandoned support for running NOMMU ARMv4 or ARMv5 platforms
     gets removed, now the Arm NOMMU platforms are limited to the
     Cortex-M family of microcontrollers

   - Two old PXA boards get removed, along with corresponding driver
     bits.

   - Continued cleanup of the Intel IXP4xx platforms, removing some
     remnants of the old board files.

   - Minor Cleanups and fixes for Orion, PXA, MMP, Mstar, Samsung

   - CPU idle support for AT91

   - A system controller driver for Polarfire"

* tag 'arm-soc-5.18' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (29 commits)
  ARM: remove support for NOMMU ARMv4/v5
  ARM: PXA: fix up decompressor code
  soc: microchip: make mpfs_sys_controller_put static
  ARM: pxa: remove Intel Imote2 and Stargate 2 boards
  ARM: mmp: Fix failure to remove sram device
  ARM: mstar: Select ARM_ERRATA_814220
  soc: add microchip polarfire soc system controller
  ARM: at91: Kconfig: select PM_OPP
  ARM: at91: PM: add cpu idle support for sama7g5
  ARM: at91: ddr: fix typo to align with datasheet naming
  ARM: at91: ddr: align macro definitions
  ARM: at91: ddr: remove CONFIG_SOC_SAMA7 dependency
  ARM: ixp4xx: Convert to SPARSE_IRQ and P2V
  ARM: ixp4xx: Drop all common code
  ARM: ixp4xx: Drop custom DMA coherency and bouncing
  ARM: ixp4xx: Remove feature bit accessors
  net: ixp4xx_hss: Check features using syscon
  net: ixp4xx_eth: Drop platform data support
  soc: ixp4xx-npe: Access syscon regs using regmap
  soc: ixp4xx: Add features from regmap helper
  ...
---

baaa68a9796ef2cadfe5caaf4c730412eda0f31c
diff --cc arch/arm/Kconfig
index c0d14b1,8d6ed73..2366a7f
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -390,11 -374,10 +383,9 @@@ config ARCH_IOP32
  
  config ARCH_IXP4XX
  	bool "IXP4xx-based"
- 	depends on MMU
- 	select ARCH_HAS_DMA_SET_COHERENT_MASK
  	select ARCH_SUPPORTS_BIG_ENDIAN
+ 	select ARM_PATCH_PHYS_VIRT
  	select CPU_XSCALE
- 	select DMABOUNCE if PCI
 -	select GENERIC_IRQ_MULTI_HANDLER
  	select GPIO_IXP4XX
  	select GPIOLIB
  	select HAVE_PCI
diff --cc arch/arm/mach-mstar/Kconfig
index 0bf4d312,48600ec..5dbea7b
--- a/arch/arm/mach-mstar/Kconfig
+++ b/arch/arm/mach-mstar/Kconfig
@@@ -1,9 -1,9 +1,10 @@@
  menuconfig ARCH_MSTARV7
  	bool "MStar/Sigmastar Armv7 SoC Support"
  	depends on ARCH_MULTI_V7
+ 	select ARM_ERRATA_814220
  	select ARM_GIC
  	select ARM_HEAVY_MB
 +	select HAVE_ARM_ARCH_TIMER
  	select MST_IRQ
  	select MSTAR_MSC313_MPLL
  	help