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

Commit a98ca73e authored by Bartosz Golaszewski's avatar Bartosz Golaszewski Committed by Sekhar Nori
Browse files

ARM: davinci: wrap HW interrupt numbers with a macro 



Once we select SPARSE_IRQ, the interrupt numbers defined in mach/irqs.h
will only signify the hardware interrupt offsets, not the interrupt
numbers seen by linux. Introduce a wrapper macro that translates the
hwirq number to virtual numbers. For now it's just a dummy. Use that
macro when specifying the interrupts in resources for platform devices.

Reviewed-by: default avatarDavid Lechner <david@lechnology.com>
Signed-off-by: default avatarBartosz Golaszewski <bgolaszewski@baylibre.com>
Signed-off-by: default avatarSekhar Nori <nsekhar@ti.com>
parent fb746842

arch/arm/mach-davinci/asp.h

+4 −4
Original line number Diff line number Diff line
@@ -49,9 +49,9 @@ 
#define DAVINCI_DA830_DMA_MCASP2_AXEVT	5



/* Interrupts */

#define DAVINCI_ASP0_RX_INT	IRQ_MBRINT

#define DAVINCI_ASP0_TX_INT	IRQ_MBXINT

#define DAVINCI_ASP1_RX_INT	IRQ_MBRINT

#define DAVINCI_ASP1_TX_INT	IRQ_MBXINT

#define DAVINCI_ASP0_RX_INT	DAVINCI_INTC_IRQ(IRQ_MBRINT)

#define DAVINCI_ASP0_TX_INT	DAVINCI_INTC_IRQ(IRQ_MBXINT)

#define DAVINCI_ASP1_RX_INT	DAVINCI_INTC_IRQ(IRQ_MBRINT)

#define DAVINCI_ASP1_TX_INT	DAVINCI_INTC_IRQ(IRQ_MBXINT)



#endif /* __ASM_ARCH_DAVINCI_ASP_H */

arch/arm/mach-davinci/da830.c

+6 −6
Original line number Diff line number Diff line
@@ -772,17 +772,17 @@ int __init da830_register_gpio(void) 
static struct davinci_timer_instance da830_timer_instance[2] = {

	{

		.base		= DA8XX_TIMER64P0_BASE,

		.bottom_irq	= IRQ_DA8XX_TINT12_0,

		.top_irq	= IRQ_DA8XX_TINT34_0,

		.bottom_irq	= DAVINCI_INTC_IRQ(IRQ_DA8XX_TINT12_0),

		.top_irq	= DAVINCI_INTC_IRQ(IRQ_DA8XX_TINT34_0),

		.cmp_off	= DA830_CMP12_0,

		.cmp_irq	= IRQ_DA830_T12CMPINT0_0,

		.cmp_irq	= DAVINCI_INTC_IRQ(IRQ_DA830_T12CMPINT0_0),

	},

	{

		.base		= DA8XX_TIMER64P1_BASE,

		.bottom_irq	= IRQ_DA8XX_TINT12_1,

		.top_irq	= IRQ_DA8XX_TINT34_1,

		.bottom_irq	= DAVINCI_INTC_IRQ(IRQ_DA8XX_TINT12_1),

		.top_irq	= DAVINCI_INTC_IRQ(IRQ_DA8XX_TINT34_1),

		.cmp_off	= DA830_CMP12_0,

		.cmp_irq	= IRQ_DA830_T12CMPINT0_1,

		.cmp_irq	= DAVINCI_INTC_IRQ(IRQ_DA830_T12CMPINT0_1),

	},

};

arch/arm/mach-davinci/da850.c

