aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pinctrl
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2012-10-10 08:35:17 -0400
committerLinus Walleij <linus.walleij@linaro.org>2012-10-28 16:18:33 -0400
commit287f121c8b9535a124397ee880f1dc493a88746a (patch)
tree9cd1dcc13e383a9b75048e0a9053402d5e94344f /drivers/pinctrl
parentbb16bd9b9da49dec4f3856bc520c375e49a1237d (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')
-rw-r--r--drivers/pinctrl/pinctrl-nomadik.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/pinctrl/pinctrl-nomadik.c b/drivers/pinctrl/pinctrl-nomadik.c
index 1e04c1f27dcb..984a2eccfa3c 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