leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bcm2835_gpio: Implement GPIOF_FUNC

Browse Source 
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>
This commit is contained in:
Alexander Graf 2016-08-11 13:38:31 +02:00 committed by Tom Rini
parent c0afcb5889
commit 04a993fe11
2 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-bcm283x/include/mach/gpio.h
View File

@ -66,4 +66,6 @@ struct bcm2835_gpio_platdata {
unsigned long base;
};
int bcm2835_gpio_get_func_id(struct udevice *dev, unsigned gpio);
#endif /* _BCM2835_GPIO_H_ */

30
drivers/gpio/bcm2835_gpio.c
View File

@ -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;
/* GPIOF_FUNC is not implemented yet */
if (bcm2835_gpio_is_output(gpios, offset))
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);
switch (funcid) {
case BCM2835_GPIO_OUTPUT:
return GPIOF_OUTPUT;
else
case BCM2835_GPIO_INPUT:
return GPIOF_INPUT;
default:
return GPIOF_FUNC;
}
}