aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/pinctrl/pinctrl-nomadik.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/pinctrl/pinctrl-nomadik.c b/drivers/pinctrl/pinctrl-nomadik.c
index 2328baaa86bf..267d81cfe774 100644
--- a/drivers/pinctrl/pinctrl-nomadik.c
+++ b/drivers/pinctrl/pinctrl-nomadik.c
@@ -1565,8 +1565,8 @@ static int nmk_dt_add_map_configs(struct pinctrl_map **map,
1565 return 0; 1565 return 0;
1566} 1566}
1567 1567
1568#define NMK_CONFIG_PIN(x,y) { .property = x, .config = y, } 1568#define NMK_CONFIG_PIN(x, y) { .property = x, .config = y, }
1569#define NMK_CONFIG_PIN_ARRAY(x,y) { .property = x, .choice = y, \ 1569#define NMK_CONFIG_PIN_ARRAY(x, y) { .property = x, .choice = y, \
1570 .size = ARRAY_SIZE(y), } 1570 .size = ARRAY_SIZE(y), }
1571 1571
1572static const unsigned long nmk_pin_input_modes[] = { 1572static const unsigned long nmk_pin_input_modes[] = {
@@ -2068,7 +2068,7 @@ static int nmk_pin_config_set(struct pinctrl_dev *pctldev, unsigned pin,
2068 pin, cfg, pullnames[pull], slpmnames[slpm], 2068 pin, cfg, pullnames[pull], slpmnames[slpm],
2069 output ? "output " : "input", 2069 output ? "output " : "input",
2070 output ? (val ? "high" : "low") : "", 2070 output ? (val ? "high" : "low") : "",
2071 lowemi ? "on" : "off" ); 2071 lowemi ? "on" : "off");
2072 2072
2073 clk_enable(nmk_chip->clk); 2073 clk_enable(nmk_chip->clk);
2074 bit = pin % NMK_GPIO_PER_CHIP; 2074 bit = pin % NMK_GPIO_PER_CHIP;