diff options
author | Philip Avinash <avinashphilip@ti.com> | 2013-08-18 01:19:02 -0400 |
---|---|---|
committer | Sekhar Nori <nsekhar@ti.com> | 2013-09-24 18:45:40 -0400 |
commit | 834acb2af6e8255a026c754fac3d1bc3f32b0c1a (patch) | |
tree | 84d4dcf0defa5ae4251488af845afe431ce9ef48 /arch/arm/mach-davinci/board-neuros-osd2.c | |
parent | b856671e8ce18122dce87c2b6b2aec12fb9dda14 (diff) |
ARM: davinci: board: gpio device creation
Create GPIO device for existing DaVinci boards.
While at it, group related header files together.
Signed-off-by: Philip Avinash <avinashphilip@ti.com>
Signed-off-by: Lad, Prabhakar <prabhakar.csengg@gmail.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
[nsekhar@ti.com: remove soc bits from this patch and
simplify commit message]
Signed-off-by: Sekhar Nori <nsekhar@ti.com>
Diffstat (limited to 'arch/arm/mach-davinci/board-neuros-osd2.c')
-rw-r--r-- | arch/arm/mach-davinci/board-neuros-osd2.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/arch/arm/mach-davinci/board-neuros-osd2.c b/arch/arm/mach-davinci/board-neuros-osd2.c index 46f336fca803..bb680af98374 100644 --- a/arch/arm/mach-davinci/board-neuros-osd2.c +++ b/arch/arm/mach-davinci/board-neuros-osd2.c | |||
@@ -26,17 +26,18 @@ | |||
26 | #include <linux/platform_device.h> | 26 | #include <linux/platform_device.h> |
27 | #include <linux/gpio.h> | 27 | #include <linux/gpio.h> |
28 | #include <linux/mtd/partitions.h> | 28 | #include <linux/mtd/partitions.h> |
29 | #include <linux/platform_data/gpio-davinci.h> | ||
30 | #include <linux/platform_data/i2c-davinci.h> | ||
31 | #include <linux/platform_data/mmc-davinci.h> | ||
32 | #include <linux/platform_data/mtd-davinci.h> | ||
33 | #include <linux/platform_data/usb-davinci.h> | ||
29 | 34 | ||
30 | #include <asm/mach-types.h> | 35 | #include <asm/mach-types.h> |
31 | #include <asm/mach/arch.h> | 36 | #include <asm/mach/arch.h> |
32 | 37 | ||
33 | #include <mach/common.h> | 38 | #include <mach/common.h> |
34 | #include <linux/platform_data/i2c-davinci.h> | ||
35 | #include <mach/serial.h> | 39 | #include <mach/serial.h> |
36 | #include <mach/mux.h> | 40 | #include <mach/mux.h> |
37 | #include <linux/platform_data/mtd-davinci.h> | ||
38 | #include <linux/platform_data/mmc-davinci.h> | ||
39 | #include <linux/platform_data/usb-davinci.h> | ||
40 | 41 | ||
41 | #include "davinci.h" | 42 | #include "davinci.h" |
42 | 43 | ||
@@ -169,9 +170,14 @@ static struct davinci_mmc_config davinci_ntosd2_mmc_config = { | |||
169 | 170 | ||
170 | static __init void davinci_ntosd2_init(void) | 171 | static __init void davinci_ntosd2_init(void) |
171 | { | 172 | { |
173 | int ret; | ||
172 | struct clk *aemif_clk; | 174 | struct clk *aemif_clk; |
173 | struct davinci_soc_info *soc_info = &davinci_soc_info; | 175 | struct davinci_soc_info *soc_info = &davinci_soc_info; |
174 | 176 | ||
177 | ret = dm644x_gpio_register(); | ||
178 | if (ret) | ||
179 | pr_warn("%s: GPIO init failed: %d\n", __func__, ret); | ||
180 | |||
175 | aemif_clk = clk_get(NULL, "aemif"); | 181 | aemif_clk = clk_get(NULL, "aemif"); |
176 | clk_prepare_enable(aemif_clk); | 182 | clk_prepare_enable(aemif_clk); |
177 | 183 | ||