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

Commit 4a9226a3 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'imx/cpuidle' into late/dt 



This resolves one non-obvious merge conflict between the imx cpuidle
patches and the imx DT changes for 3.9.

Conflicts:
	arch/arm/mach-imx/mach-imx6q.c

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 7839c281 e5f9dec8

arch/arm/Kconfig.debug

+5 −5
Original line number Diff line number Diff line
@@ -219,12 +219,12 @@ choice 
		  Say Y here if you want kernel low-level debugging support

		  on i.MX51.



	config DEBUG_IMX50_IMX53_UART

		bool "i.MX50 and i.MX53 Debug UART"

		depends on SOC_IMX50 || SOC_IMX53

	config DEBUG_IMX53_UART

		bool "i.MX53 Debug UART"

		depends on SOC_IMX53

		help

		  Say Y here if you want kernel low-level debugging support

		  on i.MX50 or i.MX53.

		  on i.MX53.



	config DEBUG_IMX6Q_UART

		bool "i.MX6Q Debug UART"
@@ -497,7 +497,7 @@ config DEBUG_LL_INCLUDE 
				 DEBUG_IMX21_IMX27_UART || \

				 DEBUG_IMX31_IMX35_UART || \

				 DEBUG_IMX51_UART || \

				 DEBUG_IMX50_IMX53_UART ||\

				 DEBUG_IMX53_UART ||\

				 DEBUG_IMX6Q_UART

	default "debug/highbank.S" if DEBUG_HIGHBANK_UART

	default "debug/mvebu.S" if DEBUG_MVEBU_UART

arch/arm/configs/imx_v6_v7_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ CONFIG_MACH_PCM043=y 
CONFIG_MACH_MX35_3DS=y

CONFIG_MACH_VPR200=y

CONFIG_MACH_IMX51_DT=y

CONFIG_MACH_MX51_3DS=y

CONFIG_MACH_EUKREA_CPUIMX51SD=y

CONFIG_SOC_IMX53=y

CONFIG_SOC_IMX6Q=y

arch/arm/include/debug/imx.S

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ 
#define UART_PADDR	0x43f90000

#elif defined (CONFIG_DEBUG_IMX51_UART)

#define UART_PADDR	0x73fbc000

#elif defined (CONFIG_DEBUG_IMX50_IMX53_UART)

#elif defined (CONFIG_DEBUG_IMX53_UART)

#define UART_PADDR	0x53fbc000

#elif defined (CONFIG_DEBUG_IMX6Q_UART)

#define UART_PADDR	IMX6Q_DEBUG_UART_BASE

arch/arm/mach-imx/Kconfig

+0 −36
Original line number Diff line number Diff line
@@ -95,9 +95,6 @@ config MACH_MX27 
config ARCH_MX5

	bool



config ARCH_MX50

	bool



config ARCH_MX51

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

	select MXC_TZIC



config SOC_IMX50

	bool

	select ARCH_MX50

	select SOC_IMX5



config	SOC_IMX51

	bool

	select ARCH_MX5
@@ -738,25 +730,10 @@ endif 


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:"



config MACH_IMX51_DT

	bool "Support i.MX51 platforms from device tree"

	select MACH_MX51_BABBAGE

	select SOC_IMX51

	help

	  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

	  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

	bool "Support Eukrea CPUIMX51SD module"

	select IMX_HAVE_PLATFORM_FSL_USB2_UDC

arch/arm/mach-imx/Makefile

+5 −4
Original line number Diff line number Diff line
@@ -28,7 +28,11 @@ obj-$(CONFIG_MXC_ULPI) += ulpi.o 
obj-$(CONFIG_MXC_USE_EPIT) += epit.o

obj-$(CONFIG_MXC_DEBUG_BOARD) += 3ds_debugboard.o

obj-$(CONFIG_CPU_FREQ_IMX)    += cpufreq.o

obj-$(CONFIG_CPU_IDLE) += cpuidle.o



ifeq ($(CONFIG_CPU_IDLE),y)

obj-y += cpuidle.o

obj-$(CONFIG_SOC_IMX6Q) += cpuidle-imx6q.o

endif



ifdef CONFIG_SND_IMX_SOC

obj-y += ssi-fiq.o
@@ -88,7 +92,6 @@ obj-$(CONFIG_MACH_EUKREA_CPUIMX35SD) += mach-cpuimx35.o 
obj-$(CONFIG_MACH_EUKREA_MBIMXSD35_BASEBOARD) += eukrea_mbimxsd35-baseboard.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_MMDC) += mmdc.o

obj-$(CONFIG_HAVE_IMX_SRC) += src.o
@@ -103,10 +106,8 @@ endif 


# i.MX5 based machines

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_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_SOC_IMX53) += mach-imx53.o