diff options
author | Linus Walleij <linus.walleij@linaro.org> | 2012-08-13 04:56:43 -0400 |
---|---|---|
committer | Linus Walleij <linus.walleij@linaro.org> | 2012-08-13 07:53:05 -0400 |
commit | 651728507140246e9cf4e809f1877cb2eddbc84e (patch) | |
tree | 9e500495fe09b0a3b611f574d3e308bde4008b70 | |
parent | 04b13de6229621b2bd9eb1b7afaded954c3037de (diff) |
pinctrl/coh901: move header to platform data dir
Move the platform-specific COH901 pin control header out of the
ARM tree and down into the proper platform data include
directory.
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
-rw-r--r-- | arch/arm/mach-u300/core.c | 2 | ||||
-rw-r--r-- | drivers/pinctrl/pinctrl-coh901.c | 2 | ||||
-rw-r--r-- | include/linux/platform_data/pinctrl-coh901.h (renamed from arch/arm/mach-u300/include/mach/gpio-u300.h) | 0 |
3 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-u300/core.c b/arch/arm/mach-u300/core.c index 883d5c26d50b..0158189a4dab 100644 --- a/arch/arm/mach-u300/core.c +++ b/arch/arm/mach-u300/core.c | |||
@@ -31,6 +31,7 @@ | |||
31 | #include <linux/pinctrl/pinconf-generic.h> | 31 | #include <linux/pinctrl/pinconf-generic.h> |
32 | #include <linux/dma-mapping.h> | 32 | #include <linux/dma-mapping.h> |
33 | #include <linux/platform_data/clk-u300.h> | 33 | #include <linux/platform_data/clk-u300.h> |
34 | #include <linux/platform_data/pinctrl-coh901.h> | ||
34 | 35 | ||
35 | #include <asm/types.h> | 36 | #include <asm/types.h> |
36 | #include <asm/setup.h> | 37 | #include <asm/setup.h> |
@@ -43,7 +44,6 @@ | |||
43 | #include <mach/hardware.h> | 44 | #include <mach/hardware.h> |
44 | #include <mach/syscon.h> | 45 | #include <mach/syscon.h> |
45 | #include <mach/dma_channels.h> | 46 | #include <mach/dma_channels.h> |
46 | #include <mach/gpio-u300.h> | ||
47 | 47 | ||
48 | #include "spi.h" | 48 | #include "spi.h" |
49 | #include "i2c.h" | 49 | #include "i2c.h" |
diff --git a/drivers/pinctrl/pinctrl-coh901.c b/drivers/pinctrl/pinctrl-coh901.c index 91a5dc7f6766..b446c9641212 100644 --- a/drivers/pinctrl/pinctrl-coh901.c +++ b/drivers/pinctrl/pinctrl-coh901.c | |||
@@ -21,7 +21,7 @@ | |||
21 | #include <linux/slab.h> | 21 | #include <linux/slab.h> |
22 | #include <linux/pinctrl/consumer.h> | 22 | #include <linux/pinctrl/consumer.h> |
23 | #include <linux/pinctrl/pinconf-generic.h> | 23 | #include <linux/pinctrl/pinconf-generic.h> |
24 | #include <mach/gpio-u300.h> | 24 | #include <linux/platform_data/pinctrl-coh901.h> |
25 | #include "pinctrl-coh901.h" | 25 | #include "pinctrl-coh901.h" |
26 | 26 | ||
27 | #define U300_GPIO_PORT_STRIDE (0x30) | 27 | #define U300_GPIO_PORT_STRIDE (0x30) |
diff --git a/arch/arm/mach-u300/include/mach/gpio-u300.h b/include/linux/platform_data/pinctrl-coh901.h index 30dea251b835..30dea251b835 100644 --- a/arch/arm/mach-u300/include/mach/gpio-u300.h +++ b/include/linux/platform_data/pinctrl-coh901.h | |||