diff options
author | Ben Dooks <ben@ben-laptop.fluff.org> | 2010-01-04 09:32:37 +0900 |
---|---|---|
committer | Ben Dooks <ben@ben-laptop.fluff.org> | 2010-01-04 09:32:37 +0900 |
commit | c28d3bf321ec3efbb8859aa71799cca4c9d8c2bf (patch) | |
tree | 56196a3ffdd907739bc20c90aa8082c057221b1d /arch/arm/plat-s3c24xx/devs.c | |
parent | 45d28b097280a78893ce25a5d0db41e6a2717853 (diff) | |
parent | 2b542a13a94f310e718f2ed57b0f712b9ddbbbef (diff) |
ARM: Merge next-simtec
Merge branch 'next-simtec' into for-linus/samsung
Diffstat (limited to 'arch/arm/plat-s3c24xx/devs.c')
-rw-r--r-- | arch/arm/plat-s3c24xx/devs.c | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/arch/arm/plat-s3c24xx/devs.c b/arch/arm/plat-s3c24xx/devs.c index f52a92ce8dd..7f686a31e67 100644 --- a/arch/arm/plat-s3c24xx/devs.c +++ b/arch/arm/plat-s3c24xx/devs.c @@ -37,6 +37,8 @@ #include <plat/cpu.h> #include <plat/regs-spi.h> +#include <mach/ts.h> + /* Serial port registrations */ static struct resource s3c2410_uart0_resource[] = { @@ -182,6 +184,22 @@ void __init s3c24xx_fb_set_platdata(struct s3c2410fb_mach_info *pd) } } +/* Touchscreen */ +struct platform_device s3c_device_ts = { + .name = "s3c2410-ts", + .id = -1, +}; +EXPORT_SYMBOL(s3c_device_ts); + +static struct s3c2410_ts_mach_info s3c2410ts_info; + +void __init s3c24xx_ts_set_platdata(struct s3c2410_ts_mach_info *hard_s3c2410ts_info) +{ + memcpy(&s3c2410ts_info, hard_s3c2410ts_info, sizeof(struct s3c2410_ts_mach_info)); + s3c_device_ts.dev.platform_data = &s3c2410ts_info; +} +EXPORT_SYMBOL(s3c24xx_ts_set_platdata); + /* USB Device (Gadget)*/ static struct resource s3c_usbgadget_resource[] = { |