aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pinctrl
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2012-10-10 08:27:58 -0400
committerLinus Walleij <linus.walleij@linaro.org>2012-10-28 16:18:33 -0400
commitbb16bd9b9da49dec4f3856bc520c375e49a1237d (patch)
tree547f2eacfcac2edee72c429ac7ca2935ca0f7960 /drivers/pinctrl
parent1d853ca5bae2f728f0e7e1afa98b3a160020af4a (diff)
pinctrl/nomadik: move the platform data header
This moves the platform data header for the Nomadik pin controller to <linux/platform_data/pinctrl-nomadik.h>. Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/pinctrl')
-rw-r--r--drivers/pinctrl/pinctrl-nomadik.c2
-rw-r--r--drivers/pinctrl/pinctrl-nomadik.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pinctrl/pinctrl-nomadik.c b/drivers/pinctrl/pinctrl-nomadik.c
index e30eb34189b0..1e04c1f27dcb 100644
--- a/drivers/pinctrl/pinctrl-nomadik.c
+++ b/drivers/pinctrl/pinctrl-nomadik.c
@@ -44,11 +44,11 @@ static inline u32 prcmu_read(unsigned int reg) {
44static inline void prcmu_write(unsigned int reg, u32 value) {} 44static inline void prcmu_write(unsigned int reg, u32 value) {}
45static inline void prcmu_write_masked(unsigned int reg, u32 mask, u32 value) {} 45static inline void prcmu_write_masked(unsigned int reg, u32 mask, u32 value) {}
46#endif 46#endif
47#include <linux/platform_data/pinctrl-nomadik.h>
47 48
48#include <asm/mach/irq.h> 49#include <asm/mach/irq.h>
49 50
50#include <plat/pincfg.h> 51#include <plat/pincfg.h>
51#include <plat/gpio-nomadik.h>
52 52
53#include "pinctrl-nomadik.h" 53#include "pinctrl-nomadik.h"
54 54
diff --git a/drivers/pinctrl/pinctrl-nomadik.h b/drivers/pinctrl/pinctrl-nomadik.h
index eef316e979a0..bcd4191e10ea 100644
--- a/drivers/pinctrl/pinctrl-nomadik.h
+++ b/drivers/pinctrl/pinctrl-nomadik.h
@@ -1,7 +1,7 @@
1#ifndef PINCTRL_PINCTRL_NOMADIK_H 1#ifndef PINCTRL_PINCTRL_NOMADIK_H
2#define PINCTRL_PINCTRL_NOMADIK_H 2#define PINCTRL_PINCTRL_NOMADIK_H
3 3
4#include <plat/gpio-nomadik.h> 4#include <linux/platform_data/pinctrl-nomadik.h>
5 5
6/* Package definitions */ 6/* Package definitions */
7#define PINCTRL_NMK_STN8815 0 7#define PINCTRL_NMK_STN8815 0