Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into fixes
+8
-3
arch/arm/mach-mx3/mach-vpr200.c
+8
-3
arch/arm/mach-mx3/mach-vpr200.c
···
257
257
.workaround = FLS_USB2_WORKAROUND_ENGCM09152,
258
258
};
259
259
260
+
static int vpr200_usbh_init(struct platform_device *pdev)
261
+
{
262
+
return mx35_initialize_usb_hw(pdev->id,
263
+
MXC_EHCI_INTERFACE_SINGLE_UNI | MXC_EHCI_INTERNAL_PHY);
264
+
}
265
+
260
266
/* USB HOST config */
261
267
static const struct mxc_usbh_platform_data usb_host_pdata __initconst = {
262
-
.portsc = MXC_EHCI_MODE_SERIAL,
263
-
.flags = MXC_EHCI_INTERFACE_SINGLE_UNI |
264
-
MXC_EHCI_INTERNAL_PHY,
268
+
.init = vpr200_usbh_init,
269
+
.portsc = MXC_EHCI_MODE_SERIAL,
265
270
};
266
271
267
272
static struct platform_device *devices[] __initdata = {
+1
-1
arch/arm/mach-mx5/board-mx53_loco.c
+1
-1
arch/arm/mach-mx5/board-mx53_loco.c
···
193
193
.wakeup = wake, \
194
194
}
195
195
196
-
static const struct gpio_keys_button loco_buttons[] __initconst = {
196
+
static struct gpio_keys_button loco_buttons[] = {
197
197
GPIO_BUTTON(MX53_LOCO_POWER, KEY_POWER, 1, "power", 0),
198
198
GPIO_BUTTON(MX53_LOCO_UI1, KEY_VOLUMEUP, 1, "volume-up", 0),
199
199
GPIO_BUTTON(MX53_LOCO_UI2, KEY_VOLUMEDOWN, 1, "volume-down", 0),
+6
-1
arch/arm/mach-mxs/clock-mx28.c
+6
-1
arch/arm/mach-mxs/clock-mx28.c
···
295
295
unsigned long diff, parent_rate, calc_rate; \
296
296
int i; \
297
297
\
298
-
parent_rate = clk_get_rate(clk->parent); \
299
298
div_max = BM_CLKCTRL_##dr##_DIV >> BP_CLKCTRL_##dr##_DIV; \
300
299
bm_busy = BM_CLKCTRL_##dr##_BUSY; \
301
300
\
302
301
if (clk->parent == &ref_xtal_clk) { \
302
+
parent_rate = clk_get_rate(clk->parent); \
303
303
div = DIV_ROUND_UP(parent_rate, rate); \
304
304
if (clk == &cpu_clk) { \
305
305
div_max = BM_CLKCTRL_CPU_DIV_XTAL >> \
···
309
309
if (div == 0 || div > div_max) \
310
310
return -EINVAL; \
311
311
} else { \
312
+
/* \
313
+
* hack alert: this block modifies clk->parent, too, \
314
+
* so the base to use it the grand parent. \
315
+
*/ \
316
+
parent_rate = clk_get_rate(clk->parent->parent); \
312
317
rate >>= PARENT_RATE_SHIFT; \
313
318
parent_rate >>= PARENT_RATE_SHIFT; \
314
319
diff = parent_rate; \
+7
arch/arm/plat-mxc/gpio.c
+7
arch/arm/plat-mxc/gpio.c
···
295
295
return 0;
296
296
}
297
297
298
+
/*
299
+
* This lock class tells lockdep that GPIO irqs are in a different
300
+
* category than their parents, so it won't report false recursion.
301
+
*/
302
+
static struct lock_class_key gpio_lock_class;
303
+
298
304
int __init mxc_gpio_init(struct mxc_gpio_port *port, int cnt)
299
305
{
300
306
int i, j;
···
317
311
__raw_writel(~0, port[i].base + GPIO_ISR);
318
312
for (j = port[i].virtual_irq_start;
319
313
j < port[i].virtual_irq_start + 32; j++) {
314
+
irq_set_lockdep_class(j, &gpio_lock_class);
320
315
irq_set_chip_and_handler(j, &gpio_irq_chip,
321
316
handle_level_irq);
322
317
set_irq_flags(j, IRQF_VALID);