Merge branch 'topic/jack' into for-linus

[pandora-kernel.git] / arch / arm / mach-pxa / lubbock.c

diff --git a/arch/arm/mach-pxa/lubbock.c b/arch/arm/mach-pxa/lubbock.c
index 56ae54e..63d65a2 100644 (file)
--- a/arch/arm/mach-pxa/lubbock.c
+++ b/arch/arm/mach-pxa/lubbock.c
@@ -66,6 +66,12 @@ 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 */
        GPIOxx_LCD_DSTN_16BPP,
 
@@ -222,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,