From 577e6a0195291277defa854cfd4da76037e2a258 Mon Sep 17 00:00:00 2001 From: Ilya Yanok Date: Mon, 5 Mar 2012 16:11:02 -0800 Subject: [PATCH] --- yaml --- r: 295557 b: refs/heads/master c: 7db74d5e327197289f2eb83c13f8d1b565a21467 h: refs/heads/master i: 295555: 3516418f8cedd9e056e02642fdef5d5699591290 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-omap2/common-board-devices.c | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 1489e7d4ebf8..4367658d5536 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 17e22caccfcefc3f45ab5eaafe7279ada3b3fbd6 +refs/heads/master: 7db74d5e327197289f2eb83c13f8d1b565a21467 diff --git a/trunk/arch/arm/mach-omap2/common-board-devices.c b/trunk/arch/arm/mach-omap2/common-board-devices.c index bcb0c5817167..799a617ade30 100644 --- a/trunk/arch/arm/mach-omap2/common-board-devices.c +++ b/trunk/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, gpio_set_debounce(gpio_pendown, gpio_debounce); } - ads7846_config.gpio_pendown = gpio_pendown; - spi_bi->bus_num = bus_num; spi_bi->irq = OMAP_GPIO_IRQ(gpio_pendown); - if (board_pdata) + if (board_pdata) { + board_pdata->gpio_pendown = gpio_pendown; spi_bi->platform_data = board_pdata; + } else { + ads7846_config.gpio_pendown = gpio_pendown; + } spi_register_board_info(&ads7846_spi_board_info, 1); }