diff options
author | Wolfram Sang <w.sang@pengutronix.de> | 2011-03-21 11:14:43 -0400 |
---|---|---|
committer | Wolfram Sang <w.sang@pengutronix.de> | 2011-07-12 04:57:13 -0400 |
commit | 7db2b37751caa2f17b026223a382eca07c90c575 (patch) | |
tree | cc412947f294999974017c6acb4b5c02f85c6315 /arch/arm/mach-lpc32xx | |
parent | 620917de59eeb934b9f8cf35cc2d95c1ac8ed0fc (diff) |
arm: lpc32xx: add tsc-device
Fix the clock name, too.
Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
Tested-by: Kevin Wells <Kevin.wells@nxp.com>
Diffstat (limited to 'arch/arm/mach-lpc32xx')
-rw-r--r-- | arch/arm/mach-lpc32xx/clock.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-lpc32xx/common.c | 21 | ||||
-rw-r--r-- | arch/arm/mach-lpc32xx/common.h | 1 |
3 files changed, 23 insertions, 1 deletions
diff --git a/arch/arm/mach-lpc32xx/clock.c b/arch/arm/mach-lpc32xx/clock.c index da0e6498110a..1e027514096d 100644 --- a/arch/arm/mach-lpc32xx/clock.c +++ b/arch/arm/mach-lpc32xx/clock.c | |||
@@ -1077,7 +1077,7 @@ static struct clk_lookup lookups[] = { | |||
1077 | _REGISTER_CLOCK("lpc32xx-nand.0", "nand_ck", clk_nand) | 1077 | _REGISTER_CLOCK("lpc32xx-nand.0", "nand_ck", clk_nand) |
1078 | _REGISTER_CLOCK("tbd", "i2s0_ck", clk_i2s0) | 1078 | _REGISTER_CLOCK("tbd", "i2s0_ck", clk_i2s0) |
1079 | _REGISTER_CLOCK("tbd", "i2s1_ck", clk_i2s1) | 1079 | _REGISTER_CLOCK("tbd", "i2s1_ck", clk_i2s1) |
1080 | _REGISTER_CLOCK("lpc32xx-ts", NULL, clk_tsc) | 1080 | _REGISTER_CLOCK("ts-lpc32xx", NULL, clk_tsc) |
1081 | _REGISTER_CLOCK("dev:mmc0", "MCLK", clk_mmc) | 1081 | _REGISTER_CLOCK("dev:mmc0", "MCLK", clk_mmc) |
1082 | _REGISTER_CLOCK("lpc-net.0", NULL, clk_net) | 1082 | _REGISTER_CLOCK("lpc-net.0", NULL, clk_net) |
1083 | _REGISTER_CLOCK("dev:clcd", NULL, clk_lcd) | 1083 | _REGISTER_CLOCK("dev:clcd", NULL, clk_lcd) |
diff --git a/arch/arm/mach-lpc32xx/common.c b/arch/arm/mach-lpc32xx/common.c index ee24dc28e93e..6880b47a9ae5 100644 --- a/arch/arm/mach-lpc32xx/common.c +++ b/arch/arm/mach-lpc32xx/common.c | |||
@@ -95,6 +95,27 @@ struct platform_device lpc32xx_i2c2_device = { | |||
95 | }, | 95 | }, |
96 | }; | 96 | }; |
97 | 97 | ||
98 | /* TSC (Touch Screen Controller) */ | ||
99 | |||
100 | static struct resource lpc32xx_tsc_resources[] = { | ||
101 | { | ||
102 | .start = LPC32XX_ADC_BASE, | ||
103 | .end = LPC32XX_ADC_BASE + SZ_4K - 1, | ||
104 | .flags = IORESOURCE_MEM, | ||
105 | }, { | ||
106 | .start = IRQ_LPC32XX_TS_IRQ, | ||
107 | .end = IRQ_LPC32XX_TS_IRQ, | ||
108 | .flags = IORESOURCE_IRQ, | ||
109 | }, | ||
110 | }; | ||
111 | |||
112 | struct platform_device lpc32xx_tsc_device = { | ||
113 | .name = "ts-lpc32xx", | ||
114 | .id = -1, | ||
115 | .num_resources = ARRAY_SIZE(lpc32xx_tsc_resources), | ||
116 | .resource = lpc32xx_tsc_resources, | ||
117 | }; | ||
118 | |||
98 | /* | 119 | /* |
99 | * Returns the unique ID for the device | 120 | * Returns the unique ID for the device |
100 | */ | 121 | */ |
diff --git a/arch/arm/mach-lpc32xx/common.h b/arch/arm/mach-lpc32xx/common.h index f82211fd80c1..e81243c79f77 100644 --- a/arch/arm/mach-lpc32xx/common.h +++ b/arch/arm/mach-lpc32xx/common.h | |||
@@ -28,6 +28,7 @@ extern struct platform_device lpc32xx_watchdog_device; | |||
28 | extern struct platform_device lpc32xx_i2c0_device; | 28 | extern struct platform_device lpc32xx_i2c0_device; |
29 | extern struct platform_device lpc32xx_i2c1_device; | 29 | extern struct platform_device lpc32xx_i2c1_device; |
30 | extern struct platform_device lpc32xx_i2c2_device; | 30 | extern struct platform_device lpc32xx_i2c2_device; |
31 | extern struct platform_device lpc32xx_tsc_device; | ||
31 | 32 | ||
32 | /* | 33 | /* |
33 | * Other arch specific structures and functions | 34 | * Other arch specific structures and functions |