aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pinctrl/pinctrl-coh901.c
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2012-02-09 01:23:28 -0500
committerLinus Walleij <linus.walleij@linaro.org>2012-02-10 15:33:02 -0500
commite93bcee00c43e2bd4037291262111016f4c05793 (patch)
treee69b5f7ffffb36096949eabdc0526173b25f695d /drivers/pinctrl/pinctrl-coh901.c
parent28a8d14cc74a0180323d9150c3d3dbf9dd60d55a (diff)
pinctrl: move generic functions to the pinctrl_ namespace
Since we want to use the former pinmux handles and mapping tables for generic control involving both muxing and configuration we begin refactoring by renaming them from pinmux_* to pinctrl_*. ChangeLog v1->v2: - Also rename the PINMUX_* macros in machine.h to PIN_ as indicated in the documentation so as to reflect the generic nature of these mapping entries from now on. Acked-by: Stephen Warren <swarren@nvidia.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/pinctrl/pinctrl-coh901.c')
-rw-r--r--drivers/pinctrl/pinctrl-coh901.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pinctrl/pinctrl-coh901.c b/drivers/pinctrl/pinctrl-coh901.c
index 8bac3f093d58..eba232a46a82 100644
--- a/drivers/pinctrl/pinctrl-coh901.c
+++ b/drivers/pinctrl/pinctrl-coh901.c
@@ -360,14 +360,14 @@ static int u300_gpio_request(struct gpio_chip *chip, unsigned offset)
360 */ 360 */
361 int gpio = chip->base + offset; 361 int gpio = chip->base + offset;
362 362
363 return pinmux_request_gpio(gpio); 363 return pinctrl_request_gpio(gpio);
364} 364}
365 365
366static void u300_gpio_free(struct gpio_chip *chip, unsigned offset) 366static void u300_gpio_free(struct gpio_chip *chip, unsigned offset)
367{ 367{
368 int gpio = chip->base + offset; 368 int gpio = chip->base + offset;
369 369
370 pinmux_free_gpio(gpio); 370 pinctrl_free_gpio(gpio);
371} 371}
372 372
373static int u300_gpio_get(struct gpio_chip *chip, unsigned offset) 373static int u300_gpio_get(struct gpio_chip *chip, unsigned offset)