Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 362978
b: refs/heads/master
c: 87ff934
h: refs/heads/master
v: v3
  • Loading branch information
Sachin Kamat authored and Linus Walleij committed Mar 27, 2013
1 parent 1dd7631 commit 9bfc99e
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 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: cde6d8dcc3651d4c328f1a2e50dcff98ebe40865
refs/heads/master: 87ff934afdc50ad171a4b5110bb62eb6ecb3a18f
6 changes: 3 additions & 3 deletions trunk/drivers/pinctrl/pinctrl-nomadik.c
Original file line number Diff line number Diff line change
Expand Up @@ -1565,8 +1565,8 @@ static int nmk_dt_add_map_configs(struct pinctrl_map **map,
return 0;
}

#define NMK_CONFIG_PIN(x,y) { .property = x, .config = y, }
#define NMK_CONFIG_PIN_ARRAY(x,y) { .property = x, .choice = y, \
#define NMK_CONFIG_PIN(x, y) { .property = x, .config = y, }
#define NMK_CONFIG_PIN_ARRAY(x, y) { .property = x, .choice = y, \
.size = ARRAY_SIZE(y), }

static const unsigned long nmk_pin_input_modes[] = {
Expand Down Expand Up @@ -2068,7 +2068,7 @@ static int nmk_pin_config_set(struct pinctrl_dev *pctldev, unsigned pin,
pin, cfg, pullnames[pull], slpmnames[slpm],
output ? "output " : "input",
output ? (val ? "high" : "low") : "",
lowemi ? "on" : "off" );
lowemi ? "on" : "off");

clk_enable(nmk_chip->clk);
bit = pin % NMK_GPIO_PER_CHIP;
Expand Down

0 comments on commit 9bfc99e

Please sign in to comment.