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

Commit 5772ca7d authored by Santosh Shilimkar's avatar Santosh Shilimkar Committed by Tony Lindgren
Browse files

omap4: Use irq line defines from irq-44xx.h 



This patch removes all the omap4 specific irq line
defines from plat/irqs.h and includes auto-generated
irqs-44xx.h
All the legacy naming style defines are replaced with the one
from irqs-44xx.h

Signed-off-by: default avatarSantosh Shilimkar <santosh.shilimkar@ti.com>
Reviewed-by: default avatarKevin Hilman <khilman@deeprootsystems.com>
Reviewed-by: default avatarPaul Walmsley <paul@pwsan.com>
[tony@atomide.com: updated to compile with usb-musb.c]
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent a99db248

arch/arm/mach-omap2/devices.c

+4 −4
Original line number Diff line number Diff line
@@ -191,7 +191,7 @@ static struct resource omap4_mbox_resources[] = { 
		.flags          = IORESOURCE_MEM,

	},

	{

		.start          = INT_44XX_MAIL_U0_MPU,

		.start          = OMAP44XX_IRQ_MAIL_U0,

		.flags          = IORESOURCE_IRQ,

	},

};
@@ -720,13 +720,13 @@ void __init omap2_init_mmc(struct omap_mmc_platform_data **mmc_data, 
			if (!cpu_is_omap44xx())

				return;

			base = OMAP4_MMC4_BASE + OMAP4_MMC_REG_OFFSET;

			irq = INT_44XX_MMC4_IRQ;

			irq = OMAP44XX_IRQ_MMC4;

			break;

		case 4:

			if (!cpu_is_omap44xx())

				return;

			base = OMAP4_MMC5_BASE + OMAP4_MMC_REG_OFFSET;

			irq = INT_44XX_MMC5_IRQ;

			irq = OMAP44XX_IRQ_MMC4;

			break;

		default:

			continue;
@@ -738,7 +738,7 @@ void __init omap2_init_mmc(struct omap_mmc_platform_data **mmc_data, 
		} else if (cpu_is_omap44xx()) {

			if (i < 3) {

				base += OMAP4_MMC_REG_OFFSET;

				irq += IRQ_GIC_START;

				irq += OMAP44XX_IRQ_GIC_START;

			}

			size = OMAP4_HSMMC_SIZE;

			name = "mmci-omap-hs";

arch/arm/mach-omap2/timer-mpu.c

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ 
 */

void __cpuinit local_timer_setup(struct clock_event_device *evt)

{

	evt->irq = INT_44XX_LOCALTIMER_IRQ;

	evt->irq = OMAP44XX_IRQ_LOCALTIMER;

	twd_timer_setup(evt);

}

arch/arm/mach-omap2/usb-musb.c

+2 −2
Original line number Diff line number Diff line
@@ -94,8 +94,8 @@ void __init usb_musb_init(struct omap_musb_board_data *board_data) 
		musb_resources[0].start = OMAP34XX_HSUSB_OTG_BASE;

	} else if (cpu_is_omap44xx()) {

		musb_resources[0].start = OMAP44XX_HSUSB_OTG_BASE;

		musb_resources[1].start = INT_44XX_HS_USB_MC;

		musb_resources[2].start = INT_44XX_HS_USB_DMA;

		musb_resources[1].start = OMAP44XX_IRQ_HS_USB_MC_N;

		musb_resources[2].start = OMAP44XX_IRQ_HS_USB_DMA_N;

	}

	musb_resources[0].end = musb_resources[0].start + SZ_4K - 1;

arch/arm/plat-omap/devices.c

+2 −2
Original line number Diff line number Diff line
@@ -205,8 +205,8 @@ static struct resource mcpdm_resources[] = { 
	},

	{

		.name		= "mcpdm_irq",

		.start		= INT_44XX_MCPDM_IRQ,

		.end		= INT_44XX_MCPDM_IRQ,

		.start		= OMAP44XX_IRQ_MCPDM,

		.end		= OMAP44XX_IRQ_MCPDM,

		.flags		= IORESOURCE_IRQ,

	},

};

arch/arm/plat-omap/dma.c

+1 −1
Original line number Diff line number Diff line
@@ -2132,7 +2132,7 @@ static int __init omap_init_dma(void) 
	if (cpu_class_is_omap2()) {

		int irq;

		if (cpu_is_omap44xx())

			irq = INT_44XX_SDMA_IRQ0;

			irq = OMAP44XX_IRQ_SDMA_0;

		else

			irq = INT_24XX_SDMA_IRQ0;

		setup_irq(irq, &omap24xx_dma_irq);