[PATCH 0/4] omap fixes for v2.6.37-rc1

[PATCH 0/4] omap fixes for v2.6.37-rc1

[Tony Lindgren]

Hi all,

Here are few fixes for review.

Regards,

Tony

---

Felipe Balbi (1):
      arm: omap1: devices: need to return with a value

Janusz Krzysztofik (1):
      OMAP1: camera.h: add missing include

Mathias Nyman (1):
      omap: dma: Add read-back to DMA interrupt handler to avoid spuriousinterrupts

Thomas Weber (1):
      OMAP2: Devkit8000: Fix mmc regulator failure


 arch/arm/mach-omap1/devices.c             |    5 ++---
 arch/arm/mach-omap1/include/mach/camera.h |    2 ++
 arch/arm/mach-omap2/board-devkit8000.c    |    3 ---
 arch/arm/plat-omap/dma.c                  |    2 ++
 4 files changed, 6 insertions(+), 6 deletions(-)

-- 
Signature

[PATCH 1/4] OMAP2: Devkit8000: Fix mmc regulator failure

[Tony Lindgren]

From: Thomas Weber <weber@corscience.de>

This patch fixes the following error:

>regulator: VMMC1: 1850 <--> 3150 mV at 3000 mV normal standby
>twl_reg twl_reg.6: can't register VMMC1, -22
>twl_reg: probe of twl_reg.6 failed with error -22

Signed-off-by: Thomas Weber <weber@corscience.de>
Signed-off-by: Tony Lindgren <tony@atomide.com>
---
 arch/arm/mach-omap2/board-devkit8000.c |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)

diff --git a/arch/arm/mach-omap2/board-devkit8000.c b/arch/arm/mach-omap2/board-devkit8000.c
index 067f437..53ac762 100644
--- a/arch/arm/mach-omap2/board-devkit8000.c
+++ b/arch/arm/mach-omap2/board-devkit8000.c
@@ -242,9 +242,6 @@ static int devkit8000_twl_gpio_setup(struct device *dev,
 	mmc[0].gpio_cd = gpio + 0;
 	omap2_hsmmc_init(mmc);
 
-	/* link regulators to MMC adapters */
-	devkit8000_vmmc1_supply.dev = mmc[0].dev;
-
 	/* TWL4030_GPIO_MAX + 1 == ledB, PMU_STAT (out, active low LED) */
 	gpio_leds[2].gpio = gpio + TWL4030_GPIO_MAX + 1;
 

[PATCH 2/4] omap: dma: Add read-back to DMA interrupt handler to avoid spuriousinterrupts

[Tony Lindgren]

From: Mathias Nyman <mathias.nyman@nokia.com>

Flush the writes to IRQSTATUS_L0 register in the DMA interrupt handler by reading the register
directly after write. This prevents the spurious DMA interrupts noted when using VDD_OPP 1

Signed-off-by: Mathias Nyman <mathias.nyman@nokia.com>
Acked-by: Santosh Shilimkar <Santosh.shilimkar@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
---
 arch/arm/plat-omap/dma.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/arch/arm/plat-omap/dma.c b/arch/arm/plat-omap/dma.c
index f5c5b8d..2c28265 100644
--- a/arch/arm/plat-omap/dma.c
+++ b/arch/arm/plat-omap/dma.c
@@ -1983,6 +1983,8 @@ static int omap2_dma_handle_ch(int ch)
 
 	dma_write(OMAP2_DMA_CSR_CLEAR_MASK, CSR(ch));
 	dma_write(1 << ch, IRQSTATUS_L0);
+	/* read back the register to flush the write */
+	dma_read(IRQSTATUS_L0);
 
 	/* If the ch is not chained then chain_id will be -1 */
 	if (dma_chan[ch].chain_id != -1) {

[PATCH 2/4] omap: dma: Add read-back to DMA interrupt handler to avoid spuriousinterrupts

[Tony Lindgren]

* Tony Lindgren <tony@atomide.com> [101111 16:54]:
> From: Mathias Nyman <mathias.nyman@nokia.com>
> 
> Flush the writes to IRQSTATUS_L0 register in the DMA interrupt handler by reading the register
> directly after write. This prevents the spurious DMA interrupts noted when using VDD_OPP 1

Looks like some words in the Subject: got concatenated somewhere,
fixing that.

Tony

[PATCH 3/4] OMAP1: camera.h: add missing include

[Tony Lindgren]

From: Janusz Krzysztofik <jkrzyszt@tis.icnet.pl>

#include <media/omap1_camera.h> directive is required to
compile the dependant boards (board-ams-delta for now).

Signed-off-by: Janusz Krzysztofik <jkrzyszt@tis.icnet.pl>
[tony at atomide.com: updated comments]
Signed-off-by: Tony Lindgren <tony@atomide.com>
---
 arch/arm/mach-omap1/include/mach/camera.h |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/arch/arm/mach-omap1/include/mach/camera.h b/arch/arm/mach-omap1/include/mach/camera.h
index fd54b45..847d00f 100644
--- a/arch/arm/mach-omap1/include/mach/camera.h
+++ b/arch/arm/mach-omap1/include/mach/camera.h
@@ -1,6 +1,8 @@
 #ifndef __ASM_ARCH_CAMERA_H_
 #define __ASM_ARCH_CAMERA_H_
 
+#include <media/omap1_camera.h>
+
 void omap1_camera_init(void *);
 
 static inline void omap1_set_camera_info(struct omap1_cam_platform_data *info)

[PATCH 4/4] arm: omap1: devices: need to return with a value

[Tony Lindgren]

From: Felipe Balbi <balbi@ti.com>

Get rid of the following warning:

arch/arm/mach-omap1/devices.c: In function 'omap_init_wdt':
arch/arm/mach-omap1/devices.c:298: warning: 'return' with
no value, in function returning non-void

while at that, also change:

platform_device_register();
return 0;

into:

return platform_device_register();

Signed-off-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
---
 arch/arm/mach-omap1/devices.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/arch/arm/mach-omap1/devices.c b/arch/arm/mach-omap1/devices.c
index ea0d80a..e7f9ee6 100644
--- a/arch/arm/mach-omap1/devices.c
+++ b/arch/arm/mach-omap1/devices.c
@@ -321,10 +321,9 @@ static struct platform_device omap_wdt_device = {
 static int __init omap_init_wdt(void)
 {
 	if (!cpu_is_omap16xx())
-		return;
+		return -ENODEV;
 
-	platform_device_register(&omap_wdt_device);
-	return 0;
+	return platform_device_register(&omap_wdt_device);
 }
 subsys_initcall(omap_init_wdt);
 #endif