+14 −14
Original line number Diff line number Diff line
@@ -439,23 +439,23 @@ static struct davinci_id da850_ids[] = { 
static struct davinci_timer_instance da850_timer_instance[4] = {

	{

		.base		= DA8XX_TIMER64P0_BASE,

		.bottom_irq	= IRQ_DA8XX_TINT12_0,

		.top_irq	= IRQ_DA8XX_TINT34_0,

		.bottom_irq	= DAVINCI_INTC_IRQ(IRQ_DA8XX_TINT12_0),

		.top_irq	= DAVINCI_INTC_IRQ(IRQ_DA8XX_TINT34_0),

	},

	{

		.base		= DA8XX_TIMER64P1_BASE,

		.bottom_irq	= IRQ_DA8XX_TINT12_1,

		.top_irq	= IRQ_DA8XX_TINT34_1,

		.bottom_irq	= DAVINCI_INTC_IRQ(IRQ_DA8XX_TINT12_1),

		.top_irq	= DAVINCI_INTC_IRQ(IRQ_DA8XX_TINT34_1),

	},

	{

		.base		= DA850_TIMER64P2_BASE,

		.bottom_irq	= IRQ_DA850_TINT12_2,

		.top_irq	= IRQ_DA850_TINT34_2,

		.bottom_irq	= DAVINCI_INTC_IRQ(IRQ_DA850_TINT12_2),

		.top_irq	= DAVINCI_INTC_IRQ(IRQ_DA850_TINT34_2),

	},

	{

		.base		= DA850_TIMER64P3_BASE,

		.bottom_irq	= IRQ_DA850_TINT12_3,

		.top_irq	= IRQ_DA850_TINT34_3,

		.bottom_irq	= DAVINCI_INTC_IRQ(IRQ_DA850_TINT12_3),

		.top_irq	= DAVINCI_INTC_IRQ(IRQ_DA850_TINT34_3),

	},

};
@@ -658,8 +658,8 @@ static struct platform_device da850_vpif_dev = { 


static struct resource da850_vpif_display_resource[] = {

	{

		.start = IRQ_DA850_VPIFINT,

		.end   = IRQ_DA850_VPIFINT,

		.start = DAVINCI_INTC_IRQ(IRQ_DA850_VPIFINT),

		.end   = DAVINCI_INTC_IRQ(IRQ_DA850_VPIFINT),

		.flags = IORESOURCE_IRQ,

	},

};
@@ -677,13 +677,13 @@ static struct platform_device da850_vpif_display_dev = { 


static struct resource da850_vpif_capture_resource[] = {

	{

		.start = IRQ_DA850_VPIFINT,

		.end   = IRQ_DA850_VPIFINT,

		.start = DAVINCI_INTC_IRQ(IRQ_DA850_VPIFINT),

		.end   = DAVINCI_INTC_IRQ(IRQ_DA850_VPIFINT),

		.flags = IORESOURCE_IRQ,

	},

	{

		.start = IRQ_DA850_VPIFINT,

		.end   = IRQ_DA850_VPIFINT,

		.start = DAVINCI_INTC_IRQ(IRQ_DA850_VPIFINT),

		.end   = DAVINCI_INTC_IRQ(IRQ_DA850_VPIFINT),

		.flags = IORESOURCE_IRQ,

	},

};

arch/arm/mach-davinci/devices-da8xx.c

+73 −73
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ void __iomem *da8xx_syscfg1_base; 
static struct plat_serial8250_port da8xx_serial0_pdata[] = {

	{

		.mapbase	= DA8XX_UART0_BASE,

		.irq		= IRQ_DA8XX_UARTINT0,

		.irq		= DAVINCI_INTC_IRQ(IRQ_DA8XX_UARTINT0),

		.flags		= UPF_BOOT_AUTOCONF | UPF_SKIP_TEST |

					UPF_IOREMAP,

		.iotype		= UPIO_MEM,
@@ -77,7 +77,7 @@ static struct plat_serial8250_port da8xx_serial0_pdata[] = { 
static struct plat_serial8250_port da8xx_serial1_pdata[] = {

	{

		.mapbase	= DA8XX_UART1_BASE,

		.irq		= IRQ_DA8XX_UARTINT1,

		.irq		= DAVINCI_INTC_IRQ(IRQ_DA8XX_UARTINT1),

		.flags		= UPF_BOOT_AUTOCONF | UPF_SKIP_TEST |

					UPF_IOREMAP,

		.iotype		= UPIO_MEM,
@@ -90,7 +90,7 @@ static struct plat_serial8250_port da8xx_serial1_pdata[] = { 
static struct plat_serial8250_port da8xx_serial2_pdata[] = {

	{

		.mapbase	= DA8XX_UART2_BASE,

		.irq		= IRQ_DA8XX_UARTINT2,

		.irq		= DAVINCI_INTC_IRQ(IRQ_DA8XX_UARTINT2),

		.flags		= UPF_BOOT_AUTOCONF | UPF_SKIP_TEST |

					UPF_IOREMAP,

		.iotype		= UPIO_MEM,
@@ -171,12 +171,12 @@ static struct resource da8xx_edma0_resources[] = { 
	},

	{

		.name	= "edma3_ccint",

		.start	= IRQ_DA8XX_CCINT0,

		.start	= DAVINCI_INTC_IRQ(IRQ_DA8XX_CCINT0),

		.flags	= IORESOURCE_IRQ,

	},

	{

		.name	= "edma3_ccerrint",

		.start	= IRQ_DA8XX_CCERRINT,

		.start	= DAVINCI_INTC_IRQ(IRQ_DA8XX_CCERRINT),

		.flags	= IORESOURCE_IRQ,

	},

};
@@ -196,12 +196,12 @@ static struct resource da850_edma1_resources[] = { 
	},

	{

		.name	= "edma3_ccint",

		.start	= IRQ_DA850_CCINT1,

		.start	= DAVINCI_INTC_IRQ(IRQ_DA850_CCINT1),

		.flags	= IORESOURCE_IRQ,

	},

	{

		.name	= "edma3_ccerrint",

		.start	= IRQ_DA850_CCERRINT1,

		.start	= DAVINCI_INTC_IRQ(IRQ_DA850_CCERRINT1),

		.flags	= IORESOURCE_IRQ,

	},

};
@@ -306,8 +306,8 @@ static struct resource da8xx_i2c_resources0[] = { 
		.flags	= IORESOURCE_MEM,

	},

	{

		.start	= IRQ_DA8XX_I2CINT0,

		.end	= IRQ_DA8XX_I2CINT0,

		.start	= DAVINCI_INTC_IRQ(IRQ_DA8XX_I2CINT0),

		.end	= DAVINCI_INTC_IRQ(IRQ_DA8XX_I2CINT0),

		.flags	= IORESOURCE_IRQ,

	},

};
@@ -326,8 +326,8 @@ static struct resource da8xx_i2c_resources1[] = { 
		.flags	= IORESOURCE_MEM,

	},

	{

		.start	= IRQ_DA8XX_I2CINT1,

		.end	= IRQ_DA8XX_I2CINT1,

		.start	= DAVINCI_INTC_IRQ(IRQ_DA8XX_I2CINT1),

		.end	= DAVINCI_INTC_IRQ(IRQ_DA8XX_I2CINT1),

		.flags	= IORESOURCE_IRQ,

	},

};
@@ -382,23 +382,23 @@ static struct resource da8xx_emac_resources[] = { 
		.flags	= IORESOURCE_MEM,

	},

	{

		.start	= IRQ_DA8XX_C0_RX_THRESH_PULSE,

		.end	= IRQ_DA8XX_C0_RX_THRESH_PULSE,

		.start	= DAVINCI_INTC_IRQ(IRQ_DA8XX_C0_RX_THRESH_PULSE),

		.end	= DAVINCI_INTC_IRQ(IRQ_DA8XX_C0_RX_THRESH_PULSE),

		.flags	= IORESOURCE_IRQ,

	},

	{

		.start	= IRQ_DA8XX_C0_RX_PULSE,

		.end	= IRQ_DA8XX_C0_RX_PULSE,

		.start	= DAVINCI_INTC_IRQ(IRQ_DA8XX_C0_RX_PULSE),

		.end	= DAVINCI_INTC_IRQ(IRQ_DA8XX_C0_RX_PULSE),

		.flags	= IORESOURCE_IRQ,

	},

	{

		.start	= IRQ_DA8XX_C0_TX_PULSE,

		.end	= IRQ_DA8XX_C0_TX_PULSE,

		.start	= DAVINCI_INTC_IRQ(IRQ_DA8XX_C0_TX_PULSE),

		.end	= DAVINCI_INTC_IRQ(IRQ_DA8XX_C0_TX_PULSE),

		.flags	= IORESOURCE_IRQ,

	},

	{

		.start	= IRQ_DA8XX_C0_MISC_PULSE,

		.end	= IRQ_DA8XX_C0_MISC_PULSE,

		.start	= DAVINCI_INTC_IRQ(IRQ_DA8XX_C0_MISC_PULSE),

		.end	= DAVINCI_INTC_IRQ(IRQ_DA8XX_C0_MISC_PULSE),

		.flags	= IORESOURCE_IRQ,

	},

};
@@ -470,7 +470,7 @@ static struct resource da830_mcasp1_resources[] = { 
	},

	{

		.name	= "common",

		.start	= IRQ_DA8XX_MCASPINT,

		.start	= DAVINCI_INTC_IRQ(IRQ_DA8XX_MCASPINT),

		.flags	= IORESOURCE_IRQ,

	},

};
@@ -505,7 +505,7 @@ static struct resource da830_mcasp2_resources[] = { 
	},

	{

		.name	= "common",

		.start	= IRQ_DA8XX_MCASPINT,

		.start	= DAVINCI_INTC_IRQ(IRQ_DA8XX_MCASPINT),

		.flags	= IORESOURCE_IRQ,

	},

};
@@ -540,7 +540,7 @@ static struct resource da850_mcasp_resources[] = { 
	},

	{

		.name	= "common",

		.start	= IRQ_DA8XX_MCASPINT,

		.start	= DAVINCI_INTC_IRQ(IRQ_DA8XX_MCASPINT),

		.flags	= IORESOURCE_IRQ,

	},

};
@@ -588,43 +588,43 @@ static struct resource da8xx_pruss_resources[] = { 
		.flags	= IORESOURCE_MEM,

	},

	{

		.start	= IRQ_DA8XX_EVTOUT0,

		.end	= IRQ_DA8XX_EVTOUT0,

		.start	= DAVINCI_INTC_IRQ(IRQ_DA8XX_EVTOUT0),

		.end	= DAVINCI_INTC_IRQ(IRQ_DA8XX_EVTOUT0),

		.flags	= IORESOURCE_IRQ,

	},

	{

		.start	= IRQ_DA8XX_EVTOUT1,

		.end	= IRQ_DA8XX_EVTOUT1,

		.start	= DAVINCI_INTC_IRQ(IRQ_DA8XX_EVTOUT1),

		.end	= DAVINCI_INTC_IRQ(IRQ_DA8XX_EVTOUT1),

		.flags	= IORESOURCE_IRQ,

	},

	{

		.start	= IRQ_DA8XX_EVTOUT2,

		.end	= IRQ_DA8XX_EVTOUT2,

		.start	= DAVINCI_INTC_IRQ(IRQ_DA8XX_EVTOUT2),

		.end	= DAVINCI_INTC_IRQ(IRQ_DA8XX_EVTOUT2),

		.flags	= IORESOURCE_IRQ,

	},

	{

		.start	= IRQ_DA8XX_EVTOUT3,

		.end	= IRQ_DA8XX_EVTOUT3,

		.start	= DAVINCI_INTC_IRQ(IRQ_DA8XX_EVTOUT3),

		.end	= DAVINCI_INTC_IRQ(IRQ_DA8XX_EVTOUT3),

		.flags	= IORESOURCE_IRQ,

	},

	{

		.start	= IRQ_DA8XX_EVTOUT4,

		.end	= IRQ_DA8XX_EVTOUT4,

		.start	= DAVINCI_INTC_IRQ(IRQ_DA8XX_EVTOUT4),

		.end	= DAVINCI_INTC_IRQ(IRQ_DA8XX_EVTOUT4),

		.flags	= IORESOURCE_IRQ,

	},

	{

		.start	= IRQ_DA8XX_EVTOUT5,

		.end	= IRQ_DA8XX_EVTOUT5,

		.start	= DAVINCI_INTC_IRQ(IRQ_DA8XX_EVTOUT5),

		.end	= DAVINCI_INTC_IRQ(IRQ_DA8XX_EVTOUT5),

		.flags	= IORESOURCE_IRQ,

	},

	{

		.start	= IRQ_DA8XX_EVTOUT6,

		.end	= IRQ_DA8XX_EVTOUT6,

		.start	= DAVINCI_INTC_IRQ(IRQ_DA8XX_EVTOUT6),

		.end	= DAVINCI_INTC_IRQ(IRQ_DA8XX_EVTOUT6),

		.flags	= IORESOURCE_IRQ,

	},

	{

		.start	= IRQ_DA8XX_EVTOUT7,

		.end	= IRQ_DA8XX_EVTOUT7,

		.start	= DAVINCI_INTC_IRQ(IRQ_DA8XX_EVTOUT7),

		.end	= DAVINCI_INTC_IRQ(IRQ_DA8XX_EVTOUT7),

		.flags	= IORESOURCE_IRQ,

	},

};
@@ -674,8 +674,8 @@ static struct resource da8xx_lcdc_resources[] = { 
		.flags  = IORESOURCE_MEM,

	},

	[1] = { /* interrupt */

		.start  = IRQ_DA8XX_LCDINT,

		.end    = IRQ_DA8XX_LCDINT,

		.start  = DAVINCI_INTC_IRQ(IRQ_DA8XX_LCDINT),

		.end    = DAVINCI_INTC_IRQ(IRQ_DA8XX_LCDINT),

		.flags  = IORESOURCE_IRQ,

	},

};
@@ -700,48 +700,48 @@ static struct resource da8xx_gpio_resources[] = { 
		.flags	= IORESOURCE_MEM,

	},

	{ /* interrupt */

		.start	= IRQ_DA8XX_GPIO0,

		.end	= IRQ_DA8XX_GPIO0,

		.start	= DAVINCI_INTC_IRQ(IRQ_DA8XX_GPIO0),

		.end	= DAVINCI_INTC_IRQ(IRQ_DA8XX_GPIO0),

		.flags	= IORESOURCE_IRQ,

	},

	{

		.start	= IRQ_DA8XX_GPIO1,

		.end	= IRQ_DA8XX_GPIO1,

		.start	= DAVINCI_INTC_IRQ(IRQ_DA8XX_GPIO1),

		.end	= DAVINCI_INTC_IRQ(IRQ_DA8XX_GPIO1),

		.flags	= IORESOURCE_IRQ,

	},

	{

		.start	= IRQ_DA8XX_GPIO2,

		.end	= IRQ_DA8XX_GPIO2,

		.start	= DAVINCI_INTC_IRQ(IRQ_DA8XX_GPIO2),

		.end	= DAVINCI_INTC_IRQ(IRQ_DA8XX_GPIO2),

		.flags	= IORESOURCE_IRQ,

	},

	{

		.start	= IRQ_DA8XX_GPIO3,

		.end	= IRQ_DA8XX_GPIO3,

		.start	= DAVINCI_INTC_IRQ(IRQ_DA8XX_GPIO3),

		.end	= DAVINCI_INTC_IRQ(IRQ_DA8XX_GPIO3),

		.flags	= IORESOURCE_IRQ,

	},

	{

		.start	= IRQ_DA8XX_GPIO4,

		.end	= IRQ_DA8XX_GPIO4,

		.start	= DAVINCI_INTC_IRQ(IRQ_DA8XX_GPIO4),

		.end	= DAVINCI_INTC_IRQ(IRQ_DA8XX_GPIO4),

		.flags	= IORESOURCE_IRQ,

	},

	{

		.start	= IRQ_DA8XX_GPIO5,

		.end	= IRQ_DA8XX_GPIO5,

		.start	= DAVINCI_INTC_IRQ(IRQ_DA8XX_GPIO5),

		.end	= DAVINCI_INTC_IRQ(IRQ_DA8XX_GPIO5),

		.flags	= IORESOURCE_IRQ,

	},

	{

		.start	= IRQ_DA8XX_GPIO6,

		.end	= IRQ_DA8XX_GPIO6,

		.start	= DAVINCI_INTC_IRQ(IRQ_DA8XX_GPIO6),

		.end	= DAVINCI_INTC_IRQ(IRQ_DA8XX_GPIO6),

		.flags	= IORESOURCE_IRQ,

	},

	{

		.start	= IRQ_DA8XX_GPIO7,

		.end	= IRQ_DA8XX_GPIO7,

		.start	= DAVINCI_INTC_IRQ(IRQ_DA8XX_GPIO7),

		.end	= DAVINCI_INTC_IRQ(IRQ_DA8XX_GPIO7),

		.flags	= IORESOURCE_IRQ,

	},

	{

		.start	= IRQ_DA8XX_GPIO8,

		.end	= IRQ_DA8XX_GPIO8,

		.start	= DAVINCI_INTC_IRQ(IRQ_DA8XX_GPIO8),

		.end	= DAVINCI_INTC_IRQ(IRQ_DA8XX_GPIO8),

		.flags	= IORESOURCE_IRQ,

	},

};
@@ -766,8 +766,8 @@ static struct resource da8xx_mmcsd0_resources[] = { 
		.flags	= IORESOURCE_MEM,

	},

	{		/* interrupt */

		.start	= IRQ_DA8XX_MMCSDINT0,

		.end	= IRQ_DA8XX_MMCSDINT0,

		.start	= DAVINCI_INTC_IRQ(IRQ_DA8XX_MMCSDINT0),

		.end	= DAVINCI_INTC_IRQ(IRQ_DA8XX_MMCSDINT0),

		.flags	= IORESOURCE_IRQ,

	},

};
@@ -793,8 +793,8 @@ static struct resource da850_mmcsd1_resources[] = { 
		.flags	= IORESOURCE_MEM,

	},

	{		/* interrupt */

		.start	= IRQ_DA850_MMCSDINT0_1,

		.end	= IRQ_DA850_MMCSDINT0_1,

		.start	= DAVINCI_INTC_IRQ(IRQ_DA850_MMCSDINT0_1),

		.end	= DAVINCI_INTC_IRQ(IRQ_DA850_MMCSDINT0_1),

		.flags	= IORESOURCE_IRQ,

	},

};
@@ -845,8 +845,8 @@ static struct resource da8xx_rproc_resources[] = { 
		.flags		= IORESOURCE_MEM,

	},

	{ /* dsp irq */

		.start		= IRQ_DA8XX_CHIPINT0,

		.end		= IRQ_DA8XX_CHIPINT0,

		.start		= DAVINCI_INTC_IRQ(IRQ_DA8XX_CHIPINT0),

		.end		= DAVINCI_INTC_IRQ(IRQ_DA8XX_CHIPINT0),

		.flags		= IORESOURCE_IRQ,

	},

};
@@ -936,13 +936,13 @@ static struct resource da8xx_rtc_resources[] = { 
		.flags		= IORESOURCE_MEM,

	},

	{ /* timer irq */

		.start		= IRQ_DA8XX_RTC,

		.end		= IRQ_DA8XX_RTC,

		.start		= DAVINCI_INTC_IRQ(IRQ_DA8XX_RTC),

		.end		= DAVINCI_INTC_IRQ(IRQ_DA8XX_RTC),

		.flags		= IORESOURCE_IRQ,

	},

	{ /* alarm irq */

		.start		= IRQ_DA8XX_RTC,

		.end		= IRQ_DA8XX_RTC,

		.start		= DAVINCI_INTC_IRQ(IRQ_DA8XX_RTC),

		.end		= DAVINCI_INTC_IRQ(IRQ_DA8XX_RTC),

		.flags		= IORESOURCE_IRQ,

	},

};
@@ -1009,8 +1009,8 @@ static struct resource da8xx_spi0_resources[] = { 
		.flags	= IORESOURCE_MEM,

	},

	[1] = {

		.start	= IRQ_DA8XX_SPINT0,

		.end	= IRQ_DA8XX_SPINT0,

		.start	= DAVINCI_INTC_IRQ(IRQ_DA8XX_SPINT0),

		.end	= DAVINCI_INTC_IRQ(IRQ_DA8XX_SPINT0),

		.flags	= IORESOURCE_IRQ,

	},

};
@@ -1022,8 +1022,8 @@ static struct resource da8xx_spi1_resources[] = { 
		.flags	= IORESOURCE_MEM,

	},

	[1] = {

		.start	= IRQ_DA8XX_SPINT1,

		.end	= IRQ_DA8XX_SPINT1,

		.start	= DAVINCI_INTC_IRQ(IRQ_DA8XX_SPINT1),

		.end	= DAVINCI_INTC_IRQ(IRQ_DA8XX_SPINT1),

		.flags	= IORESOURCE_IRQ,

	},

};
@@ -1103,7 +1103,7 @@ static struct resource da850_sata_resources[] = { 
		.flags	= IORESOURCE_MEM,

	},

	{

		.start	= IRQ_DA850_SATAINT,

		.start	= DAVINCI_INTC_IRQ(IRQ_DA850_SATAINT),

		.flags	= IORESOURCE_IRQ,

	},

};

