diff options
| author | Sebastien Jan <s-jan@ti.com> | 2011-10-13 10:30:07 +0200 |
|---|---|---|
| committer | Sebastien Jan <s-jan@ti.com> | 2011-10-14 10:43:22 +0200 |
| commit | 18f79b342e0ec5479c8947db979cfbbe81b096b4 (patch) | |
| tree | deff5401b1d1712776c9b57a7009322f40f60aa3 | |
| parent | a4aec82641df76f92947843d56a14fcab76481a0 (diff) | |
[Blaze] Board 4430 sdp file and kconfig
Add the blaze touch init to the board file.
Add the flag to build the touch screen
Add the Makefile object
Signed-off-by: Dan Murphy <dmurphy@ti.com>
Conflicts:
arch/arm/mach-omap2/Kconfig
Signed-off-by: Sebastien Jan <s-jan@ti.com>
| -rw-r--r-- | arch/arm/mach-omap2/Kconfig | 1 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/Makefile | 1 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/board-4430sdp.c | 2 |
3 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig index 19d5891c48e3..7f18de5439a2 100644 --- a/arch/arm/mach-omap2/Kconfig +++ b/arch/arm/mach-omap2/Kconfig @@ -314,6 +314,7 @@ config MACH_OMAP_4430SDP select OMAP_PACKAGE_CBL select OMAP_PACKAGE_CBS select REGULATOR_FIXED_VOLTAGE + select TOUCHSCREEN_SYNTM12XX config MACH_OMAP4_PANDA bool "OMAP4 Panda Board" diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile index dff3e964e557..f80e0a3b8a5f 100644 --- a/arch/arm/mach-omap2/Makefile +++ b/arch/arm/mach-omap2/Makefile @@ -243,6 +243,7 @@ obj-$(CONFIG_MACH_IGEP0020) += board-igep0020.o \ obj-$(CONFIG_MACH_OMAP3_TOUCHBOOK) += board-omap3touchbook.o \ hsmmc.o obj-$(CONFIG_MACH_OMAP_4430SDP) += board-4430sdp.o \ + board-blaze-touch.o \ hsmmc.o \ omap_phy_internal.o obj-$(CONFIG_MACH_OMAP4_PANDA) += board-omap4panda.o \ diff --git a/arch/arm/mach-omap2/board-4430sdp.c b/arch/arm/mach-omap2/board-4430sdp.c index 4db1b3adb9b1..3162941649f4 100644 --- a/arch/arm/mach-omap2/board-4430sdp.c +++ b/arch/arm/mach-omap2/board-4430sdp.c @@ -40,6 +40,7 @@ #include <video/omap-panel-nokia-dsi.h> #include <video/omap-panel-picodlp.h> +#include "board-blaze.h" #include "mux.h" #include "hsmmc.h" #include "timer-gp.h" @@ -849,6 +850,7 @@ static void __init omap_4430sdp_init(void) omap4_i2c_init(); omap_sfh7741prox_init(); + blaze_touch_init(); platform_add_devices(sdp4430_devices, ARRAY_SIZE(sdp4430_devices)); board_serial_init(); omap4_twl6030_hsmmc_init(mmc); |