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

Merge tag 'armsoc-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc 

Pull ARM SoC cleanups from Arnd Bergmann:
 "The cleanups for v4.9 are a little larger that usual, but thankfully
  that is almost exclusively due to removing a significant number of
  files that have become obsolete after the still ongoing conversion of
  old board files to devicetree.

   - for mach-omap2, which is still the largest platform in arch/arm/,
     the conversion to DT is finally complete after the Nokia N900 is
     now fully supported there, along with the omap3 LDP, and we can
     remove those two board files. If no regressions are found, another
     large cleanup for the platform will happen as a follow-up, removing
     dead code and restructuring the platform based on being DT-only.

   - In mach-imx, similar work is ongoing, but has not come that far.
     This time, we remove the obsolete board file for the i.MX1
     generation, which like i.MX25, i.MX5, i.MX6, and i.MX7 is now
     DT-only. The remaining board files are for i.MX2 and i.MX3 machines
     based on old ARM926 or ARM1136 cores that should work with DT in
     principle.

   - realview has just been converted from board files to DT, and a lot
     of code gets removed in the process. This is the last
     ARM/Keil/Versatile derived platform that was still using board
     files, the other ones being integrator, versatile and vexpress. We
     can probably merge the remaining code into a single directory in
     the near future.

   - clps711x had completed the conversion in v4.8, but we accidentally
     left the files in place that should have been deleted then"

* tag 'armsoc-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (21 commits)
  ARM: select PCI_DOMAINS config from ARCH_MULTIPLATFORM
  ARM: stop *MIGHT_HAVE_PCI* config from being selected redundantly
  ARM: imx: (trivial) fix typo and grammar
  ARM: clps711x: remove extraneous files
  ARM: imx: use IS_ENABLED() instead of checking for built-in or module
  ARM: OMAP2+: use IS_ENABLED() instead of checking for built-in or module
  ARM: OMAP1: use IS_ENABLED() instead of checking for built-in or module
  ARM: imx: remove platform-mxc_rnga
  ARM: realview: imply device tree boot
  ARM: realview: no need to select SMP_ON_UP explicitly
  ARM: realview: delete the RealView board files
  ARM: imx: no need to select SMP_ON_UP explicitly
  ARM: i.MX: Move SOC_IMX1 into 'Device tree only'
  ARM: i.MX: Remove i.MX1 non-DT support
  ARM: i.MX: Remove i.MX1 Synertronixx SCB9328 board support
  ARM: i.MX: Remove i.MX1 Armadeus APF9328 board support
  ARM: mxs: remove obsolete startup code for TX28
  ARM: i.MX31 iomux: remove duplicates with alternate name
  ARM: i.MX31 iomux: remove plain duplicates
  ARM: OMAP2+: Drop legacy board file for LDP
  ...
parents 997b611b e13688fe

arch/arm/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -279,10 +279,9 @@ config PHYS_OFFSET 
			ARCH_INTEGRATOR || \

			ARCH_IOP13XX || \

			ARCH_KS8695 || \

			(ARCH_REALVIEW && !REALVIEW_HIGH_PHYS_OFFSET)

			ARCH_REALVIEW

	default 0x10000000 if ARCH_OMAP1 || ARCH_RPC

	default 0x20000000 if ARCH_S5PV210

	default 0x70000000 if REALVIEW_HIGH_PHYS_OFFSET

	default 0xc0000000 if ARCH_SA1100

	help

	  Please provide the physical address corresponding to the
@@ -338,6 +337,7 @@ config ARCH_MULTIPLATFORM 
	select GENERIC_CLOCKEVENTS

	select MIGHT_HAVE_PCI

	select MULTI_IRQ_HANDLER

	select PCI_DOMAINS if PCI

	select SPARSE_IRQ

	select USE_OF

arch/arm/configs/imx_v4_v5_defconfig

+1 −2
Original line number Diff line number Diff line
@@ -22,14 +22,13 @@ CONFIG_ARCH_MULTI_V4T=y 
CONFIG_ARCH_MULTI_V5=y

# CONFIG_ARCH_MULTI_V7 is not set

CONFIG_ARCH_MXC=y

CONFIG_MACH_SCB9328=y

CONFIG_MACH_APF9328=y

CONFIG_MACH_MX21ADS=y

CONFIG_MACH_MX27ADS=y

CONFIG_MACH_MX27_3DS=y

CONFIG_MACH_IMX27_VISSTRIM_M10=y

CONFIG_MACH_PCA100=y

CONFIG_MACH_IMX27_DT=y

CONFIG_SOC_IMX1=y

CONFIG_SOC_IMX25=y

CONFIG_PREEMPT=y

CONFIG_AEABI=y

arch/arm/configs/multi_v4t_defconfig

+1 −3
Original line number Diff line number Diff line
@@ -20,9 +20,7 @@ CONFIG_INTEGRATOR_CM720T=y 
CONFIG_INTEGRATOR_CM920T=y

CONFIG_INTEGRATOR_CM922T_XA10=y

CONFIG_ARCH_MXC=y

CONFIG_MACH_SCB9328=y

CONFIG_MACH_APF9328=y

CONFIG_MACH_IMX1_DT=y

CONFIG_SOC_IMX1=y

CONFIG_ARCH_NSPIRE=y

CONFIG_AEABI=y

# CONFIG_ATAGS is not set

arch/arm/mach-at91/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -55,7 +55,6 @@ config SOC_AT91RM9200 
	select ATMEL_ST

	select CPU_ARM920T

	select HAVE_AT91_USB_CLK

	select MIGHT_HAVE_PCI

	select PINCTRL_AT91

	select SOC_SAM_V4_V5

	select SRAM if PM

arch/arm/mach-axxia/Kconfig

+0 −2
Original line number Diff line number Diff line
@@ -7,8 +7,6 @@ config ARCH_AXXIA 
	select ARM_TIMER_SP804

	select HAVE_ARM_ARCH_TIMER

	select MFD_SYSCON

	select MIGHT_HAVE_PCI

	select PCI_DOMAINS if PCI

	select ZONE_DMA

	help

	  This enables support for the LSI Axxia devices.

CRA Git | Maintained and supported by SUSTech CRA and CCSE