diff options
author | Arnd Bergmann <arnd@arndb.de> | 2011-07-28 11:25:46 -0400 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2011-07-28 11:25:46 -0400 |
commit | 6124a4e430b64d1577438c8648c59e996d02e73e (patch) | |
tree | 49cfafad785d1c9e403a5b0d755298b9af2c260f /arch/arm/mach-lpc32xx | |
parent | 8e267f3da5f117d2f1316cf6ddf740f93f1c73aa (diff) | |
parent | 580975d7f48d7d047e22bb0f42adf7557801d8d4 (diff) |
Merge branch 'imx/dt' into next/dt
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 | 42 | ||||
-rw-r--r-- | arch/arm/mach-lpc32xx/common.h | 2 | ||||
-rw-r--r-- | arch/arm/mach-lpc32xx/include/mach/clkdev.h | 25 | ||||
-rw-r--r-- | arch/arm/mach-lpc32xx/include/mach/vmalloc.h | 2 |
5 files changed, 46 insertions, 27 deletions
diff --git a/arch/arm/mach-lpc32xx/clock.c b/arch/arm/mach-lpc32xx/clock.c index da0e6498110..1e027514096 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 ee24dc28e93..205b2dbb565 100644 --- a/arch/arm/mach-lpc32xx/common.c +++ b/arch/arm/mach-lpc32xx/common.c | |||
@@ -95,6 +95,48 @@ 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 | |||
119 | /* RTC */ | ||
120 | |||
121 | static struct resource lpc32xx_rtc_resources[] = { | ||
122 | { | ||
123 | .start = LPC32XX_RTC_BASE, | ||
124 | .end = LPC32XX_RTC_BASE + SZ_4K - 1, | ||
125 | .flags = IORESOURCE_MEM, | ||
126 | },{ | ||
127 | .start = IRQ_LPC32XX_RTC, | ||
128 | .end = IRQ_LPC32XX_RTC, | ||
129 | .flags = IORESOURCE_IRQ, | ||
130 | }, | ||
131 | }; | ||
132 | |||
133 | struct platform_device lpc32xx_rtc_device = { | ||
134 | .name = "rtc-lpc32xx", | ||
135 | .id = -1, | ||
136 | .num_resources = ARRAY_SIZE(lpc32xx_rtc_resources), | ||
137 | .resource = lpc32xx_rtc_resources, | ||
138 | }; | ||
139 | |||
98 | /* | 140 | /* |
99 | * Returns the unique ID for the device | 141 | * Returns the unique ID for the device |
100 | */ | 142 | */ |
diff --git a/arch/arm/mach-lpc32xx/common.h b/arch/arm/mach-lpc32xx/common.h index f82211fd80c..5583f52662b 100644 --- a/arch/arm/mach-lpc32xx/common.h +++ b/arch/arm/mach-lpc32xx/common.h | |||
@@ -28,6 +28,8 @@ 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; | ||
32 | extern struct platform_device lpc32xx_rtc_device; | ||
31 | 33 | ||
32 | /* | 34 | /* |
33 | * Other arch specific structures and functions | 35 | * Other arch specific structures and functions |
diff --git a/arch/arm/mach-lpc32xx/include/mach/clkdev.h b/arch/arm/mach-lpc32xx/include/mach/clkdev.h deleted file mode 100644 index 9bf0637e29c..00000000000 --- a/arch/arm/mach-lpc32xx/include/mach/clkdev.h +++ /dev/null | |||
@@ -1,25 +0,0 @@ | |||
1 | /* | ||
2 | * arch/arm/mach-lpc32xx/include/mach/clkdev.h | ||
3 | * | ||
4 | * Author: Kevin Wells <kevin.wells@nxp.com> | ||
5 | * | ||
6 | * Copyright (C) 2010 NXP Semiconductors | ||
7 | * | ||
8 | * This program is free software; you can redistribute it and/or modify | ||
9 | * it under the terms of the GNU General Public License as published by | ||
10 | * the Free Software Foundation; either version 2 of the License, or | ||
11 | * (at your option) any later version. | ||
12 | * | ||
13 | * This program is distributed in the hope that it will be useful, | ||
14 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
15 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
16 | * GNU General Public License for more details. | ||
17 | */ | ||
18 | |||
19 | #ifndef __ASM_ARCH_CLKDEV_H | ||
20 | #define __ASM_ARCH_CLKDEV_H | ||
21 | |||
22 | #define __clk_get(clk) ({ 1; }) | ||
23 | #define __clk_put(clk) do { } while (0) | ||
24 | |||
25 | #endif | ||
diff --git a/arch/arm/mach-lpc32xx/include/mach/vmalloc.h b/arch/arm/mach-lpc32xx/include/mach/vmalloc.h index d1d936c7236..720fa43a60b 100644 --- a/arch/arm/mach-lpc32xx/include/mach/vmalloc.h +++ b/arch/arm/mach-lpc32xx/include/mach/vmalloc.h | |||
@@ -19,6 +19,6 @@ | |||
19 | #ifndef __ASM_ARCH_VMALLOC_H | 19 | #ifndef __ASM_ARCH_VMALLOC_H |
20 | #define __ASM_ARCH_VMALLOC_H | 20 | #define __ASM_ARCH_VMALLOC_H |
21 | 21 | ||
22 | #define VMALLOC_END 0xF0000000 | 22 | #define VMALLOC_END 0xF0000000UL |
23 | 23 | ||
24 | #endif | 24 | #endif |