mirror of
https://github.com/torvalds/linux.git
synced 2024-12-15 15:41:58 +00:00
c31cc1b764
1) The above commit introduced a common ->get_pendown_state() function into the generic code, but that function was board-specific for the OMAP3EVM and thus broke most other boards using this code. 2) The above commit was mis-merged introducing another bug which prevents the ads7846 driver probe function to succeed. The omap_ads7846_init() function frees the pendown GPIO in case there is no ->get_pendown_state() function set by the caller (board specific code), so it can be requested later by the ads7846 driver. The above commit add a common ->get_pendown_state() function without removing the gpio_free() call and thus once the ads7846 driver tries to use the pendown GPIO, it crashes as the pendown GPIO has not been requested. 3) The above commit introduces NO new functionality as get_pendown_state() function is already implemented in a suitable way by the ads7846 driver and the debounce time handling has already been fixed by commit97ee9f01(ARM: OMAP: fix the ads7846 init code). This reverts commit16aced80f6. Conflicts: arch/arm/mach-omap2/common-board-devices.c Solved by taking the working version prior to the above commit. Cc: Zumeng Chen <zumeng.chen@windriver.com> Cc: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Igor Grinberg <grinberg@compulab.co.il> Reviewed-by: Kevin Hilman <khilman@ti.com> Tested-by: Kevin Hilman <khilman@ti.com> Signed-off-by: Kevin Hilman <khilman@ti.com>
16 lines
437 B
C
16 lines
437 B
C
#ifndef __OMAP_COMMON_BOARD_DEVICES__
|
|
#define __OMAP_COMMON_BOARD_DEVICES__
|
|
|
|
#include "twl-common.h"
|
|
|
|
#define NAND_BLOCK_SIZE SZ_128K
|
|
|
|
struct mtd_partition;
|
|
struct ads7846_platform_data;
|
|
|
|
void omap_ads7846_init(int bus_num, int gpio_pendown, int gpio_debounce,
|
|
struct ads7846_platform_data *board_pdata);
|
|
void omap_nand_flash_init(int opts, struct mtd_partition *parts, int n_parts);
|
|
|
|
#endif /* __OMAP_COMMON_BOARD_DEVICES__ */
|