arch/arm/mach-davinci/devices.c

+17 −14
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ static struct resource i2c_resources[] = { 
		.flags		= IORESOURCE_MEM,

	},

	{

		.start		= IRQ_I2C,

		.start		= DAVINCI_INTC_IRQ(IRQ_I2C),

		.flags		= IORESOURCE_IRQ,

	},

};
@@ -84,8 +84,8 @@ static struct resource ide_resources[] = { 
		.flags		= IORESOURCE_MEM,

	},

	{

		.start		= IRQ_IDE,

		.end		= IRQ_IDE,

		.start		= DAVINCI_INTC_IRQ(IRQ_IDE),

		.end		= DAVINCI_INTC_IRQ(IRQ_IDE),

		.flags		= IORESOURCE_IRQ,

	},

};
@@ -133,11 +133,11 @@ static struct resource mmcsd0_resources[] = { 
	},

	/* IRQs:  MMC/SD, then SDIO */

	{

		.start = IRQ_MMCINT,

		.start = DAVINCI_INTC_IRQ(IRQ_MMCINT),

		.flags = IORESOURCE_IRQ,

	}, {

		/* different on dm355 */

		.start = IRQ_SDIOINT,

		.start = DAVINCI_INTC_IRQ(IRQ_SDIOINT),

		.flags = IORESOURCE_IRQ,

	},

};
@@ -163,10 +163,10 @@ static struct resource mmcsd1_resources[] = { 
	},

	/* IRQs:  MMC/SD, then SDIO */

	{

		.start = IRQ_DM355_MMCINT1,

		.start = DAVINCI_INTC_IRQ(IRQ_DM355_MMCINT1),

		.flags = IORESOURCE_IRQ,

	}, {

		.start = IRQ_DM355_SDIOINT1,

		.start = DAVINCI_INTC_IRQ(IRQ_DM355_SDIOINT1),

		.flags = IORESOURCE_IRQ,

	},

};
@@ -219,7 +219,8 @@ void __init davinci_setup_mmc(int module, struct davinci_mmc_config *config) 
			mmcsd1_resources[0].start = DM365_MMCSD1_BASE;

			mmcsd1_resources[0].end = DM365_MMCSD1_BASE +

							SZ_4K - 1;

			mmcsd1_resources[2].start = IRQ_DM365_SDIOINT1;

			mmcsd1_resources[2].start = DAVINCI_INTC_IRQ(

							IRQ_DM365_SDIOINT1);

			davinci_mmcsd1_device.name = "da830-mmc";

		} else

			break;
