Merge tag 'imx-cleanup-3.9' into imx6q-cpuidle (1d7180e2) · Commits · e / devices / android_kernel_fairphone_FP5

arch/arm/Kconfig.debug

+5 −5

Original line number	Original line	Diff line number	Diff line
	@@ -219,12 +219,12 @@ choice
	Say Y here if you want kernel low-level debugging support		Say Y here if you want kernel low-level debugging support
	on i.MX51.		on i.MX51.

	config DEBUG_IMX50_IMX53_UART		config DEBUG_IMX53_UART
	bool "i.MX50 and i.MX53 Debug UART"		bool "i.MX53 Debug UART"
	depends on SOC_IMX50 \|\| SOC_IMX53		depends on SOC_IMX53
	help		help
	Say Y here if you want kernel low-level debugging support		Say Y here if you want kernel low-level debugging support
	on i.MX50 or i.MX53.		on i.MX53.

	config DEBUG_IMX6Q_UART		config DEBUG_IMX6Q_UART
	bool "i.MX6Q Debug UART"		bool "i.MX6Q Debug UART"
	@@ -497,7 +497,7 @@ config DEBUG_LL_INCLUDE
	DEBUG_IMX21_IMX27_UART \|\| \		DEBUG_IMX21_IMX27_UART \|\| \
	DEBUG_IMX31_IMX35_UART \|\| \		DEBUG_IMX31_IMX35_UART \|\| \
	DEBUG_IMX51_UART \|\| \		DEBUG_IMX51_UART \|\| \
	DEBUG_IMX50_IMX53_UART \|\|\		DEBUG_IMX53_UART \|\|\
	DEBUG_IMX6Q_UART		DEBUG_IMX6Q_UART
	default "debug/highbank.S" if DEBUG_HIGHBANK_UART		default "debug/highbank.S" if DEBUG_HIGHBANK_UART
	default "debug/mvebu.S" if DEBUG_MVEBU_UART		default "debug/mvebu.S" if DEBUG_MVEBU_UART

arch/arm/configs/imx_v6_v7_defconfig

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -32,7 +32,6 @@ CONFIG_MACH_PCM043=y
	CONFIG_MACH_MX35_3DS=y		CONFIG_MACH_MX35_3DS=y
	CONFIG_MACH_VPR200=y		CONFIG_MACH_VPR200=y
	CONFIG_MACH_IMX51_DT=y		CONFIG_MACH_IMX51_DT=y
	CONFIG_MACH_MX51_3DS=y
	CONFIG_MACH_EUKREA_CPUIMX51SD=y		CONFIG_MACH_EUKREA_CPUIMX51SD=y
	CONFIG_SOC_IMX53=y		CONFIG_SOC_IMX53=y
	CONFIG_SOC_IMX6Q=y		CONFIG_SOC_IMX6Q=y

arch/arm/include/debug/imx.S

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -34,7 +34,7 @@
	#define UART_PADDR 0x43f90000		#define UART_PADDR 0x43f90000
	#elif defined (CONFIG_DEBUG_IMX51_UART)		#elif defined (CONFIG_DEBUG_IMX51_UART)
	#define UART_PADDR 0x73fbc000		#define UART_PADDR 0x73fbc000
	#elif defined (CONFIG_DEBUG_IMX50_IMX53_UART)		#elif defined (CONFIG_DEBUG_IMX53_UART)
	#define UART_PADDR 0x53fbc000		#define UART_PADDR 0x53fbc000
	#elif defined (CONFIG_DEBUG_IMX6Q_UART)		#elif defined (CONFIG_DEBUG_IMX6Q_UART)
	#define UART_PADDR IMX6Q_DEBUG_UART_BASE		#define UART_PADDR IMX6Q_DEBUG_UART_BASE

arch/arm/mach-imx/Kconfig

+0 −36

