Commit 96479c09 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'arm-multiplatform-5.19-2' of git://git.kernel.org/pub/scm/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
  ...
parents 58f9d52f 3d76c9f5

Documentation/arm/marvell.rst

+0 −7
Original line number Diff line number Diff line
@@ -374,8 +374,6 @@ PXA 2xx/3xx/93x/95x family 


   Linux kernel mach directory:

	arch/arm/mach-pxa

   Linux kernel plat directory:

	arch/arm/plat-pxa



MMP/MMP2/MMP3 family (communication processor)

----------------------------------------------
@@ -429,8 +427,6 @@ MMP/MMP2/MMP3 family (communication processor) 


   Linux kernel mach directory:

	arch/arm/mach-mmp

   Linux kernel plat directory:

	arch/arm/plat-pxa



Berlin family (Multimedia Solutions)

-------------------------------------
@@ -518,9 +514,6 @@ Long-term plans 
   Business Unit) in a single mach-<foo> directory. The plat-orion/

   would therefore disappear.



 * Unify the mach-mmp/ and mach-pxa/ into the same mach-pxa

   directory. The plat-pxa/ would therefore disappear.



Credits

-------

arch/arm/Kconfig

+0 −23
Original line number Diff line number Diff line
@@ -357,25 +357,6 @@ config ARCH_FOOTBRIDGE 
	  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

	select GPIOLIB

	select IRQ_DOMAIN

	select PLAT_PXA

	select SPARSE_IRQ

	help

	  Support for Intel/Marvell's PXA2xx/PXA3xx processor line.



config ARCH_RPC

	bool "RiscPC"

	depends on !CC_IS_CLANG && GCC_VERSION < 90100 && GCC_VERSION >= 60000
@@ -593,7 +574,6 @@ source "arch/arm/mach-orion5x/Kconfig" 
source "arch/arm/mach-oxnas/Kconfig"



source "arch/arm/mach-pxa/Kconfig"

source "arch/arm/plat-pxa/Kconfig"



source "arch/arm/mach-qcom/Kconfig"
@@ -672,9 +652,6 @@ config PLAT_ORION_LEGACY 
	bool

	select PLAT_ORION



config PLAT_PXA

	bool



config PLAT_VERSATILE

	bool

arch/arm/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -225,7 +225,6 @@ machine-$(CONFIG_PLAT_SPEAR) += spear 
# Platform directory name.  This list is sorted alphanumerically

# by CONFIG_* macro name.

plat-$(CONFIG_PLAT_ORION)	+= orion

plat-$(CONFIG_PLAT_PXA)		+= pxa



# The byte offset of the kernel image in RAM from the start of RAM.

TEXT_OFFSET := $(textofs-y)

arch/arm/common/locomo.c

+0 −1
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ 
#include <linux/spinlock.h>

#include <linux/io.h>



#include <mach/hardware.h>

#include <asm/irq.h>

#include <asm/mach/irq.h>

arch/arm/common/sa1111.c

+4 −1
Original line number Diff line number Diff line
@@ -26,13 +26,16 @@ 
#include <linux/clk.h>

#include <linux/io.h>



#include <mach/hardware.h>

#include <asm/mach/irq.h>

#include <asm/mach-types.h>

#include <linux/sizes.h>



#include <asm/hardware/sa1111.h>



#ifdef CONFIG_ARCH_SA1100

#include <mach/hardware.h>

#endif



/* SA1111 IRQs */

#define IRQ_GPAIN0		(0)

#define IRQ_GPAIN1		(1)