summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorAlexander Graf <agraf@suse.de>2016-08-11 13:38:31 +0200
committerTom Rini <trini@konsulko.com>2016-09-06 13:18:18 -0400
commit04a993fe116604b8c81fb116857dbc78e2500133 (patch)
treebce93b862151497867391cca54ff1ff062ff2a26 /drivers
parentc0afcb588979e554fd28adeefa6810abb04cf108 (diff)
bcm2835_gpio: Implement GPIOF_FUNC
So far we could only tell the gpio framework that a GPIO was mapped as input or output, not as alternative function. This patch adds support for determining whether a function is mapped as alternative. Signed-off-by: Alexander Graf <agraf@suse.de> Reviewed-by: Simon Glass <sjg@chromium.org> Acked-by: Stephen Warren <swarren@wwwdotorg.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpio/bcm2835_gpio.c30
1 files changed, 17 insertions, 13 deletions
diff --git a/drivers/gpio/bcm2835_gpio.c b/drivers/gpio/bcm2835_gpio.c
index fbc641d662..8b88d7956e 100644
--- a/drivers/gpio/bcm2835_gpio.c
+++ b/drivers/gpio/bcm2835_gpio.c
@@ -44,15 +44,6 @@ static int bcm2835_gpio_direction_output(struct udevice *dev, unsigned gpio,
return 0;
}
-static bool bcm2835_gpio_is_output(const struct bcm2835_gpios *gpios, int gpio)
-{
- u32 val;
-
- val = readl(&gpios->reg->gpfsel[BCM2835_GPIO_FSEL_BANK(gpio)]);
- val &= BCM2835_GPIO_FSEL_MASK << BCM2835_GPIO_FSEL_SHIFT(gpio);
- return val ? true : false;
-}
-
static int bcm2835_get_value(const struct bcm2835_gpios *gpios, unsigned gpio)
{
unsigned val;
@@ -81,15 +72,28 @@ static int bcm2835_gpio_set_value(struct udevice *dev, unsigned gpio,
return 0;
}
-static int bcm2835_gpio_get_function(struct udevice *dev, unsigned offset)
+int bcm2835_gpio_get_func_id(struct udevice *dev, unsigned gpio)
{
struct bcm2835_gpios *gpios = dev_get_priv(dev);
+ u32 val;
+
+ val = readl(&gpios->reg->gpfsel[BCM2835_GPIO_FSEL_BANK(gpio)]);
+
+ return (val >> BCM2835_GPIO_FSEL_SHIFT(gpio) & BCM2835_GPIO_FSEL_MASK);
+}
+
+static int bcm2835_gpio_get_function(struct udevice *dev, unsigned offset)
+{
+ int funcid = bcm2835_gpio_get_func_id(dev, offset);
- /* GPIOF_FUNC is not implemented yet */
- if (bcm2835_gpio_is_output(gpios, offset))
+ switch (funcid) {
+ case BCM2835_GPIO_OUTPUT:
return GPIOF_OUTPUT;
- else
+ case BCM2835_GPIO_INPUT:
return GPIOF_INPUT;
+ default:
+ return GPIOF_FUNC;
+ }
}