omap fixes for v2.6.37-rc1
Subsystems (4)
Tony Lindgren
maintainercover omap fixes for v2.6.37-rc1
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 · 1 line
Signature
Tony Lindgren
maintainerPATCH 1/4 OMAP2: Devkit8000: Fix mmc regulator failure
From: Thomas Weber <[email protected]>
This patch fixes the following error:
Quoted 3 lines
regulator: VMMC1: 1850 <--> 3150 mV at 3000 mV normal standby
twl_regtwl_reg.6: can't register VMMC1, -22twl_reg: probe of twl_reg.6 failed with error -22
--- arch/arm/mach-omap2/board-devkit8000.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-)
arch/arm/mach-omap2/board-devkit8000.c +0 -3
@@ -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 ;
Tony Lindgren
maintainerPATCH 2/4 omap: dma: Add read-back to DMA interrupt handler to avoid spuriousinterrupts
In reply to Tony LindgrenFrom: Mathias Nyman <[email protected]>
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
--- arch/arm/plat-omap/dma.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)
arch/arm/plat-omap/dma.c +2 -0
@@ -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 ) {
Tony Lindgren
maintainerPATCH 2/4 omap: dma: Add read-back to DMA interrupt handler to avoid spuriousinterrupts
Quoted 4 lines · Tony Lindgren
From: Mathias Nyman <[email protected]>
Flush the writes to
IRQSTATUS_L0register in the DMA interrupt handler by reading the register directly after write. This prevents the spurious DMA interrupts noted when usingVDD_OPP1
Looks like some words in the Subject: got concatenated somewhere, fixing that.
Tony
Tony Lindgren
maintainerPATCH 3/4 OMAP1: camera.h: add missing include
In reply to Tony LindgrenFrom: Janusz Krzysztofik <[email protected]>
#include <media/omap1_camera.h> directive is required to compile the dependant boards (board-ams-delta for now).
--- arch/arm/mach-omap1/include/mach/camera.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)
arch/arm/mach-omap1/include/mach/camera.h +2 -0
@@ -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)
Tony Lindgren
maintainerPATCH 4/4 arm: omap1: devices: need to return with a value
In reply to Tony LindgrenFrom: Felipe Balbi <[email protected]>
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();
--- arch/arm/mach-omap1/devices.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-)
arch/arm/mach-omap1/devices.c +2 -3
@@ -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