• Igor Grinberg's avatar
    Revert "ARM: OMAP3530evm: set pendown_state and debounce time for ads7846" · c31cc1b7
    Igor Grinberg authored
    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 commit 97ee9f01 (ARM: OMAP: fix the ads7846 init code).
    
    This reverts commit 16aced80.
    
    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: default avatarIgor Grinberg <grinberg@compulab.co.il>
    Reviewed-by: default avatarKevin Hilman <khilman@ti.com>
    Tested-by: default avatarKevin Hilman <khilman@ti.com>
    Signed-off-by: default avatarKevin Hilman <khilman@ti.com>
    c31cc1b7
board-omap3evm.c 20.7 KB