diff options
Diffstat (limited to 'arch/arm/mach-omap2/common-board-devices.c')
-rw-r--r-- | arch/arm/mach-omap2/common-board-devices.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/arch/arm/mach-omap2/common-board-devices.c b/arch/arm/mach-omap2/common-board-devices.c index bcb0c581716..799a617ade3 100644 --- a/arch/arm/mach-omap2/common-board-devices.c +++ b/arch/arm/mach-omap2/common-board-devices.c | |||
@@ -76,13 +76,15 @@ void __init omap_ads7846_init(int bus_num, int gpio_pendown, int gpio_debounce, | |||
76 | gpio_set_debounce(gpio_pendown, gpio_debounce); | 76 | gpio_set_debounce(gpio_pendown, gpio_debounce); |
77 | } | 77 | } |
78 | 78 | ||
79 | ads7846_config.gpio_pendown = gpio_pendown; | ||
80 | |||
81 | spi_bi->bus_num = bus_num; | 79 | spi_bi->bus_num = bus_num; |
82 | spi_bi->irq = OMAP_GPIO_IRQ(gpio_pendown); | 80 | spi_bi->irq = OMAP_GPIO_IRQ(gpio_pendown); |
83 | 81 | ||
84 | if (board_pdata) | 82 | if (board_pdata) { |
83 | board_pdata->gpio_pendown = gpio_pendown; | ||
85 | spi_bi->platform_data = board_pdata; | 84 | spi_bi->platform_data = board_pdata; |
85 | } else { | ||
86 | ads7846_config.gpio_pendown = gpio_pendown; | ||
87 | } | ||
86 | 88 | ||
87 | spi_register_board_info(&ads7846_spi_board_info, 1); | 89 | spi_register_board_info(&ads7846_spi_board_info, 1); |
88 | } | 90 | } |