From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 2 Jun 2022 22:23:54 +0000 (-0700)
Subject: Merge tag 'arm-multiplatform-5.19-2' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v5.19-rc1~60
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=96479c09803b21d195c95fd4b145cd3a5a591ba0;p=linux-block.git

Merge tag 'arm-multiplatform-5.19-2' of git://git./linux/kernel/git/soc/soc

Pull more ARM multiplatform updates from Arnd Bergmann:
 "The second part of the multiplatform changes now converts the
  Intel/Marvell PXA platform along with the rest. The patches went
  through several rebases before the merge window as bugs were found, so
  they remained separate.

  This has to touch a lot of drivers, in particular the touchscreen,
  pcmcia, sound and clk bits, to detach the driver files from the
  platform and board specific header files"

* tag 'arm-multiplatform-5.19-2' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (48 commits)
  ARM: pxa/mmp: remove traces of plat-pxa
  ARM: pxa: convert to multiplatform
  ARM: pxa/sa1100: move I/O space to PCI_IOBASE
  ARM: pxa: remove support for MTD_XIP
  ARM: pxa: move mach/*.h to mach-pxa/
  ARM: PXA: fix multi-cpu build of xsc3
  ARM: pxa: move plat-pxa to drivers/soc/
  ARM: mmp: rename pxa_register_device
  ARM: mmp: remove tavorevb board support
  ARM: pxa: remove unused mach/bitfield.h
  ARM: pxa: move clk register definitions to driver
  ARM: pxa: move smemc register access from clk to platform
  cpufreq: pxa3: move clk register access to clk driver
  ARM: pxa: remove get_clk_frequency_khz()
  ARM: pxa: pcmcia: move smemc configuration back to arch
  ASoC: pxa: i2s: use normal MMIO accessors
  ASoC: pxa: ac97: use normal MMIO accessors
  ASoC: pxa: use pdev resource for FIFO regs
  Input: wm97xx - get rid of irq_enable method in wm97xx_mach_ops
  Input: wm97xx - switch to using threaded IRQ
  ...
---

96479c09803b21d195c95fd4b145cd3a5a591ba0
diff --cc arch/arm/Kconfig
index 903165a400a7,001f77e0058c..41b8b28b7a2d
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -357,25 -370,47 +357,6 @@@ config ARCH_FOOTBRIDG
  	  Support for systems based on the DC21285 companion chip
  	  ("FootBridge"), such as the Simtec CATS and the Rebel NetWinder.
  
- config ARCH_PXA
- 	bool "PXA2xx/PXA3xx-based"
- 	depends on CPU_LITTLE_ENDIAN
- 	select ARCH_MTD_XIP
- 	select ARM_CPU_SUSPEND if PM
- 	select AUTO_ZRELADDR
- 	select COMMON_CLK
- 	select CLKSRC_PXA
- 	select CLKSRC_MMIO
- 	select TIMER_OF
- 	select CPU_XSCALE if !CPU_XSC3
- 	select GPIO_PXA
 -config ARCH_IOP32X
 -	bool "IOP32x-based"
 -	select CPU_XSCALE
 -	select GPIO_IOP
--	select GPIOLIB
- 	select IRQ_DOMAIN
- 	select PLAT_PXA
 -	select FORCE_PCI
 -	select PLAT_IOP
 -	help
 -	  Support for Intel's 80219 and IOP32X (XScale) family of
 -	  processors.
 -
 -config ARCH_IXP4XX
 -	bool "IXP4xx-based"
 -	select ARCH_SUPPORTS_BIG_ENDIAN
 -	select ARM_PATCH_PHYS_VIRT
 -	select CPU_XSCALE
 -	select GPIO_IXP4XX
 -	select GPIOLIB
 -	select HAVE_PCI
 -	select IXP4XX_IRQ
 -	select IXP4XX_TIMER
--	select SPARSE_IRQ
 -	select USB_EHCI_BIG_ENDIAN_DESC
 -	select USB_EHCI_BIG_ENDIAN_MMIO
--	help
- 	  Support for Intel/Marvell's PXA2xx/PXA3xx processor line.
 -	  Support for Intel's IXP4XX (XScale) family of processors.
 -
 -config ARCH_DOVE
 -	bool "Marvell Dove"
 -	select CPU_PJ4
 -	select GPIOLIB
 -	select HAVE_PCI
 -	select MVEBU_MBUS
 -	select PINCTRL
 -	select PINCTRL_DOVE
 -	select PLAT_ORION_LEGACY
 -	select SPARSE_IRQ
 -	select PM_GENERIC_DOMAINS if PM
 -	help
 -	  Support for the Marvell Dove SoC 88AP510
--
  config ARCH_RPC
  	bool "RiscPC"
  	depends on !CC_IS_CLANG && GCC_VERSION < 90100 && GCC_VERSION >= 60000
diff --cc arch/arm/Makefile
index 954ec707d182,206a900fc87c..20242acb3f12
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@@ -224,8 -228,9 +224,7 @@@ machine-$(CONFIG_PLAT_SPEAR)		+= spea
  
  # Platform directory name.  This list is sorted alphanumerically
  # by CONFIG_* macro name.
 -plat-$(CONFIG_ARCH_OMAP)	+= omap
  plat-$(CONFIG_PLAT_ORION)	+= orion
- plat-$(CONFIG_PLAT_PXA)		+= pxa
 -plat-$(CONFIG_PLAT_VERSATILE)	+= versatile
  
  # The byte offset of the kernel image in RAM from the start of RAM.
  TEXT_OFFSET := $(textofs-y)
diff --cc arch/arm/mach-pxa/Kconfig
index 57f0be4065c1,d2cea239fe13..a5df1d9f3360
--- a/arch/arm/mach-pxa/Kconfig
+++ b/arch/arm/mach-pxa/Kconfig
@@@ -1,4 -1,18 +1,19 @@@
  # SPDX-License-Identifier: GPL-2.0-only
+ menuconfig ARCH_PXA
+ 	bool "PXA2xx/PXA3xx-based"
+ 	depends on ARCH_MULTI_V5
++	depends on CPU_LITTLE_ENDIAN
+ 	select ARM_CPU_SUSPEND if PM
+ 	select CLKSRC_PXA
+ 	select CLKSRC_MMIO
+ 	select TIMER_OF
+ 	select CPU_XSCALE if !CPU_XSC3
+ 	select GPIO_PXA
+ 	select GPIOLIB
+ 	select PLAT_PXA
+ 	help
+ 	  Support for Intel/Marvell's PXA2xx/PXA3xx processor line.
+ 
  if ARCH_PXA
  
  menu "Intel PXA2xx/PXA3xx Implementations"