git-pull request for omap-fixes for 2.6.28

Hi Russell,

I have three trivial fixes for 2.6.28 that I'll post as a reply to this thread.

Following is also the pull request for you assuming you don't have issues with these patches.

Regards,

Tony

The following changes since commit 13d428afc007fcfcd6deeb215618f54cf9c0cae6:
Linus Torvalds (1):

        Linux 2.6.28-rc6

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git omap-fixes

Amit Kucheria (1):
ARM: OMAP: Typo fix for clock_allow_idle

Tero Kristo (1):
ARM: OMAP: Fixes for suspend / resume GPIO wake-up handling

Tony Lindgren (1):
ARM: OMAP: Remove broken LCD driver for SX1

 arch/arm/plat-omap/gpio.c            |    5 +-
 arch/arm/plat-omap/include/mach/pm.h |    2 +-
 drivers/video/omap/Makefile          |    1 -
 drivers/video/omap/lcd_sx1.c         |  327 ----------------------------------
 4 files changed, 4 insertions(+), 331 deletions(-)
 delete mode 100644 drivers/video/omap/lcd_sx1.c

From: Tony Lindgren <[email protected]>
Date: Mon, 24 Nov 2008 18:11:16 -0800
Subject: [PATCH] ARM: OMAP: Remove broken LCD driver for SX1

Recently the omap McBSP code was cleaned up to get rid of direct McBSP register tinkering by the drivers. Looks like lcd_sx1.c never got converted, and now it breaks builds.

It seems the lcd_sx1.c driver is attempting SPI mode, but doing it in a different way compared to omap_mcbsp_set_spi_mode().

Remove the broken driver, patches welcome to add it back when done properly by patching both mcbsp.c and lcd_sx1.c.

---
 drivers/video/omap/Makefile  |    1 -
 drivers/video/omap/lcd_sx1.c |  327 ------------------------------------------
 2 files changed, 0 insertions(+), 328 deletions(-)
 delete mode 100644 drivers/video/omap/lcd_sx1.c

index 99da8b6..ed13889 100644
@@ -23,7 +23,6 @@ objs-y$(CONFIG_MACH_OMAP_PALMZ71) += lcd_palmz71.o
 objs-$(CONFIG_ARCH_OMAP16XX)$(CONFIG_MACH_OMAP_INNOVATOR) += lcd_inn1610.o
 objs-$(CONFIG_ARCH_OMAP15XX)$(CONFIG_MACH_OMAP_INNOVATOR) += lcd_inn1510.o
 objs-y$(CONFIG_MACH_OMAP_OSK) += lcd_osk.o
-objs-y$(CONFIG_MACH_SX1) += lcd_sx1.o
 
 omapfb-objs := $(objs-yy)
 

1.5.6.rc3.21.g8c6b5

From: Amit Kucheria <[email protected]>
Date: Tue, 25 Nov 2008 15:11:12 -0800
Subject: [PATCH] ARM: OMAP: Typo fix for clock_allow_idle

The second clk_deny_idle instance should be clk_allow_idle instead.

---
 arch/arm/plat-omap/include/mach/pm.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

index 768eb6e..2a9c27a 100644
@@ -128,7 +128,7 @@ void clk_deny_idle(struct clk *clk);
  * clk_allow_idle - Counters previous clk_deny_idle
  * @clk: clock signal handle
  */
-void clk_deny_idle(struct clk *clk);
+void clk_allow_idle(struct clk *clk);
 
 extern void omap_pm_idle(void);
 extern void omap_pm_suspend(void);

1.5.6.rc3.21.g8c6b5

From: Tero Kristo <[email protected]>
Date: Wed, 26 Nov 2008 14:35:16 -0800
Subject: [PATCH] ARM: OMAP: Fixes for suspend / resume GPIO wake-up handling

Use the correct wake-up enable register, and make it work with 34xx also.

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

index 8679fbc..424049d 100644
@@ -101,6 +101,7 @@
 #define OMAP24XX_GPIO_IRQSTATUS2	0x0028
 #define OMAP24XX_GPIO_IRQENABLE2	0x002c
 #define OMAP24XX_GPIO_IRQENABLE1	0x001c
+#define OMAP24XX_GPIO_WAKE_EN		0x0020
 #define OMAP24XX_GPIO_CTRL		0x0030
 #define OMAP24XX_GPIO_OE		0x0034
 #define OMAP24XX_GPIO_DATAIN		0x0038

@@ -1551,7 +1552,7 @@ static int omap_gpio_suspend(struct sys_device *dev, pm_message_t mesg)
 #endif
 #if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX)
 		case METHOD_GPIO_24XX:
-			wake_status = bank->base + OMAP24XX_GPIO_SETWKUENA;
+			wake_status = bank->base + OMAP24XX_GPIO_WAKE_EN;
 			wake_clear = bank->base + OMAP24XX_GPIO_CLEARWKUENA;
 			wake_set = bank->base + OMAP24XX_GPIO_SETWKUENA;
 			break;

@@ -1574,7 +1575,7 @@ static int omap_gpio_resume(struct sys_device *dev)
 {
 	int i;
 
-	if (!cpu_is_omap24xx() && !cpu_is_omap16xx())
+	if (!cpu_class_is_omap2() && !cpu_is_omap16xx())
 		return 0;
 
 	for (i = 0; i < gpio_bank_count; i++) {

1.5.6.rc3.21.g8c6b5