Original line number	Original line	Diff line number	Diff line
	@@ -95,9 +95,6 @@ config MACH_MX27
	config ARCH_MX5		config ARCH_MX5
	bool		bool

	config ARCH_MX50
	bool

	config ARCH_MX51		config ARCH_MX51
	bool		bool

	@@ -164,11 +161,6 @@ config SOC_IMX5
	select CPU_V7		select CPU_V7
	select MXC_TZIC		select MXC_TZIC

	config SOC_IMX50
	bool
	select ARCH_MX50
	select SOC_IMX5

	config SOC_IMX51		config SOC_IMX51
	bool		bool
	select ARCH_MX5		select ARCH_MX5
	@@ -738,25 +730,10 @@ endif

	if ARCH_MULTI_V7		if ARCH_MULTI_V7

	comment "i.MX5 platforms:"

	config MACH_MX50_RDP
	bool "Support MX50 reference design platform"
	depends on BROKEN
	select IMX_HAVE_PLATFORM_IMX_I2C
	select IMX_HAVE_PLATFORM_IMX_UART
	select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX
	select IMX_HAVE_PLATFORM_SPI_IMX
	select SOC_IMX50
	help
	Include support for MX50 reference design platform (RDP) board. This
	includes specific configurations for the board and its peripherals.

	comment "i.MX51 machines:"		comment "i.MX51 machines:"

	config MACH_IMX51_DT		config MACH_IMX51_DT
	bool "Support i.MX51 platforms from device tree"		bool "Support i.MX51 platforms from device tree"
	select MACH_MX51_BABBAGE
	select SOC_IMX51		select SOC_IMX51
	help		help
	Include support for Freescale i.MX51 based platforms		Include support for Freescale i.MX51 based platforms
	@@ -777,19 +754,6 @@ config MACH_MX51_BABBAGE
	u-boot. This includes specific configurations for the board and its		u-boot. This includes specific configurations for the board and its
	peripherals.		peripherals.

	config MACH_MX51_3DS
	bool "Support MX51PDK (3DS)"
	select IMX_HAVE_PLATFORM_IMX2_WDT
	select IMX_HAVE_PLATFORM_IMX_KEYPAD
	select IMX_HAVE_PLATFORM_IMX_UART
	select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX
	select IMX_HAVE_PLATFORM_SPI_IMX
	select MXC_DEBUG_BOARD
	select SOC_IMX51
	help
	Include support for MX51PDK (3DS) platform. This includes specific
	configurations for the board and its peripherals.

	config MACH_EUKREA_CPUIMX51SD		config MACH_EUKREA_CPUIMX51SD
	bool "Support Eukrea CPUIMX51SD module"		bool "Support Eukrea CPUIMX51SD module"
	select IMX_HAVE_PLATFORM_FSL_USB2_UDC		select IMX_HAVE_PLATFORM_FSL_USB2_UDC

arch/arm/mach-imx/Makefile

+0 −3

Original line number	Original line	Diff line number	Diff line
	@@ -88,7 +88,6 @@ obj-$(CONFIG_MACH_EUKREA_CPUIMX35SD) += mach-cpuimx35.o
	obj-$(CONFIG_MACH_EUKREA_MBIMXSD35_BASEBOARD) += eukrea_mbimxsd35-baseboard.o		obj-$(CONFIG_MACH_EUKREA_MBIMXSD35_BASEBOARD) += eukrea_mbimxsd35-baseboard.o
	obj-$(CONFIG_MACH_VPR200) += mach-vpr200.o		obj-$(CONFIG_MACH_VPR200) += mach-vpr200.o

	obj-$(CONFIG_DEBUG_LL) += lluart.o
	obj-$(CONFIG_HAVE_IMX_GPC) += gpc.o		obj-$(CONFIG_HAVE_IMX_GPC) += gpc.o
	obj-$(CONFIG_HAVE_IMX_MMDC) += mmdc.o		obj-$(CONFIG_HAVE_IMX_MMDC) += mmdc.o
	obj-$(CONFIG_HAVE_IMX_SRC) += src.o		obj-$(CONFIG_HAVE_IMX_SRC) += src.o
	@@ -103,10 +102,8 @@ endif

	# i.MX5 based machines		# i.MX5 based machines
	obj-$(CONFIG_MACH_MX51_BABBAGE) += mach-mx51_babbage.o		obj-$(CONFIG_MACH_MX51_BABBAGE) += mach-mx51_babbage.o
	obj-$(CONFIG_MACH_MX51_3DS) += mach-mx51_3ds.o
	obj-$(CONFIG_MACH_EUKREA_CPUIMX51SD) += mach-cpuimx51sd.o		obj-$(CONFIG_MACH_EUKREA_CPUIMX51SD) += mach-cpuimx51sd.o
	obj-$(CONFIG_MACH_EUKREA_MBIMXSD51_BASEBOARD) += eukrea_mbimxsd51-baseboard.o		obj-$(CONFIG_MACH_EUKREA_MBIMXSD51_BASEBOARD) += eukrea_mbimxsd51-baseboard.o
	obj-$(CONFIG_MACH_MX50_RDP) += mach-mx50_rdp.o

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