Re: [PATCH 21/31] ARM: amba: realview: get rid of private platform amba_device initializer
From: Russell King - ARM Linux <hidden>
Date: 2012-01-25 11:06:47
Also in:
linux-arm-kernel, linux-mmc, linux-omap, linux-samsung-soc
Subsystem:
arm port, the rest · Maintainers:
Russell King, Linus Torvalds
Possibly related (same subject, not in this thread)
- 2012-01-26 · Re: [PATCH 21/31] ARM: amba: realview: get rid of private platform amba_device initializer · Russell King - ARM Linux <hidden>
- 2012-01-26 · Re: [PATCH 21/31] ARM: amba: realview: get rid of private platform amba_device initializer · Will Deacon <hidden>
- 2012-01-24 · Re: [PATCH 21/31] ARM: amba: realview: get rid of private platform amba_device initializer · Will Deacon <hidden>
- 2012-01-20 · [PATCH 21/31] ARM: amba: realview: get rid of private platform amba_device initializer · Russell King - ARM Linux <hidden>
On Wed, Jan 25, 2012 at 10:39:06AM +0000, Will Deacon wrote:
On Wed, Jan 25, 2012 at 10:22:02AM +0000, Russell King - ARM Linux wrote:quoted
On Wed, Jan 25, 2012 at 09:58:00AM +0000, Will Deacon wrote:quoted
Sure. Which branch shall I take it against (before or after your amba changes)?If it's before them, we can think about putting it in as a fix during this -rc independently of the rest of the changes. If it's after, then it'll probably add a conflict. So, it'll be much easier to have it before, and I'll update what's necessary in the amba branch.Okey doke, I've submitted it as 7300/1 against 3.3-rc1.
Right, so with the stack of amba patches on top, it looks like this, which to me looks sane. I haven't build-tested it though.
diff --git a/arch/arm/mach-realview/include/mach/irqs-pb1176.h b/arch/arm/mach-realview/include/mach/irqs-pb1176.h
index 5c3c625..708f841 100644
--- a/arch/arm/mach-realview/include/mach/irqs-pb1176.h
+++ b/arch/arm/mach-realview/include/mach/irqs-pb1176.h@@ -40,6 +40,7 @@ #define IRQ_DC1176_L2CC (IRQ_DC1176_GIC_START + 13) #define IRQ_DC1176_RTC (IRQ_DC1176_GIC_START + 14) #define IRQ_DC1176_CLCD (IRQ_DC1176_GIC_START + 15) /* CLCD controller */ +#define IRQ_DC1176_GPIO0 (IRQ_DC1176_GIC_START + 16) #define IRQ_DC1176_SSP (IRQ_DC1176_GIC_START + 17) /* SSP port */ #define IRQ_DC1176_UART0 (IRQ_DC1176_GIC_START + 18) /* UART 0 on development chip */ #define IRQ_DC1176_UART1 (IRQ_DC1176_GIC_START + 19) /* UART 1 on development chip */
@@ -73,7 +74,6 @@ #define IRQ_PB1176_DMAC (IRQ_PB1176_GIC_START + 24) /* DMA controller */ #define IRQ_PB1176_RTC (IRQ_PB1176_GIC_START + 25) /* Real Time Clock */ -#define IRQ_PB1176_GPIO0 -1 #define IRQ_PB1176_SCTL -1 #define NR_GIC_PB1176 2
diff --git a/arch/arm/mach-realview/realview_pb1176.c b/arch/arm/mach-realview/realview_pb1176.c
index 1b6e60c..b1d7caf 100644
--- a/arch/arm/mach-realview/realview_pb1176.c
+++ b/arch/arm/mach-realview/realview_pb1176.c@@ -143,7 +143,7 @@ static struct pl022_ssp_controller ssp0_plat_data = { #define PB1176_CLCD_IRQ { IRQ_DC1176_CLCD } #define SCTL_IRQ { } #define PB1176_WATCHDOG_IRQ { IRQ_DC1176_WATCHDOG } -#define PB1176_GPIO0_IRQ { IRQ_PB1176_GPIO0 } +#define PB1176_GPIO0_IRQ { IRQ_DC1176_GPIO0 } #define GPIO1_IRQ { IRQ_PB1176_GPIO1 } #define PB1176_RTC_IRQ { IRQ_DC1176_RTC } #define SCI_IRQ { IRQ_PB1176_SCI }