Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 212fe84a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull ARM SoC cleanups from Arnd Bergmann:
 "This time around, the cleanup branch contains mostly code removal.  A
  number of board files for at91, imx and msm have become obsolete
  because of the DT conversion and are now ready to be removed.  The
  OMAP platform has traditionally had its own DMA engine abstraction and
  as this is being phased out, a lot of the original code is now unused
  and can be removed as well.

  S3C24xx can be simplified now that the restart code is a proper device
  driver.

  Finally, a number of cleanups in shmobile are done to prepare for the
  addition of new code in other branches"

* tag 'cleanup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (43 commits)
  ARM: at91: Remove the support for the RSI EWS board
  arm: mach-omap2: Convert pr_warning to pr_warn
  ARM: OMAP: Remove unused pieces of legacy DMA API
  ARM: at91: remove board file for Acme Systems Fox G20
  ARM: orion5x: Convert pr_warning to pr_warn
  ARM: S3C24XX: remove separate restart code
  ARM: EXYNOS: Do not calculate boot address twice
  ARM: sunxi: Remove sun4i reboot code from mach directory
  ARM: imx: Remove mach-mxt_td60 board file
  ARM: shmobile: armadillo800eva legacy: Use rmobile_add_devices_to_domains()
  ARM: shmobile: r8a7740: Clean up pm domain table
  ARM: shmobile: r8a7740: Use rmobile_add_devices_to_domains()
  ARM: shmobile: sh7372: Make domain_devices[] static __initdata
  ARM: shmobile: mackerel: Make domain_devices[] static __initdata
  clocksource: tcb_clksrc: sanitize IRQ request
  ARM: at91/tclib: mask interruptions at shutdown and probe
  ARM: at91/tclib: move initialization from alloc to probe
  ARM: at91/tclib: prefer using of devm_* functions
  ARM: clps711x: Switch CLPS711X subarch to use clk and clocksource driver
  ARM: shmobile: r8a7791 is now called "R-Car M2-W"
  ...
parents 4a4743e8 05301fe7

arch/arm/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -650,6 +650,7 @@ config ARCH_SHMOBILE_LEGACY 
	select ARCH_SHMOBILE

	select ARM_PATCH_PHYS_VIRT if MMU

	select CLKDEV_LOOKUP

	select CPU_V7

	select GENERIC_CLOCKEVENTS

	select HAVE_ARM_SCU if SMP

	select HAVE_ARM_TWD if SMP
@@ -660,6 +661,7 @@ config ARCH_SHMOBILE_LEGACY 
	select NO_IOPORT_MAP

	select PINCTRL

	select PM_GENERIC_DOMAINS if PM

	select SH_CLK_CPG

	select SPARSE_IRQ

	help

	  Support for Renesas ARM SoC platforms using a non-multiplatform

arch/arm/boot/dts/vf610-twr.dts

+0 −1
Original line number Diff line number Diff line
@@ -76,7 +76,6 @@ 


		simple-audio-card,cpu {

			sound-dai = <&sai2>;

			master-clkdir-out;

			frame-master;

			bitclock-master;

		};

arch/arm/configs/imx_v4_v5_defconfig

+0 −5
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ CONFIG_ARCH_MULTI_V5=y 
# CONFIG_ARCH_MULTI_V7 is not set

CONFIG_ARCH_MXC=y

CONFIG_MXC_IRQ_PRIOR=y

CONFIG_ARCH_MX1ADS=y

CONFIG_MACH_SCB9328=y

CONFIG_MACH_APF9328=y

CONFIG_MACH_MX21ADS=y
@@ -30,10 +29,6 @@ CONFIG_MACH_MX25_3DS=y 
CONFIG_MACH_EUKREA_CPUIMX25SD=y

CONFIG_MACH_IMX25_DT=y

CONFIG_MACH_MX27ADS=y

CONFIG_MACH_PCM038=y

CONFIG_MACH_CPUIMX27=y

CONFIG_MACH_EUKREA_CPUIMX27_USESDHC2=y

CONFIG_MACH_EUKREA_CPUIMX27_USEUART4=y

CONFIG_MACH_MX27_3DS=y

CONFIG_MACH_IMX27_VISSTRIM_M10=y

CONFIG_MACH_PCA100=y

arch/arm/mach-at91/Kconfig

