diff options
Diffstat (limited to 'arch/arm/mach-pxa/lubbock.c')
| -rw-r--r-- | arch/arm/mach-pxa/lubbock.c | 35 |
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 = { | |||
| 66 | GPIO25_SSP1_TXD, | 66 | GPIO25_SSP1_TXD, |
| 67 | GPIO26_SSP1_RXD, | 67 | GPIO26_SSP1_RXD, |
| 68 | 68 | ||
| 69 | /* AC97 */ | ||
| 70 | GPIO28_AC97_BITCLK, | ||
| 71 | GPIO29_AC97_SDATA_IN_0, | ||
| 72 | GPIO30_AC97_SDATA_OUT, | ||
| 73 | GPIO31_AC97_SYNC, | ||
| 74 | |||
| 69 | /* LCD - 16bpp DSTN */ | 75 | /* LCD - 16bpp DSTN */ |
| 70 | GPIO58_LCD_LDD_0, | 76 | GPIOxx_LCD_DSTN_16BPP, |
| 71 | GPIO59_LCD_LDD_1, | ||
| 72 | GPIO60_LCD_LDD_2, | ||
| 73 | GPIO61_LCD_LDD_3, | ||
| 74 | GPIO62_LCD_LDD_4, | ||
| 75 | GPIO63_LCD_LDD_5, | ||
| 76 | GPIO64_LCD_LDD_6, | ||
| 77 | GPIO65_LCD_LDD_7, | ||
| 78 | GPIO66_LCD_LDD_8, | ||
| 79 | GPIO67_LCD_LDD_9, | ||
| 80 | GPIO68_LCD_LDD_10, | ||
| 81 | GPIO69_LCD_LDD_11, | ||
| 82 | GPIO70_LCD_LDD_12, | ||
| 83 | GPIO71_LCD_LDD_13, | ||
| 84 | GPIO72_LCD_LDD_14, | ||
| 85 | GPIO73_LCD_LDD_15, | ||
| 86 | GPIO74_LCD_FCLK, | ||
| 87 | GPIO75_LCD_LCLK, | ||
| 88 | GPIO76_LCD_PCLK, | ||
| 89 | 77 | ||
| 90 | /* BTUART */ | 78 | /* BTUART */ |
| 91 | GPIO42_BTUART_RXD, | 79 | GPIO42_BTUART_RXD, |
| @@ -158,7 +146,7 @@ static void lubbock_irq_handler(unsigned int irq, struct irq_desc *desc) | |||
| 158 | { | 146 | { |
| 159 | unsigned long pending = LUB_IRQ_SET_CLR & lubbock_irq_enabled; | 147 | unsigned long pending = LUB_IRQ_SET_CLR & lubbock_irq_enabled; |
| 160 | do { | 148 | do { |
| 161 | GEDR(0) = GPIO_bit(0); /* clear our parent irq */ | 149 | desc->chip->ack(irq); /* clear our parent irq */ |
| 162 | if (likely(pending)) { | 150 | if (likely(pending)) { |
| 163 | irq = LUBBOCK_IRQ(0) + __ffs(pending); | 151 | irq = LUBBOCK_IRQ(0) + __ffs(pending); |
| 164 | generic_handle_irq(irq); | 152 | generic_handle_irq(irq); |
| @@ -240,11 +228,18 @@ static struct resource sa1111_resources[] = { | |||
| 240 | }, | 228 | }, |
| 241 | }; | 229 | }; |
| 242 | 230 | ||
| 231 | static struct sa1111_platform_data sa1111_info = { | ||
| 232 | .irq_base = IRQ_BOARD_END, | ||
| 233 | }; | ||
| 234 | |||
| 243 | static struct platform_device sa1111_device = { | 235 | static struct platform_device sa1111_device = { |
| 244 | .name = "sa1111", | 236 | .name = "sa1111", |
| 245 | .id = -1, | 237 | .id = -1, |
| 246 | .num_resources = ARRAY_SIZE(sa1111_resources), | 238 | .num_resources = ARRAY_SIZE(sa1111_resources), |
| 247 | .resource = sa1111_resources, | 239 | .resource = sa1111_resources, |
| 240 | .dev = { | ||
| 241 | .platform_data = &sa1111_info, | ||
| 242 | }, | ||
| 248 | }; | 243 | }; |
| 249 | 244 | ||
| 250 | /* ADS7846 is connected through SSP ... and if your board has J5 populated, | 245 | /* ADS7846 is connected through SSP ... and if your board has J5 populated, |