Commit 90793df9 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'imx-cleanup-4.9' of... 

Merge tag 'imx-cleanup-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/cleanup

Pull "i.MX cleanup for 4.9" from Shawn Guo:

 - Drop i.MX1 board files and make i.MX1 a DT only platform.
 - Remove obsolete ENET initialization code for TX28 board, since FEC
   driver handles those setup well now.
 - A couple of cleanups on i.MX31 IOMUX headers to drop duplications
 - A few other random and trivial cleanups

* tag 'imx-cleanup-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  ARM: imx: (trivial) fix typo and grammar
  ARM: imx: use IS_ENABLED() instead of checking for built-in or module
  ARM: imx: remove platform-mxc_rnga
  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
parents 260caade 3481bdce

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-imx/Kconfig

+12 −38
Original line number Diff line number Diff line
@@ -64,13 +64,6 @@ config IMX_HAVE_IOMUX_V1 
config ARCH_MXC_IOMUX_V3

	bool



config SOC_IMX1

	bool

	select CPU_ARM920T

	select IMX_HAVE_IOMUX_V1

	select MXC_AVIC

	select PINCTRL_IMX1



config SOC_IMX21

	bool

	select CPU_ARM926T
@@ -88,7 +81,6 @@ config SOC_IMX31 
	bool

	select CPU_V6

	select MXC_AVIC

	select SMP_ON_UP if SMP



config SOC_IMX35

	bool
@@ -96,35 +88,6 @@ config SOC_IMX35 
	select HAVE_EPIT

	select MXC_AVIC

	select PINCTRL_IMX35

	select SMP_ON_UP if SMP



if ARCH_MULTI_V4T



comment "MX1 platforms:"



config MACH_SCB9328

	bool "Synertronixx scb9328"

	select IMX_HAVE_PLATFORM_IMX_UART

	select SOC_IMX1

	help

	  Say Y here if you are using a Synertronixx scb9328 board



config MACH_APF9328

	bool "APF9328"

	select IMX_HAVE_PLATFORM_IMX_I2C

	select IMX_HAVE_PLATFORM_IMX_UART

	select SOC_IMX1

	help

	  Say Yes here if you are using the Armadeus APF9328 development board



config MACH_IMX1_DT

	bool "Support i.MX1 platforms from device tree"

	select SOC_IMX1

	help

	  Include support for Freescale i.MX1 based platforms

	  using the device tree for discovery.



endif



if ARCH_MULTI_V5
@@ -461,6 +424,18 @@ endif 


comment "Device tree only"



if ARCH_MULTI_V4T



config SOC_IMX1

	bool "i.MX1 support"

	select CPU_ARM920T

	select MXC_AVIC

	select PINCTRL_IMX1

	help

	  This enables support for Freescale i.MX1 processor



endif



if ARCH_MULTI_V5



config SOC_IMX25
@@ -585,7 +560,6 @@ config SOC_VF610 
	select ARM_GIC if ARCH_MULTI_V7

	select PINCTRL_VF610

	select PL310_ERRATA_769419 if CACHE_L2X0

	select SMP_ON_UP if SMP



	help

	  This enables support for Freescale Vybrid VF610 processor.

arch/arm/mach-imx/Makefile

+1 −6
Original line number Diff line number Diff line 
obj-y := cpu.o system.o irq-common.o



obj-$(CONFIG_SOC_IMX1) += mm-imx1.o

obj-$(CONFIG_SOC_IMX21) += mm-imx21.o



obj-$(CONFIG_SOC_IMX25) += cpu-imx25.o mach-imx25.o pm-imx25.o
@@ -35,11 +34,6 @@ obj-y += ssi-fiq.o 
obj-y += ssi-fiq-ksym.o

endif



# i.MX1 based machines

obj-$(CONFIG_MACH_SCB9328) += mach-scb9328.o

obj-$(CONFIG_MACH_APF9328) += mach-apf9328.o

obj-$(CONFIG_MACH_IMX1_DT) += imx1-dt.o



# i.MX21 based machines

obj-$(CONFIG_MACH_MX21ADS) += mach-mx21ads.o
@@ -93,6 +87,7 @@ obj-$(CONFIG_SOC_IMX53) += suspend-imx53.o 
endif

obj-$(CONFIG_SOC_IMX6) += pm-imx6.o



obj-$(CONFIG_SOC_IMX1) += mach-imx1.o

obj-$(CONFIG_SOC_IMX50) += mach-imx50.o

obj-$(CONFIG_SOC_IMX51) += mach-imx51.o

obj-$(CONFIG_SOC_IMX53) += mach-imx53.o

arch/arm/mach-imx/common.h

+0 −5
Original line number Diff line number Diff line
@@ -21,29 +21,24 @@ struct device_node; 
enum mxc_cpu_pwr_mode;

struct of_device_id;



void mx1_map_io(void);

void mx21_map_io(void);

void mx27_map_io(void);

void mx31_map_io(void);

void mx35_map_io(void);

void imx1_init_early(void);

void imx21_init_early(void);

void imx27_init_early(void);

void imx31_init_early(void);

void imx35_init_early(void);

void mxc_init_irq(void __iomem *);

void mx1_init_irq(void);

void mx21_init_irq(void);

void mx27_init_irq(void);

void mx31_init_irq(void);

void mx35_init_irq(void);

void imx1_soc_init(void);

void imx21_soc_init(void);

void imx27_soc_init(void);

void imx31_soc_init(void);

void imx35_soc_init(void);

void epit_timer_init(void __iomem *base, int irq);

int mx1_clocks_init(unsigned long fref);

int mx21_clocks_init(unsigned long lref, unsigned long fref);

int mx27_clocks_init(unsigned long fref);

int mx31_clocks_init(unsigned long fref);

CRA Git | Maintained and supported by SUSTech CRA and CCSE