From ffd9dffb6c699f8aa877bc2898333a4154fe1fb9 Mon Sep 17 00:00:00 2001 From: Vasily Khoruzhick Date: Thu, 18 Feb 2010 18:32:27 +0200 Subject: [PATCH] --- yaml --- r: 187677 b: refs/heads/master c: 0fe1309b4db2a994d0b8347cea034cf58cb4b312 h: refs/heads/master i: 187675: 4abdd17c70b209e755d1299d17349d667195bbb9 v: v3 --- [refs] | 2 +- trunk/arch/arm/plat-s3c24xx/devs.c | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 0f20e0bd4f78..ea19759e6d75 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7965b214bfbe0e6b3dc843cd1d639dc2711ff86e +refs/heads/master: 0fe1309b4db2a994d0b8347cea034cf58cb4b312 diff --git a/trunk/arch/arm/plat-s3c24xx/devs.c b/trunk/arch/arm/plat-s3c24xx/devs.c index 986d4e5408f5..8c6de1c9968f 100644 --- a/trunk/arch/arm/plat-s3c24xx/devs.c +++ b/trunk/arch/arm/plat-s3c24xx/devs.c @@ -158,9 +158,27 @@ void __init s3c24xx_fb_set_platdata(struct s3c2410fb_mach_info *pd) } /* Touchscreen */ + +static struct resource s3c_ts_resource[] = { + [0] = { + .start = S3C24XX_PA_ADC, + .end = S3C24XX_PA_ADC + S3C24XX_SZ_ADC - 1, + .flags = IORESOURCE_MEM, + }, + [1] = { + .start = IRQ_TC, + .end = IRQ_TC, + .flags = IORESOURCE_IRQ, + }, + +}; + struct platform_device s3c_device_ts = { .name = "s3c2410-ts", .id = -1, + .dev.parent = &s3c_device_adc.dev, + .num_resources = ARRAY_SIZE(s3c_ts_resource), + .resource = s3c_ts_resource, }; EXPORT_SYMBOL(s3c_device_ts);