Commit baaa68a9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'arm-soc-5.18' of git://git.kernel.org/pub/scm/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
  ...
parents 8ffa5709 2f618d5e

Documentation/devicetree/bindings/soc/samsung/exynos-usi.yaml

+10 −10
Original line number Diff line number Diff line
@@ -17,13 +17,6 @@ description: | 
  child nodes, each representing a serial sub-node device. The mode setting

  selects which particular function will be used.



  Refer to next bindings documentation for information on protocol subnodes that

  can exist under USI node:



  [1] Documentation/devicetree/bindings/serial/samsung_uart.yaml

  [2] Documentation/devicetree/bindings/i2c/i2c-exynos5.txt

  [3] Documentation/devicetree/bindings/spi/samsung,spi.yaml



properties:

  $nodename:

    pattern: "^usi@[0-9a-f]+$"
@@ -71,10 +64,17 @@ properties: 
      This property is optional.



patternProperties:

  # All other properties should be child nodes

  "^(serial|spi|i2c)@[0-9a-f]+$":

  "^i2c@[0-9a-f]+$":

    $ref: /schemas/i2c/i2c-exynos5.yaml

    description: Child node describing underlying I2C



  "^serial@[0-9a-f]+$":

    $ref: /schemas/serial/samsung_uart.yaml

    description: Child node describing underlying UART/serial



  "^spi@[0-9a-f]+$":

    type: object

    description: Child node describing underlying USI serial protocol

    description: Child node describing underlying SPI



required:

  - compatible

MAINTAINERS

+0 −7
Original line number Diff line number Diff line
@@ -2117,13 +2117,6 @@ F: Documentation/devicetree/bindings/arm/intel,keembay.yaml 
F:	arch/arm64/boot/dts/intel/keembay-evm.dts

F:	arch/arm64/boot/dts/intel/keembay-soc.dtsi









ARM/INTEL RESEARCH IMOTE/STARGATE 2 MACHINE SUPPORT









M:	Jonathan Cameron <jic23@cam.ac.uk>









L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)









S:	Maintained









F:	arch/arm/mach-pxa/stargate2.c









F:	drivers/pcmcia/pxa2xx_stargate2.c

















ARM/INTEL XSC3 (MANZANO) ARM CORE









M:	Lennert Buytenhek <kernel@wantstofly.org>









L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
































arch/arm/Kconfig



+16
−29






























Original line number
Diff line number
Diff line







@@ -233,9 +233,6 @@ config ARCH_MAY_HAVE_PC_FDC







config ARCH_SUPPORTS_UPROBES









	def_bool y



















config ARCH_HAS_DMA_SET_COHERENT_MASK









	bool



















config GENERIC_ISA_DMA









	bool


















@@ -279,7 +276,7 @@ config PHYS_OFFSET







	hex "Physical address of main memory" if MMU









	depends on !ARM_PATCH_PHYS_VIRT









	default DRAM_BASE if !MMU









	default 0x00000000 if ARCH_FOOTBRIDGE || ARCH_IXP4XX









	default 0x00000000 if ARCH_FOOTBRIDGE









	default 0x10000000 if ARCH_OMAP1 || ARCH_RPC









	default 0x30000000 if ARCH_S3C24XX









	default 0xa0000000 if ARCH_IOP32X || ARCH_PXA








@@ -307,6 +304,17 @@ config MMU







	  Select if you want MMU-based virtualised addressing space









	  support by paged memory management. If unsure, say 'Y'.



















config ARM_SINGLE_ARMV7M









	def_bool !MMU









	select ARM_NVIC









	select AUTO_ZRELADDR









	select TIMER_OF









	select COMMON_CLK









	select CPU_V7M









	select NO_IOPORT_MAP









	select SPARSE_IRQ









	select USE_OF



















config ARCH_MMAP_RND_BITS_MIN









	default 8


















@@ -321,12 +329,11 @@ config ARCH_MMAP_RND_BITS_MAX







#









choice









	prompt "ARM system type"









	default ARM_SINGLE_ARMV7M if !MMU









	default ARCH_MULTIPLATFORM if MMU









	depends on MMU









	default ARCH_MULTIPLATFORM



















config ARCH_MULTIPLATFORM









	bool "Allow multiple platforms to be selected"









	depends on MMU









	select ARCH_FLATMEM_ENABLE









	select ARCH_SPARSEMEM_ENABLE









	select ARCH_SELECT_MEMORY_MODEL








