1 files changed, 15 insertions, 20 deletions

diff --git a/arch/arm/mach-pxa/lubbock.c b/arch/arm/mach-pxa/lubbock.c
index 98ee7e590299..63d65a2a0387 100644
--- a/arch/arm/mach-pxa/lubbock.c
+++ b/arch/arm/mach-pxa/lubbock.c
@@ -66,26 +66,14 @@ static unsigned long lubbock_pin_config[] __initdata = {
         GPIO25_SSP1_TXD,
         GPIO26_SSP1_RXD,
 
+        /* AC97 */
+        GPIO28_AC97_BITCLK,
+        GPIO29_AC97_SDATA_IN_0,
+        GPIO30_AC97_SDATA_OUT,
+        GPIO31_AC97_SYNC,
+
         /* LCD - 16bpp DSTN */
-        GPIO58_LCD_LDD_0,
-        GPIO59_LCD_LDD_1,
-        GPIO60_LCD_LDD_2,
-        GPIO61_LCD_LDD_3,
-        GPIO62_LCD_LDD_4,
-        GPIO63_LCD_LDD_5,
-        GPIO64_LCD_LDD_6,
-        GPIO65_LCD_LDD_7,
-        GPIO66_LCD_LDD_8,
-        GPIO67_LCD_LDD_9,
-        GPIO68_LCD_LDD_10,
-        GPIO69_LCD_LDD_11,
-        GPIO70_LCD_LDD_12,
-        GPIO71_LCD_LDD_13,
-        GPIO72_LCD_LDD_14,
-        GPIO73_LCD_LDD_15,
-        GPIO74_LCD_FCLK,
-        GPIO75_LCD_LCLK,
-        GPIO76_LCD_PCLK,
+        GPIOxx_LCD_DSTN_16BPP,
 
         /* BTUART */
         GPIO42_BTUART_RXD,
@@ -158,7 +146,7 @@ static void lubbock_irq_handler(unsigned int irq, struct irq_desc *desc)
 {
         unsigned long pending = LUB_IRQ_SET_CLR & lubbock_irq_enabled;
         do {
-                GEDR(0) = GPIO_bit(0);  /* clear our parent irq */
+                desc->chip->ack(irq);   /* clear our parent irq */
                 if (likely(pending)) {
                         irq = LUBBOCK_IRQ(0) + __ffs(pending);
                         generic_handle_irq(irq);
@@ -240,11 +228,18 @@ static struct resource sa1111_resources[] = {
         },
 };
 
+static struct sa1111_platform_data sa1111_info = {
+        .irq_base       = IRQ_BOARD_END,
+};
+
 static struct platform_device sa1111_device = {
         .name           = "sa1111",
         .id             = -1,
         .num_resources  = ARRAY_SIZE(sa1111_resources),
         .resource       = sa1111_resources,
+        .dev            = {
+                .platform_data  = &sa1111_info,
+        },
 };
 
 /* ADS7846 is connected through SSP ... and if your board has J5 populated,