diff options
author | Jamie Iles <jamie@jamieiles.com> | 2011-05-20 00:40:16 -0600 |
---|---|---|
committer | Grant Likely <grant.likely@secretlab.ca> | 2011-05-20 00:40:16 -0600 |
commit | dd86a0cc5e35161538c10e35eb85e2ad0adfe14d (patch) | |
tree | 4a6f57831bc7b1a471bfe74b726498fce057fc0c /drivers | |
parent | e027d6f9d52d9ccabb307d0cb0265de3481b1e9e (diff) | |
download | linux-stable-dd86a0cc5e35161538c10e35eb85e2ad0adfe14d.tar.gz linux-stable-dd86a0cc5e35161538c10e35eb85e2ad0adfe14d.tar.bz2 linux-stable-dd86a0cc5e35161538c10e35eb85e2ad0adfe14d.zip |
basic_mmio_gpio: support different input/output registers
Some controllers have separate input and output registers. For these
controllers, use "set" for the output and "dat" for the input.
Changes since v2: reuse "set" for output and "dat" for input rather than
adding a new "in" register.
Signed-off-by: Jamie Iles <jamie@jamieiles.com>
Acked-by: Anton Vorontsov <cbouatmailru@gmail.com>
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/gpio/basic_mmio_gpio.c | 38 |
1 files changed, 33 insertions, 5 deletions
diff --git a/drivers/gpio/basic_mmio_gpio.c b/drivers/gpio/basic_mmio_gpio.c index 728bc67ee08b..6b99489e0ebb 100644 --- a/drivers/gpio/basic_mmio_gpio.c +++ b/drivers/gpio/basic_mmio_gpio.c @@ -185,6 +185,24 @@ static void bgpio_set_with_clear(struct gpio_chip *gc, unsigned int gpio, bgc->write_reg(bgc->reg_clr, mask); } +static void bgpio_set_set(struct gpio_chip *gc, unsigned int gpio, int val) +{ + struct bgpio_chip *bgc = to_bgpio_chip(gc); + unsigned long mask = bgc->pin2mask(bgc, gpio); + unsigned long flags; + + spin_lock_irqsave(&bgc->lock, flags); + + if (val) + bgc->data |= mask; + else + bgc->data &= ~mask; + + bgc->write_reg(bgc->reg_set, bgc->data); + + spin_unlock_irqrestore(&bgc->lock, flags); +} + static int bgpio_dir_in(struct gpio_chip *gc, unsigned int gpio) { return 0; @@ -245,10 +263,12 @@ static int bgpio_setup_accessors(struct platform_device *pdev, /* * Create the device and allocate the resources. For setting GPIO's there are - * two supported configurations: + * three supported configurations: * - * - single output register resource (named "dat"). + * - single input/output register resource (named "dat"). * - set/clear pair (named "set" and "clr"). + * - single output register resource and single input resource ("set" and + * dat"). * * For the single output register, this drives a 1 by setting a bit and a zero * by clearing a bit. For the set clr pair, this drives a 1 by setting a bit @@ -292,12 +312,21 @@ static int bgpio_setup_io(struct platform_device *pdev, return -ENOMEM; bgc->gc.set = bgpio_set_with_clear; - } else if (res_set || res_clr) { - return -EINVAL; + } else if (res_set && !res_clr) { + if (resource_size(res_set) != resource_size(res_dat)) + return -EINVAL; + + bgc->reg_set = bgpio_request_and_map(&pdev->dev, res_set); + if (!bgc->reg_set) + return -ENOMEM; + + bgc->gc.set = bgpio_set_set; } else { bgc->gc.set = bgpio_set; } + bgc->gc.get = bgpio_get; + return 0; } @@ -336,7 +365,6 @@ static int __devinit bgpio_probe(struct platform_device *pdev) bgc->gc.ngpio = ngpio; bgc->gc.direction_input = bgpio_dir_in; bgc->gc.direction_output = bgpio_dir_out; - bgc->gc.get = bgpio_get; bgc->gc.dev = dev; bgc->gc.label = dev_name(dev); |