lkml.org 
[lkml]   [2018]   [Jun]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.16 139/279] ARM: davinci: board-da830-evm: fix GPIO lookup for MMC/SD
    Date
    4.16-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Sekhar Nori <nsekhar@ti.com>

    [ Upstream commit 51e9f12163223546bd3aa9f7af6817931f980da8 ]

    The GPIO chip is called davinci_gpio.0 in legacy mode. Fix it, so that
    mmc can correctly lookup the wp and cp gpios. Also fix the GPIO numbers
    as they are not offsets within a bank.

    Note that it is the gpio-davinci driver that sets the gpiochip label to
    davinci_gpio.0.

    Fixes: b5e1438cf98a ("ARM: davinci: da830-evm: use gpio descriptor for mmc pins")
    Reported-by: David Lechner <david@lechnology.com>
    Reviewed-by: David Lechner <david@lechnology.com>
    Signed-off-by: Sekhar Nori <nsekhar@ti.com>
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    arch/arm/mach-davinci/board-da830-evm.c | 9 +++++++--
    1 file changed, 7 insertions(+), 2 deletions(-)

    --- a/arch/arm/mach-davinci/board-da830-evm.c
    +++ b/arch/arm/mach-davinci/board-da830-evm.c
    @@ -205,12 +205,17 @@ static const short da830_evm_mmc_sd_pins
    -1
    };

    +#define DA830_MMCSD_WP_PIN GPIO_TO_PIN(2, 1)
    +#define DA830_MMCSD_CD_PIN GPIO_TO_PIN(2, 2)
    +
    static struct gpiod_lookup_table mmc_gpios_table = {
    .dev_id = "da830-mmc.0",
    .table = {
    /* gpio chip 1 contains gpio range 32-63 */
    - GPIO_LOOKUP("davinci_gpio.1", 2, "cd", GPIO_ACTIVE_LOW),
    - GPIO_LOOKUP("davinci_gpio.1", 1, "wp", GPIO_ACTIVE_LOW),
    + GPIO_LOOKUP("davinci_gpio.0", DA830_MMCSD_CD_PIN, "cd",
    + GPIO_ACTIVE_LOW),
    + GPIO_LOOKUP("davinci_gpio.0", DA830_MMCSD_WP_PIN, "wp",
    + GPIO_ACTIVE_LOW),
    },
    };


    \
     
     \ /
      Last update: 2018-06-18 11:40    [W:4.147 / U:0.148 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site