omap fixes for v2.6.32-rc4

PATCH New Tony Lindgren 1 participant 8 messages Oct 14, 2009

Subsystems (3)

Arm (32-bit) Arm sub-architectures OMAP2+ support

lore

Share & tools

lore

Tony Lindgren

author maintainer

2009-10-14 00:13 UTC #0 lore raw

cover omap fixes for v2.6.32-rc4

Hi all,

Here are few omap fixes for review.

Regards,

Tony

---

Aaro Koskinen (1):

      omap: RX-51: Drop I2C-1 speed to 2200

Anuj Aggarwal (1):
omap: SDMA: Fixing bug in omap_dma_set_global_params()

Jarkko Nikula (1):
omap: McBSP: Fix incorrect receiver stop in omap_mcbsp_stop

Roel Kluin (1):
omap: Fix Unlikely(x) < y

Sanjeev Premi (1):
omap: CONFIG_ISP1301_OMAP redefined in Beagle defconfig

Teerth Reddy (1):
omap: Initialization of SDRC params on Zoom2

 arch/arm/configs/omap3_beagle_defconfig      |    1 -
 arch/arm/mach-omap2/board-rx51-peripherals.c |    2 +-
 arch/arm/mach-omap2/board-zoom2.c            |    4 +++-
 arch/arm/plat-omap/dma.c                     |   15 +++++++++------
 arch/arm/plat-omap/gpio.c                    |    2 +-
 arch/arm/plat-omap/mcbsp.c                   |    2 +-
 6 files changed, 15 insertions(+), 11 deletions(-)

Signature · 1 line

Signature

Tony Lindgren

author maintainer

2009-10-14 00:13 UTC #1 lore raw

PATCH 1/6 omap: Fix Unlikely(x) < y

From: Roel Kluin <[email protected]>

The closing parenthesis was not on the right location.

Signed-off-by Roel Kluin <[email protected]>

Signed-off-by Tony Lindgren <[email protected]>

---
 arch/arm/plat-omap/gpio.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

arch/arm/plat-omap/gpio.c +1 -1

