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

Commit 372b1c32 authored by Alistair Buxton's avatar Alistair Buxton
Browse files

OMAP7XX: Replace omap730 references in irqs.h and all users 



This patch is part of a series which removes references to omap730 in code
which is shared with omap850, replacing them with references to omap7xx.

Turns INT_730_* to INT_7XX_* for definitions in irqs.h and all users.

Signed-off-by: default avatarAlistair Buxton <a.j.buxton@gmail.com>
Reviewed-by: default avatarZebediah C. McClure <zmc@lurian.net>
parent b51988db

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

+3 −3
Original line number Original line Diff line number Diff line
@@ -107,7 +107,7 @@ static struct resource smc91x_resources[] = { 
		.flags	= IORESOURCE_MEM,

		.flags	= IORESOURCE_MEM,

	},

	},

	[1] = {

	[1] = {

		.start	= INT_730_MPU_EXT_NIRQ,

		.start	= INT_7XX_MPU_EXT_NIRQ,

		.end	= 0,

		.end	= 0,

		.flags	= IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE,

		.flags	= IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE,

	},

	},
@@ -196,8 +196,8 @@ static struct platform_device smc91x_device = { 




static struct resource kp_resources[] = {

static struct resource kp_resources[] = {

	[0] = {

	[0] = {

		.start	= INT_730_MPUIO_KEYPAD,

		.start	= INT_7XX_MPUIO_KEYPAD,

		.end	= INT_730_MPUIO_KEYPAD,

		.end	= INT_7XX_MPUIO_KEYPAD,

		.flags	= IORESOURCE_IRQ,

		.flags	= IORESOURCE_IRQ,

	},

	},

};

};

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

+3 −3
Original line number Original line Diff line number Diff line
@@ -74,7 +74,7 @@ static struct resource smc91x_resources[] = { 
		.flags	= IORESOURCE_MEM,

		.flags	= IORESOURCE_MEM,

	},

	},

	[1] = {

	[1] = {

		.start	= INT_730_MPU_EXT_NIRQ,

		.start	= INT_7XX_MPU_EXT_NIRQ,

		.end	= 0,

		.end	= 0,

		.flags	= IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE,

		.flags	= IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE,

	},

	},
@@ -163,8 +163,8 @@ static struct platform_device smc91x_device = { 




static struct resource kp_resources[] = {

static struct resource kp_resources[] = {

	[0] = {

	[0] = {

		.start	= INT_730_MPUIO_KEYPAD,

		.start	= INT_7XX_MPUIO_KEYPAD,

		.end	= INT_730_MPUIO_KEYPAD,

		.end	= INT_7XX_MPUIO_KEYPAD,

		.flags	= IORESOURCE_IRQ,

		.flags	= IORESOURCE_IRQ,

	},

	},

};

};

arch/arm/mach-omap1/irq.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -234,7 +234,7 @@ void __init omap_init_irq(void) 
	/* Unmask level 2 handler */

	/* Unmask level 2 handler */





	if (cpu_is_omap7xx())

	if (cpu_is_omap7xx())

		omap_unmask_irq(INT_730_IH2_IRQ);

		omap_unmask_irq(INT_7XX_IH2_IRQ);

	else if (cpu_is_omap15xx())

	else if (cpu_is_omap15xx())

		omap_unmask_irq(INT_1510_IH2_IRQ);

		omap_unmask_irq(INT_1510_IH2_IRQ);

	else if (cpu_is_omap16xx())

	else if (cpu_is_omap16xx())

arch/arm/mach-omap1/mcbsp.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -85,16 +85,16 @@ static struct omap_mcbsp_platform_data omap730_mcbsp_pdata[] = { 
		.phys_base	= OMAP730_MCBSP1_BASE,

		.phys_base	= OMAP730_MCBSP1_BASE,

		.dma_rx_sync	= OMAP_DMA_MCBSP1_RX,

		.dma_rx_sync	= OMAP_DMA_MCBSP1_RX,

		.dma_tx_sync	= OMAP_DMA_MCBSP1_TX,

		.dma_tx_sync	= OMAP_DMA_MCBSP1_TX,

		.rx_irq		= INT_730_McBSP1RX,

		.rx_irq		= INT_7XX_McBSP1RX,

		.tx_irq		= INT_730_McBSP1TX,

		.tx_irq		= INT_7XX_McBSP1TX,

		.ops		= &omap1_mcbsp_ops,

		.ops		= &omap1_mcbsp_ops,

	},

	},

	{

	{

		.phys_base	= OMAP730_MCBSP2_BASE,

		.phys_base	= OMAP730_MCBSP2_BASE,

		.dma_rx_sync	= OMAP_DMA_MCBSP3_RX,

		.dma_rx_sync	= OMAP_DMA_MCBSP3_RX,

		.dma_tx_sync	= OMAP_DMA_MCBSP3_TX,

		.dma_tx_sync	= OMAP_DMA_MCBSP3_TX,

		.rx_irq		= INT_730_McBSP2RX,

		.rx_irq		= INT_7XX_McBSP2RX,

		.tx_irq		= INT_730_McBSP2TX,

		.tx_irq		= INT_7XX_McBSP2TX,

		.ops		= &omap1_mcbsp_ops,

		.ops		= &omap1_mcbsp_ops,

	},

	},

};

};