+9 −8
Original line number Diff line number Diff line
@@ -28,6 +28,11 @@ config OLD_CLK_AT91 
	bool

	default AT91_PMC_UNIT && AT91_USE_OLD_CLK



config OLD_IRQ_AT91

	bool

	select MULTI_IRQ_HANDLER

	select SPARSE_IRQ



config AT91_SAM9_ALT_RESET

	bool

	default !ARCH_AT91X40
@@ -45,18 +50,16 @@ config HAVE_AT91_SMD 
config SOC_AT91SAM9

	bool

	select AT91_SAM9_TIME

	select ATMEL_AIC_IRQ if !OLD_IRQ_AT91

	select CPU_ARM926T

	select GENERIC_CLOCKEVENTS

	select MULTI_IRQ_HANDLER

	select SPARSE_IRQ



config SOC_SAMA5

	bool

	select AT91_SAM9_TIME

	select ATMEL_AIC5_IRQ

	select CPU_V7

	select GENERIC_CLOCKEVENTS

	select MULTI_IRQ_HANDLER

	select SPARSE_IRQ

	select USE_OF



menu "Atmel AT91 System-on-Chip"
@@ -70,8 +73,7 @@ config ARCH_AT91X40 
	depends on !MMU

	select CPU_ARM7TDMI

	select ARCH_USES_GETTIMEOFFSET

	select MULTI_IRQ_HANDLER

	select SPARSE_IRQ

	select OLD_IRQ_AT91



	help

	  Select this if you are using one of Atmel's AT91X40 SoC.
@@ -108,11 +110,10 @@ endif 
if SOC_SAM_V4_V5

config SOC_AT91RM9200

	bool "AT91RM9200"

	select ATMEL_AIC_IRQ if !OLD_IRQ_AT91

	select CPU_ARM920T

	select GENERIC_CLOCKEVENTS

	select HAVE_AT91_DBGU0

	select MULTI_IRQ_HANDLER

	select SPARSE_IRQ

	select HAVE_AT91_USB_CLK



config SOC_AT91SAM9260

arch/arm/mach-at91/Kconfig.non_dt

+6 −12
Original line number Diff line number Diff line
@@ -14,31 +14,37 @@ config ARCH_AT91RM9200 
	bool "AT91RM9200"

	select SOC_AT91RM9200

	select AT91_USE_OLD_CLK

	select OLD_IRQ_AT91



config ARCH_AT91SAM9260

	bool "AT91SAM9260 or AT91SAM9XE or AT91SAM9G20"

	select SOC_AT91SAM9260

	select AT91_USE_OLD_CLK

	select OLD_IRQ_AT91



config ARCH_AT91SAM9261

	bool "AT91SAM9261 or AT91SAM9G10"

	select SOC_AT91SAM9261

	select AT91_USE_OLD_CLK

	select OLD_IRQ_AT91



config ARCH_AT91SAM9263

	bool "AT91SAM9263"

	select SOC_AT91SAM9263

	select AT91_USE_OLD_CLK

	select OLD_IRQ_AT91



config ARCH_AT91SAM9RL

	bool "AT91SAM9RL"

	select SOC_AT91SAM9RL

	select AT91_USE_OLD_CLK

	select OLD_IRQ_AT91



config ARCH_AT91SAM9G45

	bool "AT91SAM9G45"

	select SOC_AT91SAM9G45

	select AT91_USE_OLD_CLK

	select OLD_IRQ_AT91



endchoice
@@ -132,12 +138,6 @@ config MACH_ECO920 
	bool "eco920"

	help

	  Select this if you are using the eco920 board



config MACH_RSI_EWS

	bool "RSI Embedded Webserver"

	depends on ARCH_AT91RM9200

	help

	  Select this if you are using RSIs EWS board.

endif



# ----------------------------------------------------------
@@ -212,12 +212,6 @@ config MACH_CPU9G20 
	  Select this if you are using a Eukrea Electromatique's

	  CPU9G20 Board <http://www.eukrea.com/>



config MACH_ACMENETUSFOXG20

	bool "Acme Systems srl FOX Board G20"

	help

	  Select this if you are using Acme Systems

	  FOX Board G20 <http://www.acmesystems.it>



config MACH_PORTUXG20

	bool "taskit PortuxG20"

	help