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

Commit ca4e419c authored by Sascha Hauer's avatar Sascha Hauer
Browse files

Merge branches 'features/assorted', 'features/imx-pata' and... 


Merge branches 'features/assorted', 'features/imx-pata' and 'features/imx-multi-irq-v2' into imx-features

Conflicts:
	arch/arm/plat-mxc/avic.c
	arch/arm/plat-mxc/include/mach/common.h

Signed-off-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
parents e93aabb5 6132ae81 318007e9 05822c83

arch/arm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -397,6 +397,7 @@ config ARCH_MXC 
	select CLKSRC_MMIO

	select GENERIC_IRQ_CHIP

	select HAVE_SCHED_CLOCK

	select MULTI_IRQ_HANDLER

	help

	  Support for Freescale MXC/iMX-based family of processors

arch/arm/mach-imx/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -470,6 +470,7 @@ config MACH_QONG 
	bool "Support Dave/DENX QongEVB-LITE platform"

	select SOC_IMX31

	select IMX_HAVE_PLATFORM_IMX_UART

	select IMX_HAVE_PLATFORM_IMX2_WDT

	help

	  Include support for Dave/DENX QongEVB-LITE platform. This includes

	  specific configurations for the board and its peripherals.

arch/arm/mach-imx/mach-apf9328.c

+1 −0
Original line number Diff line number Diff line
@@ -136,6 +136,7 @@ MACHINE_START(APF9328, "Armadeus APF9328") 
	.map_io       = mx1_map_io,

	.init_early   = imx1_init_early,

	.init_irq     = mx1_init_irq,

	.handle_irq   = imx1_handle_irq,

	.timer        = &apf9328_timer,

	.init_machine = apf9328_init,

MACHINE_END

arch/arm/mach-imx/mach-armadillo5x0.c

+1 −0
Original line number Diff line number Diff line
@@ -562,6 +562,7 @@ MACHINE_START(ARMADILLO5X0, "Armadillo-500") 
	.map_io = mx31_map_io,

	.init_early = imx31_init_early,

	.init_irq = mx31_init_irq,

	.handle_irq = imx31_handle_irq,

	.timer = &armadillo5x0_timer,

	.init_machine = armadillo5x0_init,

MACHINE_END

arch/arm/mach-imx/mach-bug.c

+1 −0
Original line number Diff line number Diff line
@@ -62,6 +62,7 @@ MACHINE_START(BUG, "BugLabs BUGBase") 
	.map_io = mx31_map_io,

	.init_early = imx31_init_early,

	.init_irq = mx31_init_irq,

	.handle_irq = imx31_handle_irq,

	.timer = &bug_timer,

	.init_machine = bug_board_init,

MACHINE_END