On Thu, Jan 26, 2012 at 05:25:27PM +0000, Russell King - ARM Linux wrote:
> On Wed, Jan 25, 2012 at 11:06:47AM +0000, Russell King - ARM Linux wrote:
> > 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.
>
> Will,
Hi Russell,
> Did you see this? Any comment?
Sorry, this somehow got buried in other mail.
> >
> > 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 }
This looks fine to me. It matches what I posted originally, which was the
intention.
Acked-by: Will Deacon <will.deacon@xxxxxxx>
Will
--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
