diff options
author | Roland Stigge <stigge@antcom.de> | 2012-03-13 21:15:40 +0100 |
---|---|---|
committer | Roland Stigge <stigge@antcom.de> | 2012-03-13 21:15:40 +0100 |
commit | a7e4c6a7145ee375a688e1701ae4c975d6c6419a (patch) | |
tree | 0438b5b99a88ec694bb5a91c8ca0cb52fec928f1 /arch/arm/mach-lpc32xx/common.c | |
parent | 73d43d00649985cf6509b4f99a720665f1b7c559 (diff) | |
parent | 678a0222edc9da43a22145d68647500ee85e6c04 (diff) | |
download | talos-op-linux-a7e4c6a7145ee375a688e1701ae4c975d6c6419a.tar.gz talos-op-linux-a7e4c6a7145ee375a688e1701ae4c975d6c6419a.zip |
Merge branch 'lpc32xx/drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc into lpc32xx/tmp
Conflicts:
arch/arm/mach-lpc32xx/clock.c
Diffstat (limited to 'arch/arm/mach-lpc32xx/common.c')
-rw-r--r-- | arch/arm/mach-lpc32xx/common.c | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/arch/arm/mach-lpc32xx/common.c b/arch/arm/mach-lpc32xx/common.c index 369b152896cd..6c76bb36559b 100644 --- a/arch/arm/mach-lpc32xx/common.c +++ b/arch/arm/mach-lpc32xx/common.c @@ -138,6 +138,28 @@ struct platform_device lpc32xx_rtc_device = { }; /* + * ADC support + */ +static struct resource adc_resources[] = { + { + .start = LPC32XX_ADC_BASE, + .end = LPC32XX_ADC_BASE + SZ_4K - 1, + .flags = IORESOURCE_MEM, + }, { + .start = IRQ_LPC32XX_TS_IRQ, + .end = IRQ_LPC32XX_TS_IRQ, + .flags = IORESOURCE_IRQ, + }, +}; + +struct platform_device lpc32xx_adc_device = { + .name = "lpc32xx-adc", + .id = -1, + .num_resources = ARRAY_SIZE(adc_resources), + .resource = adc_resources, +}; + +/* * Returns the unique ID for the device */ void lpc32xx_get_uid(u32 devid[4]) |