index 71ebd7f..7c345b7 100644
@@ -373,7 +373,7 @@ static inline int gpio_valid(int gpio)
 
 static int check_gpio(int gpio)
 {
-	if (unlikely(gpio_valid(gpio)) < 0) {
+	if (unlikely(gpio_valid(gpio) < 0)) {
 		printk(KERN_ERR "omap-gpio: invalid GPIO %d\n", gpio);
 		dump_stack();
 		return -1;

Tony Lindgren

author maintainer

2009-10-14 16:55 UTC #2 lore raw

PATCH 1/6 omap: Fix Unlikely(x) < y

Quoted 3 lines · Tony Lindgren

From: Roel Kluin <[email protected]>
The closing parenthesis was not on the right location.

Looks like this one is in the -mm now, so dropping from mine.

Tony

Quoted 24 lines

Signed-off-by Roel Kluin <[email protected]>
Signed-off-by Tony Lindgren <[email protected]>
---
 arch/arm/plat-omap/gpio.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
arch/arm/plat-omap/gpio.c +1 -2
index 71ebd7f..7c345b7 100644
@@ -373,7 +373,7 @@ static inline int gpio_valid(int gpio)
 
 static int check_gpio(int gpio)
 {
-	if (unlikely(gpio_valid(gpio)) < 0) {
+	if (unlikely(gpio_valid(gpio) < 0)) {
 		printk(KERN_ERR "omap-gpio: invalid GPIO %d\n", gpio);
 		dump_stack();
 		return -1;
 
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo at vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html

Tony Lindgren

author maintainer

2009-10-14 00:13 UTC #3 lore raw

PATCH 2/6 omap: CONFIG_ISP1301_OMAP redefined in Beagle defconfig

In reply to Tony Lindgren

From: Sanjeev Premi <[email protected]>

The symbol CONFIG_ISP1301_OMAP was defined twice in the defconfig. This was causing the warning:
arch/arm/configs/omap3_beagle_defconfig:972:warning:
override: reassigning to symbol ISP1301_OMAP

Signed-off-by Sanjeev Premi <[email protected]>

Signed-off-by Tony Lindgren <[email protected]>

---
 arch/arm/configs/omap3_beagle_defconfig |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

arch/arm/configs/omap3_beagle_defconfig +0 -1

index 357d402..b3c8cce 100644
@@ -969,7 +969,6 @@ CONFIG_USB_ETH_RNDIS=y
 #
 CONFIG_USB_OTG_UTILS=y
 # CONFIG_USB_GPIO_VBUS is not set
-# CONFIG_ISP1301_OMAP is not set
 CONFIG_TWL4030_USB=y
 # CONFIG_NOP_USB_XCEIV is not set
 CONFIG_MMC=y

Tony Lindgren

author maintainer

2009-10-14 00:14 UTC #4 lore raw

PATCH 3/6 omap: SDMA: Fixing bug in omap_dma_set_global_params()

In reply to Tony Lindgren

From: Anuj Aggarwal <[email protected]>

Argument tparams was not being used to program
global register GCR.HI_THREAD_RESERVED. This patch fixes the same.

Signed-off-by Anuj Aggarwal <[email protected]>

Signed-off-by Tony Lindgren <[email protected]>

---
 arch/arm/plat-omap/dma.c |   15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)

arch/arm/plat-omap/dma.c +9 -6

index fd3154a..0eb676d 100644
@@ -829,10 +829,10 @@ EXPORT_SYMBOL(omap_free_dma);
  *
  * @param arb_rate
  * @param max_fifo_depth
- * @param tparams - Number of thereads to reserve : DMA_THREAD_RESERVE_NORM
- * 						    DMA_THREAD_RESERVE_ONET
- * 						    DMA_THREAD_RESERVE_TWOT
- * 						    DMA_THREAD_RESERVE_THREET
+ * @param tparams - Number of threads to reserve : DMA_THREAD_RESERVE_NORM
+ * 						   DMA_THREAD_RESERVE_ONET
+ * 						   DMA_THREAD_RESERVE_TWOT
+ * 						   DMA_THREAD_RESERVE_THREET
  */
 void
 omap_dma_set_global_params(int arb_rate, int max_fifo_depth, int tparams)

@@ -844,11 +844,14 @@ omap_dma_set_global_params(int arb_rate, int max_fifo_depth, int tparams)
 		return;
 	}
 
+	if (max_fifo_depth == 0)
+		max_fifo_depth = 1;
 	if (arb_rate == 0)
 		arb_rate = 1;
 
-	reg = (arb_rate & 0xff) << 16;
-	reg |= (0xff & max_fifo_depth);
+	reg = 0xff & max_fifo_depth;
+	reg |= (0x3 & tparams) << 12;
+	reg |= (arb_rate & 0xff) << 16;
 
 	dma_write(reg, GCR);
 }

Tony Lindgren

author maintainer

2009-10-14 00:14 UTC #5 lore raw

PATCH 4/6 omap: RX-51: Drop I2C-1 speed to 2200

In reply to Tony Lindgren

From: Aaro Koskinen <[email protected]>

The I2C-1 bus frequency on RX-51 should be 2.2 MHz. The speed is limited by TWL5030/GAIA; a higher speed could lead to errors on the interface. The maximum speed depends on the system clock for GAIA: 2.2 MHz (if 19.2 MHz), 2.4 MHz (26 MHz) or 2.9 MHz (38.4 MHz).

Signed-off-by Aaro Koskinen <[email protected]>

Signed-off-by Tony Lindgren <[email protected]>

---
 arch/arm/mach-omap2/board-rx51-peripherals.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

arch/arm/mach-omap2/board-rx51-peripherals.c +1 -1

index c1af532..2b0eb1b 100644
@@ -444,7 +444,7 @@ static int __init rx51_i2c_init(void)
 		rx51_twldata.vaux3 = &rx51_vaux3_cam;
 		rx51_twldata.vmmc2 = &rx51_vmmc2;
 	}
-	omap_register_i2c_bus(1, 2600, rx51_peripherals_i2c_board_info_1,
+	omap_register_i2c_bus(1, 2200, rx51_peripherals_i2c_board_info_1,
 			ARRAY_SIZE(rx51_peripherals_i2c_board_info_1));
 	omap_register_i2c_bus(2, 100, NULL, 0);
 	omap_register_i2c_bus(3, 400, NULL, 0);

Tony Lindgren

author maintainer

2009-10-14 00:14 UTC #6 lore raw

PATCH 5/6 omap: Initialization of SDRC params on Zoom2

In reply to Tony Lindgren

From: Teerth Reddy <[email protected]>

This patch initializes the correct SDRC settings required for DVFS on Zoom2.

Signed-off-by Teerth Reddy <[email protected]>

Signed-off-by Kevin Hilman <[email protected]>

Signed-off-by Tony Lindgren <[email protected]>

---
 arch/arm/mach-omap2/board-zoom2.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

arch/arm/mach-omap2/board-zoom2.c +3 -1

index b7b3220..fd3369d 100644
@@ -25,6 +25,7 @@
 #include <mach/keypad.h>
 
 #include "mmc-twl4030.h"
+#include "sdram-micron-mt46h32m32lf-6.h"
 
 /* Zoom2 has Qwerty keyboard*/
 static int board_keymap[] = {

@@ -213,7 +214,8 @@ static void __init omap_zoom2_init_irq(void)
 {
 	omap_board_config = zoom2_config;
 	omap_board_config_size = ARRAY_SIZE(zoom2_config);
-	omap2_init_common_hw(NULL, NULL);
+	omap2_init_common_hw(mt46h32m32lf6_sdrc_params,
+				 mt46h32m32lf6_sdrc_params);
 	omap_init_irq();
 	omap_gpio_init();
 }

Tony Lindgren

author maintainer

2009-10-14 00:14 UTC #7 lore raw

PATCH 6/6 omap: McBSP: Fix incorrect receiver stop in omap_mcbsp_stop

In reply to Tony Lindgren

From: Jarkko Nikula <[email protected]>

This small typo written by author causes that McBSP receiver is disabled on OMAP2430 and OMAP3430 even if only transmitter is stopped. This was noted with ALSA SoC where simultaneous recording halted if playback was stopped first.

Signed-off-by Jarkko Nikula <[email protected]>

Signed-off-by Tony Lindgren <[email protected]>

---
 arch/arm/plat-omap/mcbsp.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

arch/arm/plat-omap/mcbsp.c +1 -1

index 88ac976..e664b91 100644
@@ -595,7 +595,7 @@ void omap_mcbsp_stop(unsigned int id, int tx, int rx)
 	rx &= 1;
 	if (cpu_is_omap2430() || cpu_is_omap34xx()) {
 		w = OMAP_MCBSP_READ(io_base, RCCR);
-		w |= (tx ? RDISABLE : 0);
+		w |= (rx ? RDISABLE : 0);
 		OMAP_MCBSP_WRITE(io_base, RCCR, w);
 	}
 	w = OMAP_MCBSP_READ(io_base, SPCR1);