Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 318451
b: refs/heads/master
c: f447ed8
h: refs/heads/master
i:
  318449: ef85e21
  318447: b405c21
v: v3
  • Loading branch information
Olof Johansson authored and Linus Walleij committed Jul 17, 2012
1 parent f182f72 commit 28a010e
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 31ba56f274d60d0b84efae4d15a9cd3e0486fa8c
refs/heads/master: f447ed8b31da7b24c7c75c2d4624598135b41217
9 changes: 5 additions & 4 deletions trunk/Documentation/devicetree/bindings/gpio/gpio-samsung.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,15 @@ Required properties:
<[phandle of the gpio controller node]
[pin number within the gpio controller]
[mux function]
[pull up/down]
[flags and pull up/down]
[drive strength]>

Values for gpio specifier:
- Pin number: is a value between 0 to 7.
- Pull Up/Down: 0 - Pull Up/Down Disabled.
1 - Pull Down Enabled.
3 - Pull Up Enabled.
- Flags and Pull Up/Down: 0 - Pull Up/Down Disabled.
1 - Pull Down Enabled.
3 - Pull Up Enabled.
Bit 16 (0x00010000) - Input is active low.
- Drive Strength: 0 - 1x,
1 - 3x,
2 - 2x,
Expand Down
5 changes: 4 additions & 1 deletion trunk/drivers/gpio/gpio-samsung.c
Original file line number Diff line number Diff line change
Expand Up @@ -2681,11 +2681,14 @@ static int exynos_gpio_xlate(struct gpio_chip *gc,

if (s3c_gpio_cfgpin(pin, S3C_GPIO_SFN(gpiospec->args[1])))
pr_warn("gpio_xlate: failed to set pin function\n");
if (s3c_gpio_setpull(pin, gpiospec->args[2]))
if (s3c_gpio_setpull(pin, gpiospec->args[2] & 0xffff))
pr_warn("gpio_xlate: failed to set pin pull up/down\n");
if (s5p_gpio_set_drvstr(pin, gpiospec->args[3]))
pr_warn("gpio_xlate: failed to set pin drive strength\n");

if (flags)
*flags = gpiospec->args[2] >> 16;

return gpiospec->args[0];
}

Expand Down

0 comments on commit 28a010e

Please sign in to comment.