diff options
author | Linus Walleij <linus.walleij@linaro.org> | 2012-10-10 08:35:17 -0400 |
---|---|---|
committer | Linus Walleij <linus.walleij@linaro.org> | 2012-11-05 03:55:29 -0500 |
commit | c3123cfdc9e3241055f1ba0d6ceb8b41f97e31b9 (patch) | |
tree | 9ba3caa2760a6415210d9e514b3aa61bc21a7a34 /drivers/pinctrl/pinctrl-nomadik.c | |
parent | 7cb15e10365203bffc5cc75c79725b6c31aa663e (diff) |
pinctrl/nomadik: merge old pincfg header
This merges the old <plat/pincfg.h> header into
<linux/platform_data/pinctrl-nomadik.h> and rids us of
yet one more <plat/*> include.
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/pinctrl/pinctrl-nomadik.c')
-rw-r--r-- | drivers/pinctrl/pinctrl-nomadik.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/pinctrl/pinctrl-nomadik.c b/drivers/pinctrl/pinctrl-nomadik.c index e24fa05e59b8..a49052305756 100644 --- a/drivers/pinctrl/pinctrl-nomadik.c +++ b/drivers/pinctrl/pinctrl-nomadik.c | |||
@@ -48,8 +48,6 @@ static inline void prcmu_write_masked(unsigned int reg, u32 mask, u32 value) {} | |||
48 | 48 | ||
49 | #include <asm/mach/irq.h> | 49 | #include <asm/mach/irq.h> |
50 | 50 | ||
51 | #include <plat/pincfg.h> | ||
52 | |||
53 | #include "pinctrl-nomadik.h" | 51 | #include "pinctrl-nomadik.h" |
54 | 52 | ||
55 | /* | 53 | /* |
@@ -534,7 +532,7 @@ static int __nmk_config_pins(pin_cfg_t *cfgs, int num, bool sleep) | |||
534 | * and its sleep mode based on the specified configuration. The @cfg is | 532 | * and its sleep mode based on the specified configuration. The @cfg is |
535 | * usually one of the SoC specific macros defined in mach/<soc>-pins.h. These | 533 | * usually one of the SoC specific macros defined in mach/<soc>-pins.h. These |
536 | * are constructed using, and can be further enhanced with, the macros in | 534 | * are constructed using, and can be further enhanced with, the macros in |
537 | * plat/pincfg.h. | 535 | * <linux/platform_data/pinctrl-nomadik.h> |
538 | * | 536 | * |
539 | * If a pin's mode is set to GPIO, it is configured as an input to avoid | 537 | * If a pin's mode is set to GPIO, it is configured as an input to avoid |
540 | * side-effects. The gpio can be manipulated later using standard GPIO API | 538 | * side-effects. The gpio can be manipulated later using standard GPIO API |