@@ -340,18 +347,6 @@ config ARCH_MULTIPLATFORM







	select SPARSE_IRQ









	select USE_OF



















config ARM_SINGLE_ARMV7M









	bool "ARMv7-M based platforms (Cortex-M0/M3/M4)"









	depends on !MMU









	select ARM_NVIC









	select AUTO_ZRELADDR









	select TIMER_OF









	select COMMON_CLK









	select CPU_V7M









	select NO_IOPORT_MAP









	select SPARSE_IRQ









	select USE_OF



















config ARCH_EP93XX









	bool "EP93xx-based"









	select ARCH_SPARSEMEM_ENABLE








@@ -370,7 +365,6 @@ config ARCH_FOOTBRIDGE







	bool "FootBridge"









	select CPU_SA110









	select FOOTBRIDGE









	select NEED_MACH_IO_H if !MMU









	select NEED_MACH_MEMORY_H









	help









	  Support for systems based on the DC21285 companion chip








@@ -378,7 +372,6 @@ config ARCH_FOOTBRIDGE

















config ARCH_IOP32X









	bool "IOP32x-based"









	depends on MMU









	select CPU_XSCALE









	select GPIO_IOP









	select GPIOLIB








@@ -390,18 +383,15 @@ config ARCH_IOP32X

















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 GPIO_IXP4XX









	select GPIOLIB









	select HAVE_PCI









	select IXP4XX_IRQ









	select IXP4XX_TIMER









	# With the new PCI driver this is not needed









	select NEED_MACH_IO_H if IXP4XX_PCI_LEGACY









	select SPARSE_IRQ









	select USB_EHCI_BIG_ENDIAN_DESC









	select USB_EHCI_BIG_ENDIAN_MMIO









	help








@@ -423,7 +413,6 @@ config ARCH_DOVE

















config ARCH_PXA









	bool "PXA2xx/PXA3xx-based"









	depends on MMU









	select ARCH_MTD_XIP









	select ARM_CPU_SUSPEND if PM









	select AUTO_ZRELADDR








@@ -442,7 +431,6 @@ config ARCH_PXA

















config ARCH_RPC









	bool "RiscPC"









	depends on MMU









	depends on !CC_IS_CLANG && GCC_VERSION < 90100 && GCC_VERSION >= 60000









	select ARCH_ACORN









	select ARCH_MAY_HAVE_PC_FDC








@@ -497,7 +485,6 @@ config ARCH_S3C24XX

















config ARCH_OMAP1









	bool "TI OMAP1"









	depends on MMU









	select ARCH_OMAP









	select CLKSRC_MMIO









	select GENERIC_IRQ_CHIP
































arch/arm/configs/pxa_defconfig



+0
−3






























Original line number
Diff line number
Diff line







@@ -41,8 +41,6 @@ CONFIG_MACH_EXEDA=y







CONFIG_MACH_CM_X300=y









CONFIG_MACH_CAPC7117=y









CONFIG_ARCH_GUMSTIX=y









CONFIG_MACH_INTELMOTE2=y









CONFIG_MACH_STARGATE2=y









CONFIG_MACH_XCEP=y









CONFIG_TRIZEPS_PXA=y









CONFIG_MACH_TRIZEPS4WL=y








@@ -487,7 +485,6 @@ CONFIG_SND_SOC_ZYLONITE=m







CONFIG_SND_PXA2XX_SOC_HX4700=m









CONFIG_SND_PXA2XX_SOC_MAGICIAN=m









CONFIG_SND_PXA2XX_SOC_MIOA701=m









CONFIG_SND_PXA2XX_SOC_IMOTE2=m









CONFIG_SND_SOC_AK4642=m









CONFIG_SND_SOC_WM8978=m









CONFIG_SND_SIMPLE_CARD=m
































arch/arm/mach-at91/Kconfig



+1
−0






























Original line number
Diff line number
Diff line







@@ -63,6 +63,7 @@ config SOC_SAMA7G5







	select HAVE_AT91_GENERATED_CLK









	select HAVE_AT91_SAM9X60_PLL









	select HAVE_AT91_UTMI









	select PM_OPP









	select SOC_SAMA7









	help









	  Select this if you are using one of Microchip's SAMA7G5 family SoC.