@@ -230,7 +231,8 @@ void __init davinci_setup_mmc(int module, struct davinci_mmc_config *config) 
		if (cpu_is_davinci_dm355()) {

			mmcsd0_resources[0].start = DM355_MMCSD0_BASE;

			mmcsd0_resources[0].end = DM355_MMCSD0_BASE + SZ_4K - 1;

			mmcsd0_resources[2].start = IRQ_DM355_SDIOINT0;

			mmcsd0_resources[2].start = DAVINCI_INTC_IRQ(

							IRQ_DM355_SDIOINT0);



			/* expose all 6 MMC0 signals:  CLK, CMD, DATA[0..3] */

			davinci_cfg_reg(DM355_MMCSD0);
@@ -241,7 +243,8 @@ void __init davinci_setup_mmc(int module, struct davinci_mmc_config *config) 
			mmcsd0_resources[0].start = DM365_MMCSD0_BASE;

			mmcsd0_resources[0].end = DM365_MMCSD0_BASE +

							SZ_4K - 1;

			mmcsd0_resources[2].start = IRQ_DM365_SDIOINT0;

			mmcsd0_resources[2].start = DAVINCI_INTC_IRQ(

							IRQ_DM365_SDIOINT0);

			davinci_mmcsd0_device.name = "da830-mmc";

		} else if (cpu_is_davinci_dm644x()) {

			/* REVISIT: should this be in board-init code? */
@@ -313,13 +316,13 @@ int davinci_gpio_register(struct resource *res, int size, void *pdata) 
struct davinci_timer_instance davinci_timer_instance[2] = {

	{

		.base		= DAVINCI_TIMER0_BASE,

		.bottom_irq	= IRQ_TINT0_TINT12,

		.top_irq	= IRQ_TINT0_TINT34,

		.bottom_irq	= DAVINCI_INTC_IRQ(IRQ_TINT0_TINT12),

		.top_irq	= DAVINCI_INTC_IRQ(IRQ_TINT0_TINT34),

	},

	{

		.base		= DAVINCI_TIMER1_BASE,

		.bottom_irq	= IRQ_TINT1_TINT12,

		.top_irq	= IRQ_TINT1_TINT34,

		.bottom_irq	= DAVINCI_INTC_IRQ(IRQ_TINT1_TINT12),

		.top_irq	= DAVINCI_INTC_IRQ(IRQ_TINT1_TINT34),

	},

};