lkml.org 
[lkml]   [2012]   [Jan]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v4 3/3] gpio: pxa: request pinmux function for gpio
    Date
    While gpio is requested for pxa, gpio driver will request function ready
    on pin.

    Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com>
    ---
    drivers/gpio/gpio-pxa.c | 13 +++++++++++++
    1 files changed, 13 insertions(+), 0 deletions(-)

    diff --git a/drivers/gpio/gpio-pxa.c b/drivers/gpio/gpio-pxa.c
    index b2d3ee1..5e12c19 100644
    --- a/drivers/gpio/gpio-pxa.c
    +++ b/drivers/gpio/gpio-pxa.c
    @@ -19,6 +19,7 @@
    #include <linux/irq.h>
    #include <linux/io.h>
    #include <linux/platform_device.h>
    +#include <linux/pinctrl/pinmux.h>
    #include <linux/syscore_ops.h>
    #include <linux/slab.h>

    @@ -267,6 +268,16 @@ static void pxa_gpio_set(struct gpio_chip *chip, unsigned offset, int value)
    (value ? GPSR_OFFSET : GPCR_OFFSET));
    }

    +static int pxa_gpio_request(struct gpio_chip *chip, unsigned offset)
    +{
    + return pinmux_request_gpio(chip->base + offset);
    +}
    +
    +static void pxa_gpio_free(struct gpio_chip *chip, unsigned offset)
    +{
    + pinmux_free_gpio(chip->base + offset);
    +}
    +
    static int __devinit pxa_init_gpio_chip(int gpio_end)
    {
    int i, gpio, nbanks = gpio_to_bank(gpio_end) + 1;
    @@ -292,6 +303,8 @@ static int __devinit pxa_init_gpio_chip(int gpio_end)
    c->get = pxa_gpio_get;
    c->set = pxa_gpio_set;
    c->to_irq = pxa_gpio_to_irq;
    + c->request = pxa_gpio_request;
    + c->free = pxa_gpio_free;

    /* number of GPIOs on last bank may be less than 32 */
    c->ngpio = (gpio + 31 > gpio_end) ? (gpio_end - gpio + 1) : 32;
    --
    1.7.0.4


    \
     
     \ /
      Last update: 2012-01-04 03:23    [W:0.020 / U:58.844 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site