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

Commit 8395e9dd authored by Russell King's avatar Russell King
Browse files

ARM: amba: spear: get rid of NO_IRQ initializers 



Acked-by: default avatarViresh Kumar <viresh.kumar@st.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 0860cc28

arch/arm/mach-spear3xx/spear300.c

+1 −1
Original line number Diff line number Diff line
@@ -440,7 +440,7 @@ struct amba_device spear300_gpio1_device = { 
		.end = SPEAR300_GPIO_BASE + SZ_4K - 1,

		.flags = IORESOURCE_MEM,

	},

	.irq = {SPEAR300_VIRQ_GPIO1, NO_IRQ},

	.irq = {SPEAR300_VIRQ_GPIO1},

};



/* spear300 routines */

arch/arm/mach-spear3xx/spear3xx.c

+2 −2
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ struct amba_device spear3xx_gpio_device = { 
		.end = SPEAR3XX_ICM3_GPIO_BASE + SZ_4K - 1,

		.flags = IORESOURCE_MEM,

	},

	.irq = {SPEAR3XX_IRQ_BASIC_GPIO, NO_IRQ},

	.irq = {SPEAR3XX_IRQ_BASIC_GPIO},

};



/* uart device registration */
@@ -51,7 +51,7 @@ struct amba_device spear3xx_uart_device = { 
		.end = SPEAR3XX_ICM1_UART_BASE + SZ_4K - 1,

		.flags = IORESOURCE_MEM,

	},

	.irq = {SPEAR3XX_IRQ_UART, NO_IRQ},

	.irq = {SPEAR3XX_IRQ_UART},

};



/* Do spear3xx familiy common initialization part here */

arch/arm/mach-spear6xx/spear6xx.c

+5 −5
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ struct amba_device uart_device[] = { 
			.end = SPEAR6XX_ICM1_UART0_BASE + SZ_4K - 1,

			.flags = IORESOURCE_MEM,

		},

		.irq = {IRQ_UART_0, NO_IRQ},

		.irq = {IRQ_UART_0},

	}, {

		.dev = {

			.init_name = "uart1",
@@ -44,7 +44,7 @@ struct amba_device uart_device[] = { 
			.end = SPEAR6XX_ICM1_UART1_BASE + SZ_4K - 1,

			.flags = IORESOURCE_MEM,

		},

		.irq = {IRQ_UART_1, NO_IRQ},

		.irq = {IRQ_UART_1},

	}

};
@@ -73,7 +73,7 @@ struct amba_device gpio_device[] = { 
			.end = SPEAR6XX_CPU_GPIO_BASE + SZ_4K - 1,

			.flags = IORESOURCE_MEM,

		},

		.irq = {IRQ_LOCAL_GPIO, NO_IRQ},

		.irq = {IRQ_LOCAL_GPIO},

	}, {

		.dev = {

			.init_name = "gpio1",
@@ -84,7 +84,7 @@ struct amba_device gpio_device[] = { 
			.end = SPEAR6XX_ICM3_GPIO_BASE + SZ_4K - 1,

			.flags = IORESOURCE_MEM,

		},

		.irq = {IRQ_BASIC_GPIO, NO_IRQ},

		.irq = {IRQ_BASIC_GPIO},

	}, {

		.dev = {

			.init_name = "gpio2",
@@ -95,7 +95,7 @@ struct amba_device gpio_device[] = { 
			.end = SPEAR6XX_ICM2_GPIO_BASE + SZ_4K - 1,

			.flags = IORESOURCE_MEM,

		},

		.irq = {IRQ_APPL_GPIO, NO_IRQ},

		.irq = {IRQ_APPL_GPIO},

	}

};