lkml.org 
[lkml]   [2010]   [Aug]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3/5 v4] msm: convert 8x50 to gpiomux.
    Date
    Change the gpio-init code from deprecated gpio_tlmm_config
    to the new gpiomux api.

    Signed-off-by: Gregory Bean <gbean@codeaurora.org>
    ---
    arch/arm/mach-msm/board-qsd8x50.c | 12 ------------
    arch/arm/mach-msm/gpiomux-8x50.c | 11 ++++++++++-
    2 files changed, 10 insertions(+), 13 deletions(-)

    diff --git a/arch/arm/mach-msm/board-qsd8x50.c b/arch/arm/mach-msm/board-qsd8x50.c
    index e3cc807..fb0fe67 100644
    --- a/arch/arm/mach-msm/board-qsd8x50.c
    +++ b/arch/arm/mach-msm/board-qsd8x50.c
    @@ -35,21 +35,10 @@

    extern struct sys_timer msm_timer;

    -static struct msm_gpio uart3_config_data[] = {
    - { GPIO_CFG(86, 1, GPIO_INPUT, GPIO_PULL_DOWN, GPIO_2MA), "UART2_Rx"},
    - { GPIO_CFG(87, 1, GPIO_OUTPUT, GPIO_PULL_DOWN, GPIO_2MA), "UART2_Tx"},
    -};
    -
    static struct platform_device *devices[] __initdata = {
    &msm_device_uart3,
    };

    -static void msm8x50_init_uart3(void)
    -{
    - msm_gpios_request_enable(uart3_config_data,
    - ARRAY_SIZE(uart3_config_data));
    -}
    -
    static void __init qsd8x50_map_io(void)
    {
    msm_map_qsd8x50_io();
    @@ -64,7 +53,6 @@ static void __init qsd8x50_init_irq(void)

    static void __init qsd8x50_init(void)
    {
    - msm8x50_init_uart3();
    platform_add_devices(devices, ARRAY_SIZE(devices));
    }

    diff --git a/arch/arm/mach-msm/gpiomux-8x50.c b/arch/arm/mach-msm/gpiomux-8x50.c
    index 7b380b3..4406e0f 100644
    --- a/arch/arm/mach-msm/gpiomux-8x50.c
    +++ b/arch/arm/mach-msm/gpiomux-8x50.c
    @@ -16,4 +16,13 @@
    */
    #include "gpiomux.h"

    -struct msm_gpiomux_config msm_gpiomux_configs[GPIOMUX_NGPIOS] = {};
    +struct msm_gpiomux_config msm_gpiomux_configs[GPIOMUX_NGPIOS] = {
    + [86] = { /* UART3 RX */
    + .suspended = GPIOMUX_DRV_2MA | GPIOMUX_PULL_DOWN |
    + GPIOMUX_FUNC_1 | GPIOMUX_VALID,
    + },
    + [87] = { /* UART3 TX */
    + .suspended = GPIOMUX_DRV_2MA | GPIOMUX_PULL_DOWN |
    + GPIOMUX_FUNC_1 | GPIOMUX_VALID,
    + },
    +};
    --
    1.7.0.4
    /usr2/gbean/.signature.codeaurora.org


    \
     
     \ /
      Last update: 2010-08-28 19:09    [W:0.035 / U:61.184 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site