arch/arm/mach-omap1/pm.c

+5 −5
Original line number Original line Diff line number Diff line
@@ -184,8 +184,8 @@ static void omap_pm_wakeup_setup(void) 
	 * wake up to a GPIO interrupt.

	 * wake up to a GPIO interrupt.

	 */

	 */

	if (cpu_is_omap7xx())

	if (cpu_is_omap7xx())

		level1_wake = OMAP_IRQ_BIT(INT_730_GPIO_BANK1) |

		level1_wake = OMAP_IRQ_BIT(INT_7XX_GPIO_BANK1) |

			OMAP_IRQ_BIT(INT_730_IH2_IRQ);

			OMAP_IRQ_BIT(INT_7XX_IH2_IRQ);

	else if (cpu_is_omap15xx())

	else if (cpu_is_omap15xx())

		level1_wake = OMAP_IRQ_BIT(INT_GPIO_BANK1) |

		level1_wake = OMAP_IRQ_BIT(INT_GPIO_BANK1) |

			OMAP_IRQ_BIT(INT_1510_IH2_IRQ);

			OMAP_IRQ_BIT(INT_1510_IH2_IRQ);
@@ -197,8 +197,8 @@ static void omap_pm_wakeup_setup(void) 




	if (cpu_is_omap7xx()) {

	if (cpu_is_omap7xx()) {

		omap_writel(~level2_wake, OMAP_IH2_0_MIR);

		omap_writel(~level2_wake, OMAP_IH2_0_MIR);

		omap_writel(~(OMAP_IRQ_BIT(INT_730_WAKE_UP_REQ) |

		omap_writel(~(OMAP_IRQ_BIT(INT_7XX_WAKE_UP_REQ) |

				OMAP_IRQ_BIT(INT_730_MPUIO_KEYPAD)),

				OMAP_IRQ_BIT(INT_7XX_MPUIO_KEYPAD)),

				OMAP_IH2_1_MIR);

				OMAP_IH2_1_MIR);

	} else if (cpu_is_omap15xx()) {

	} else if (cpu_is_omap15xx()) {

		level2_wake |= OMAP_IRQ_BIT(INT_KEYBOARD);

		level2_wake |= OMAP_IRQ_BIT(INT_KEYBOARD);
@@ -687,7 +687,7 @@ static int __init omap_pm_init(void) 
	pm_idle = omap1_pm_idle;

	pm_idle = omap1_pm_idle;





	if (cpu_is_omap7xx())

	if (cpu_is_omap7xx())

		setup_irq(INT_730_WAKE_UP_REQ, &omap_wakeup_irq);

		setup_irq(INT_7XX_WAKE_UP_REQ, &omap_wakeup_irq);

	else if (cpu_is_omap16xx())

	else if (cpu_is_omap16xx())

		setup_irq(INT_1610_WAKE_UP_REQ, &omap_wakeup_irq);

		setup_irq(INT_1610_WAKE_UP_REQ, &omap_wakeup_irq);