diff options
author | Philip Avinash <avinashphilip@ti.com> | 2013-08-18 01:19:01 -0400 |
---|---|---|
committer | Sekhar Nori <nsekhar@ti.com> | 2013-09-24 16:48:22 -0400 |
commit | b856671e8ce18122dce87c2b6b2aec12fb9dda14 (patch) | |
tree | a82612ce859ce4426a2e9b15b3b1570aea705786 | |
parent | 9cc1515cbd2155df8530ba8438b0b5bfdff50117 (diff) |
ARM: davinci: da8xx boards: gpio device creation
Register gpio platform device on DA8XX boards.
While at it, group related include files together.
Signed-off-by: Philip Avinash <avinashphilip@ti.com>
[nsekhar@ti.com: remove SoC specific parts from this file.
fix compile warnings]
Signed-off-by: Sekhar Nori <nsekhar@ti.com>
Signed-off-by: Lad, Prabhakar <prabhakar.csengg@gmail.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
-rw-r--r-- | arch/arm/mach-davinci/board-da830-evm.c | 14 | ||||
-rw-r--r-- | arch/arm/mach-davinci/board-da850-evm.c | 6 | ||||
-rw-r--r-- | arch/arm/mach-davinci/board-omapl138-hawk.c | 6 |
3 files changed, 22 insertions, 4 deletions
diff --git a/arch/arm/mach-davinci/board-da830-evm.c b/arch/arm/mach-davinci/board-da830-evm.c index c4bdc0a1c36e..67df6f6bee49 100644 --- a/arch/arm/mach-davinci/board-da830-evm.c +++ b/arch/arm/mach-davinci/board-da830-evm.c | |||
@@ -22,17 +22,19 @@ | |||
22 | #include <linux/mtd/partitions.h> | 22 | #include <linux/mtd/partitions.h> |
23 | #include <linux/spi/spi.h> | 23 | #include <linux/spi/spi.h> |
24 | #include <linux/spi/flash.h> | 24 | #include <linux/spi/flash.h> |
25 | #include <linux/platform_data/gpio-davinci.h> | ||
26 | #include <linux/platform_data/mtd-davinci.h> | ||
27 | #include <linux/platform_data/mtd-davinci-aemif.h> | ||
28 | #include <linux/platform_data/spi-davinci.h> | ||
29 | #include <linux/platform_data/usb-davinci.h> | ||
25 | 30 | ||
26 | #include <asm/mach-types.h> | 31 | #include <asm/mach-types.h> |
27 | #include <asm/mach/arch.h> | 32 | #include <asm/mach/arch.h> |
28 | 33 | ||
34 | #include <mach/common.h> | ||
29 | #include <mach/cp_intc.h> | 35 | #include <mach/cp_intc.h> |
30 | #include <mach/mux.h> | 36 | #include <mach/mux.h> |
31 | #include <linux/platform_data/mtd-davinci.h> | ||
32 | #include <mach/da8xx.h> | 37 | #include <mach/da8xx.h> |
33 | #include <linux/platform_data/usb-davinci.h> | ||
34 | #include <linux/platform_data/mtd-davinci-aemif.h> | ||
35 | #include <linux/platform_data/spi-davinci.h> | ||
36 | 38 | ||
37 | #define DA830_EVM_PHY_ID "" | 39 | #define DA830_EVM_PHY_ID "" |
38 | /* | 40 | /* |
@@ -591,6 +593,10 @@ static __init void da830_evm_init(void) | |||
591 | struct davinci_soc_info *soc_info = &davinci_soc_info; | 593 | struct davinci_soc_info *soc_info = &davinci_soc_info; |
592 | int ret; | 594 | int ret; |
593 | 595 | ||
596 | ret = da830_register_gpio(); | ||
597 | if (ret) | ||
598 | pr_warn("da830_evm_init: GPIO init failed: %d\n", ret); | ||
599 | |||
594 | ret = da830_register_edma(da830_edma_rsv); | 600 | ret = da830_register_edma(da830_edma_rsv); |
595 | if (ret) | 601 | if (ret) |
596 | pr_warning("da830_evm_init: edma registration failed: %d\n", | 602 | pr_warning("da830_evm_init: edma registration failed: %d\n", |
diff --git a/arch/arm/mach-davinci/board-da850-evm.c b/arch/arm/mach-davinci/board-da850-evm.c index dd1fb24521aa..df16cb88a26b 100644 --- a/arch/arm/mach-davinci/board-da850-evm.c +++ b/arch/arm/mach-davinci/board-da850-evm.c | |||
@@ -28,6 +28,7 @@ | |||
28 | #include <linux/mtd/partitions.h> | 28 | #include <linux/mtd/partitions.h> |
29 | #include <linux/mtd/physmap.h> | 29 | #include <linux/mtd/physmap.h> |
30 | #include <linux/platform_device.h> | 30 | #include <linux/platform_device.h> |
31 | #include <linux/platform_data/gpio-davinci.h> | ||
31 | #include <linux/platform_data/mtd-davinci.h> | 32 | #include <linux/platform_data/mtd-davinci.h> |
32 | #include <linux/platform_data/mtd-davinci-aemif.h> | 33 | #include <linux/platform_data/mtd-davinci-aemif.h> |
33 | #include <linux/platform_data/spi-davinci.h> | 34 | #include <linux/platform_data/spi-davinci.h> |
@@ -38,6 +39,7 @@ | |||
38 | #include <linux/spi/flash.h> | 39 | #include <linux/spi/flash.h> |
39 | #include <linux/wl12xx.h> | 40 | #include <linux/wl12xx.h> |
40 | 41 | ||
42 | #include <mach/common.h> | ||
41 | #include <mach/cp_intc.h> | 43 | #include <mach/cp_intc.h> |
42 | #include <mach/da8xx.h> | 44 | #include <mach/da8xx.h> |
43 | #include <mach/mux.h> | 45 | #include <mach/mux.h> |
@@ -1437,6 +1439,10 @@ static __init void da850_evm_init(void) | |||
1437 | { | 1439 | { |
1438 | int ret; | 1440 | int ret; |
1439 | 1441 | ||
1442 | ret = da850_register_gpio(); | ||
1443 | if (ret) | ||
1444 | pr_warn("%s: GPIO init failed: %d\n", __func__, ret); | ||
1445 | |||
1440 | ret = pmic_tps65070_init(); | 1446 | ret = pmic_tps65070_init(); |
1441 | if (ret) | 1447 | if (ret) |
1442 | pr_warn("%s: TPS65070 PMIC init failed: %d\n", __func__, ret); | 1448 | pr_warn("%s: TPS65070 PMIC init failed: %d\n", __func__, ret); |
diff --git a/arch/arm/mach-davinci/board-omapl138-hawk.c b/arch/arm/mach-davinci/board-omapl138-hawk.c index ab98c75cabb4..d0d9da0b0a94 100644 --- a/arch/arm/mach-davinci/board-omapl138-hawk.c +++ b/arch/arm/mach-davinci/board-omapl138-hawk.c | |||
@@ -13,10 +13,12 @@ | |||
13 | #include <linux/init.h> | 13 | #include <linux/init.h> |
14 | #include <linux/console.h> | 14 | #include <linux/console.h> |
15 | #include <linux/gpio.h> | 15 | #include <linux/gpio.h> |
16 | #include <linux/platform_data/gpio-davinci.h> | ||
16 | 17 | ||
17 | #include <asm/mach-types.h> | 18 | #include <asm/mach-types.h> |
18 | #include <asm/mach/arch.h> | 19 | #include <asm/mach/arch.h> |
19 | 20 | ||
21 | #include <mach/common.h> | ||
20 | #include <mach/cp_intc.h> | 22 | #include <mach/cp_intc.h> |
21 | #include <mach/da8xx.h> | 23 | #include <mach/da8xx.h> |
22 | #include <mach/mux.h> | 24 | #include <mach/mux.h> |
@@ -290,6 +292,10 @@ static __init void omapl138_hawk_init(void) | |||
290 | { | 292 | { |
291 | int ret; | 293 | int ret; |
292 | 294 | ||
295 | ret = da850_register_gpio(); | ||
296 | if (ret) | ||
297 | pr_warn("%s: GPIO init failed: %d\n", __func__, ret); | ||
298 | |||
293 | davinci_serial_init(da8xx_serial_device); | 299 | davinci_serial_init(da8xx_serial_device); |
294 | 300 | ||
295 | omapl138_hawk_config_emac(); | 301 | omapl138_hawk_config_emac(); |