Commit ac0b2092 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'omap-for-v4.2/omap1-v2' of... 

Merge tag 'omap-for-v4.2/omap1-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/soc

Merge fixed up omap1 sparse irq support for v4.2 from Tony Lindgren:

Add support for CONFIG_SPARSE_IRQ for omap1. This takes us a bit closer
to making omap1 support multiarch. After this series we still need to
make omap1 use the common clock framework and fix up the drivers to not
rely on includes from mach and plat directories.

Note that this branch depends on a GPIO driver fix in v4.1-rc3
d2d05c65 ("gpio: omap: Fix regression for MPUIO interrupts").

* tag 'omap-for-v4.2/omap1-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: OMAP1: Fix section mismatch warnings for omap_cfg_reg
  ARM: OMAP1: Fix randconfig builds if ARCH_OMAP15XX not selected
  ARM: OMAP1: Change interrupt numbering for sparse IRQ
  ARM: omap1: Switch to use MULTI_IRQ
  ARM: OMAP1: Switch to use generic irqchip in preparation for sparse IRQ
  ARM: OMAP1: Move UART defines to prepare for sparse IRQ
parents a4526915 7bf15c43

arch/arm/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -786,8 +786,10 @@ config ARCH_OMAP1 
	select GENERIC_IRQ_CHIP

	select HAVE_IDE

	select IRQ_DOMAIN

	select MULTI_IRQ_HANDLER

	select NEED_MACH_IO_H if PCCARD

	select NEED_MACH_MEMORY_H

	select SPARSE_IRQ

	help

	  Support for older TI OMAP1 (omap7xx, omap15xx or omap16xx)

arch/arm/mach-omap1/ams-delta-fiq-handler.S

+1 −2
Original line number Diff line number Diff line
@@ -17,11 +17,10 @@ 
#include <asm/assembler.h>



#include <mach/board-ams-delta.h>



#include <mach/irqs.h>

#include <mach/ams-delta-fiq.h>



#include "iomap.h"

#include "soc.h"



/*

 * GPIO related definitions, copied from arch/arm/plat-omap/gpio.c.

arch/arm/mach-omap1/board-ams-delta.c

+1 −0
Original line number Diff line number Diff line
@@ -626,6 +626,7 @@ MACHINE_START(AMS_DELTA, "Amstrad E3 (Delta)") 
	.map_io		= ams_delta_map_io,

	.init_early	= omap1_init_early,

	.init_irq	= omap1_init_irq,

	.handle_irq	= omap1_handle_irq,

	.init_machine	= ams_delta_init,

	.init_late	= ams_delta_init_late,

	.init_time	= omap1_timer_init,

arch/arm/mach-omap1/board-fsample.c

+1 −0
Original line number Diff line number Diff line
@@ -362,6 +362,7 @@ MACHINE_START(OMAP_FSAMPLE, "OMAP730 F-Sample") 
	.map_io		= omap_fsample_map_io,

	.init_early	= omap1_init_early,

	.init_irq	= omap1_init_irq,

	.handle_irq	= omap1_handle_irq,

	.init_machine	= omap_fsample_init,

	.init_late	= omap1_init_late,

	.init_time	= omap1_timer_init,

arch/arm/mach-omap1/board-generic.c

+1 −0
Original line number Diff line number Diff line
@@ -82,6 +82,7 @@ MACHINE_START(OMAP_GENERIC, "Generic OMAP1510/1610/1710") 
	.map_io		= omap16xx_map_io,

	.init_early	= omap1_init_early,

	.init_irq	= omap1_init_irq,

	.handle_irq	= omap1_handle_irq,

	.init_machine	= omap_generic_init,

	.init_late	= omap1_init_late,

	.init_time	= omap1_timer_init,

CRA Git | Maintained and supported by SUSTech CRA and CCSE