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

Commit 7d7e1eba authored by Tony Lindgren's avatar Tony Lindgren
Browse files

ARM: OMAP2+: Prepare for irqs.h removal 



As the interrupts should only be defined in the platform_data, and
eventually coming from device tree, there's no need to define them
in header files.

Let's remove the hardcoded references to irqs.h and fix up the includes
so we don't rely on headers included in irqs.h. Note that we're
defining OMAP_INTC_START as 0 to the interrupts. This will be needed
when we enable SPARSE_IRQ. For some drivers we need to add
#include <plat/cpu.h> for now until these drivers are fixed to
remove cpu_is_omapxxxx() usage.

While at it, sort som of the includes the standard way, and add
the trailing commas where they are missing in the related data
structures.

Note that for drivers/staging/tidspbridge we just define things
locally.

Cc: Paul Walmsley <paul@pwsan.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent aefaf7be

arch/arm/mach-omap2/board-2430sdp.c

+1 −1
Original line number Diff line number Diff line
@@ -231,7 +231,7 @@ static int __init omap2430_i2c_init(void) 
	sdp2430_i2c1_boardinfo[0].irq = gpio_to_irq(78);

	omap_register_i2c_bus(1, 100, sdp2430_i2c1_boardinfo,

			ARRAY_SIZE(sdp2430_i2c1_boardinfo));

	omap_pmic_init(2, 100, "twl4030", INT_24XX_SYS_NIRQ,

	omap_pmic_init(2, 100, "twl4030", 7 + OMAP_INTC_START,

			&sdp2430_twldata);

	return 0;

}

arch/arm/mach-omap2/board-4430sdp.c

+1 −1
Original line number Diff line number Diff line
@@ -579,7 +579,7 @@ static int __init omap4_i2c_init(void) 
			TWL_COMMON_REGULATOR_V1V8 |

			TWL_COMMON_REGULATOR_V2V1);

	omap4_pmic_init("twl6030", &sdp4430_twldata,

			&twl6040_data, OMAP44XX_IRQ_SYS_2N);

			&twl6040_data, 119 + OMAP44XX_IRQ_GIC_START);

	omap_register_i2c_bus(2, 400, NULL, 0);

	omap_register_i2c_bus(3, 400, sdp4430_i2c_3_boardinfo,

				ARRAY_SIZE(sdp4430_i2c_3_boardinfo));

arch/arm/mach-omap2/board-am3517evm.c

+1 −2
Original line number Diff line number Diff line
@@ -296,8 +296,7 @@ static struct resource am3517_hecc_resources[] = { 
		.flags	= IORESOURCE_MEM,

	},

	{

		.start	= INT_35XX_HECC0_IRQ,

		.end	= INT_35XX_HECC0_IRQ,

		.start	= 24 + OMAP_INTC_START,

		.flags	= IORESOURCE_IRQ,

	},

};

arch/arm/mach-omap2/board-cm-t3517.c

+2 −2
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ 
#include <plat/usb.h>

#include <plat/nand.h>

#include <plat/gpmc.h>

#include <plat/serial.h>



#include <mach/am35xx.h>
@@ -89,8 +90,7 @@ static struct resource cm_t3517_hecc_resources[] = { 
		.flags	= IORESOURCE_MEM,

	},

	{

		.start	= INT_35XX_HECC0_IRQ,

		.end	= INT_35XX_HECC0_IRQ,

		.start	= 24 + OMAP_INTC_START,

		.flags	= IORESOURCE_IRQ,

	},

};

arch/arm/mach-omap2/board-flash.c

+1 −1
Original line number Diff line number Diff line
@@ -16,8 +16,8 @@ 
#include <linux/platform_device.h>

#include <linux/mtd/physmap.h>

#include <linux/io.h>

#include <plat/irqs.h>



#include <plat/cpu.h>

#include <plat/gpmc.h>

#include <plat/nand.h>

#include <plat/onenand.h>