Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm
* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] 4638/1: pxa: use PXA3xx specific macros to define clks
[ARM] remove useless setting of VM_RESERVED
+30
-8
+30
-7
arch/arm/mach-pxa/pxa3xx.c
+30
-7
arch/arm/mach-pxa/pxa3xx.c
···
150
150
local_irq_enable();
151
151
}
152
152
153
+
static const struct clkops clk_pxa3xx_cken_ops = {
154
+
.enable = clk_pxa3xx_cken_enable,
155
+
.disable = clk_pxa3xx_cken_disable,
156
+
};
157
+
153
158
static const struct clkops clk_pxa3xx_hsio_ops = {
154
159
.enable = clk_pxa3xx_cken_enable,
155
160
.disable = clk_pxa3xx_cken_disable,
156
161
.getrate = clk_pxa3xx_hsio_getrate,
157
162
};
158
163
164
+
#define PXA3xx_CKEN(_name, _cken, _rate, _delay, _dev) \
165
+
{ \
166
+
.name = _name, \
167
+
.dev = _dev, \
168
+
.ops = &clk_pxa3xx_cken_ops, \
169
+
.rate = _rate, \
170
+
.cken = CKEN_##_cken, \
171
+
.delay = _delay, \
172
+
}
173
+
174
+
#define PXA3xx_CK(_name, _cken, _ops, _dev) \
175
+
{ \
176
+
.name = _name, \
177
+
.dev = _dev, \
178
+
.ops = _ops, \
179
+
.cken = CKEN_##_cken, \
180
+
}
181
+
159
182
static struct clk pxa3xx_clks[] = {
160
-
INIT_CK("LCDCLK", LCD, &clk_pxa3xx_hsio_ops, &pxa_device_fb.dev),
161
-
INIT_CK("CAMCLK", CAMERA, &clk_pxa3xx_hsio_ops, NULL),
183
+
PXA3xx_CK("LCDCLK", LCD, &clk_pxa3xx_hsio_ops, &pxa_device_fb.dev),
184
+
PXA3xx_CK("CAMCLK", CAMERA, &clk_pxa3xx_hsio_ops, NULL),
162
185
163
-
INIT_CKEN("UARTCLK", FFUART, 14857000, 1, &pxa_device_ffuart.dev),
164
-
INIT_CKEN("UARTCLK", BTUART, 14857000, 1, &pxa_device_btuart.dev),
165
-
INIT_CKEN("UARTCLK", STUART, 14857000, 1, NULL),
186
+
PXA3xx_CKEN("UARTCLK", FFUART, 14857000, 1, &pxa_device_ffuart.dev),
187
+
PXA3xx_CKEN("UARTCLK", BTUART, 14857000, 1, &pxa_device_btuart.dev),
188
+
PXA3xx_CKEN("UARTCLK", STUART, 14857000, 1, NULL),
166
189
167
-
INIT_CKEN("I2CCLK", I2C, 32842000, 0, &pxa_device_i2c.dev),
168
-
INIT_CKEN("UDCCLK", UDC, 48000000, 5, &pxa_device_udc.dev),
190
+
PXA3xx_CKEN("I2CCLK", I2C, 32842000, 0, &pxa_device_i2c.dev),
191
+
PXA3xx_CKEN("UDCCLK", UDC, 48000000, 5, &pxa_device_udc.dev),
169
192
};
170
193
171
194
void __init pxa3xx_init_irq(void)