Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6
* 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6:
arm: omap1: devices: need to return with a value
OMAP1: camera.h: add missing include
omap: dma: Add read-back to DMA interrupt handler to avoid spuriousinterrupts
OMAP2: Devkit8000: Fix mmc regulator failure
+6
-6
+2
-3
arch/arm/mach-omap1/devices.c
+2
-3
arch/arm/mach-omap1/devices.c
···
321
321
static int __init omap_init_wdt(void)
322
322
{
323
323
if (!cpu_is_omap16xx())
324
-
return;
324
+
return -ENODEV;
325
325
326
-
platform_device_register(&omap_wdt_device);
327
-
return 0;
326
+
return platform_device_register(&omap_wdt_device);
328
327
}
329
328
subsys_initcall(omap_init_wdt);
330
329
#endif
+2
arch/arm/mach-omap1/include/mach/camera.h
+2
arch/arm/mach-omap1/include/mach/camera.h
-3
arch/arm/mach-omap2/board-devkit8000.c
-3
arch/arm/mach-omap2/board-devkit8000.c
···
242
242
mmc[0].gpio_cd = gpio + 0;
243
243
omap2_hsmmc_init(mmc);
244
244
245
-
/* link regulators to MMC adapters */
246
-
devkit8000_vmmc1_supply.dev = mmc[0].dev;
247
-
248
245
/* TWL4030_GPIO_MAX + 1 == ledB, PMU_STAT (out, active low LED) */
249
246
gpio_leds[2].gpio = gpio + TWL4030_GPIO_MAX + 1;
250
247
+2
arch/arm/plat-omap/dma.c
+2
arch/arm/plat-omap/dma.c
···
1983
1983
1984
1984
dma_write(OMAP2_DMA_CSR_CLEAR_MASK, CSR(ch));
1985
1985
dma_write(1 << ch, IRQSTATUS_L0);
1986
+
/* read back the register to flush the write */
1987
+
dma_read(IRQSTATUS_L0);
1986
1988
1987
1989
/* If the ch is not chained then chain_id will be -1 */
1988
1990
if (dma_chan[ch].chain_id != -1) {