n810: omapfb and keyboard fixes

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@23898 3c298f89-4303-0410-b956-a3cf2f4a3e73

1 files changed, 17 insertions, 17 deletions

diff --git a/target/linux/omap24xx/patches-2.6.37/900-n810-battery-management.patch b/target/linux/omap24xx/patches-2.6.37/900-n810-battery-management.patch
index 1b8316b220..a85eca510d 100644
--- a/target/linux/omap24xx/patches-2.6.37/900-n810-battery-management.patch
+++ b/target/linux/omap24xx/patches-2.6.37/900-n810-battery-management.patch
@@ -12,8 +12,8 @@
 
 Index: linux-2.6.37-rc1/drivers/cbus/Kconfig
 ===================================================================
---- linux-2.6.37-rc1.orig/drivers/cbus/Kconfig	2010-11-05 17:38:14.843000000 +0100
-+++ linux-2.6.37-rc1/drivers/cbus/Kconfig	2010-11-05 17:38:14.894000001 +0100
+--- linux-2.6.37-rc1.orig/drivers/cbus/Kconfig	2010-11-06 17:28:21.821000000 +0100
++++ linux-2.6.37-rc1/drivers/cbus/Kconfig	2010-11-06 17:28:21.872000001 +0100
 @@ -94,4 +94,16 @@
  	  to Retu/Vilma. Detection state and events are exposed through
  	  sysfs.
@@ -33,8 +33,8 @@ Index: linux-2.6.37-rc1/drivers/cbus/Kconfig
  endmenu
 Index: linux-2.6.37-rc1/drivers/cbus/Makefile
 ===================================================================
---- linux-2.6.37-rc1.orig/drivers/cbus/Makefile	2010-11-05 17:38:14.834000050 +0100
-+++ linux-2.6.37-rc1/drivers/cbus/Makefile	2010-11-05 17:38:14.894000001 +0100
+--- linux-2.6.37-rc1.orig/drivers/cbus/Makefile	2010-11-06 17:28:21.812000054 +0100
++++ linux-2.6.37-rc1/drivers/cbus/Makefile	2010-11-06 17:28:21.872000001 +0100
 @@ -12,3 +12,6 @@
  obj-$(CONFIG_CBUS_TAHVO_USER)	+= tahvo-user.o
  obj-$(CONFIG_CBUS_RETU_USER)	+= retu-user.o
@@ -45,7 +45,7 @@ Index: linux-2.6.37-rc1/drivers/cbus/Makefile
 Index: linux-2.6.37-rc1/drivers/cbus/n810bm_main.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.37-rc1/drivers/cbus/n810bm_main.c	2010-11-05 17:38:14.894000001 +0100
++++ linux-2.6.37-rc1/drivers/cbus/n810bm_main.c	2010-11-06 17:28:21.872000001 +0100
 @@ -0,0 +1,397 @@
 +/*
 + *   Nokia n810 battery management
@@ -446,8 +446,8 @@ Index: linux-2.6.37-rc1/drivers/cbus/n810bm_main.c
 +MODULE_AUTHOR("Michael Buesch");
 Index: linux-2.6.37-rc1/drivers/cbus/retu.c
 ===================================================================
---- linux-2.6.37-rc1.orig/drivers/cbus/retu.c	2010-11-05 17:38:14.834000050 +0100
-+++ linux-2.6.37-rc1/drivers/cbus/retu.c	2010-11-05 17:38:14.895000001 +0100
+--- linux-2.6.37-rc1.orig/drivers/cbus/retu.c	2010-11-06 17:28:21.812000054 +0100
++++ linux-2.6.37-rc1/drivers/cbus/retu.c	2010-11-06 17:28:21.872000001 +0100
 @@ -85,10 +85,10 @@
   *
   * This function writes a value to the specified register
@@ -463,8 +463,8 @@ Index: linux-2.6.37-rc1/drivers/cbus/retu.c
  void retu_set_clear_reg_bits(int reg, u16 set, u16 clear)
 Index: linux-2.6.37-rc1/drivers/cbus/retu.h
 ===================================================================
---- linux-2.6.37-rc1.orig/drivers/cbus/retu.h	2010-11-05 17:38:14.834000050 +0100
-+++ linux-2.6.37-rc1/drivers/cbus/retu.h	2010-11-05 17:38:14.895000001 +0100
+--- linux-2.6.37-rc1.orig/drivers/cbus/retu.h	2010-11-06 17:28:21.812000054 +0100
++++ linux-2.6.37-rc1/drivers/cbus/retu.h	2010-11-06 17:28:21.872000001 +0100
 @@ -39,6 +39,7 @@
  #define RETU_REG_CC2		0x0e	/* Common control register 2 */
  #define RETU_REG_CTRL_CLR	0x0f	/* Regulator clear register */
@@ -484,9 +484,9 @@ Index: linux-2.6.37-rc1/drivers/cbus/retu.h
  int retu_request_irq(int id, void *irq_handler, unsigned long arg, char *name);
 Index: linux-2.6.37-rc1/arch/arm/mach-omap2/board-n8x0.c
 ===================================================================
---- linux-2.6.37-rc1.orig/arch/arm/mach-omap2/board-n8x0.c	2010-11-05 17:38:14.819000329 +0100
-+++ linux-2.6.37-rc1/arch/arm/mach-omap2/board-n8x0.c	2010-11-05 17:38:14.895000001 +0100
-@@ -908,6 +908,17 @@
+--- linux-2.6.37-rc1.orig/arch/arm/mach-omap2/board-n8x0.c	2010-11-06 17:28:21.796000362 +0100
++++ linux-2.6.37-rc1/arch/arm/mach-omap2/board-n8x0.c	2010-11-06 17:28:21.873000001 +0100
+@@ -899,6 +899,17 @@
  				    ARRAY_SIZE(n8x0_gpio_switches));
  }
  
@@ -504,7 +504,7 @@ Index: linux-2.6.37-rc1/arch/arm/mach-omap2/board-n8x0.c
  static void __init n8x0_init_machine(void)
  {
  	omap2420_mux_init(board_mux, OMAP_PACKAGE_ZAC);
-@@ -930,6 +941,8 @@
+@@ -925,6 +936,8 @@
  	n8x0_onenand_init();
  	n8x0_mmc_init();
  	n8x0_usb_init();
@@ -516,7 +516,7 @@ Index: linux-2.6.37-rc1/arch/arm/mach-omap2/board-n8x0.c
 Index: linux-2.6.37-rc1/drivers/cbus/lipocharge.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.37-rc1/drivers/cbus/lipocharge.c	2010-11-05 17:38:14.895000001 +0100
++++ linux-2.6.37-rc1/drivers/cbus/lipocharge.c	2010-11-06 17:28:21.873000001 +0100
 @@ -0,0 +1,63 @@
 +/*
 + *   Generic LIPO battery charger
@@ -584,7 +584,7 @@ Index: linux-2.6.37-rc1/drivers/cbus/lipocharge.c
 Index: linux-2.6.37-rc1/drivers/cbus/lipocharge.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.37-rc1/drivers/cbus/lipocharge.h	2010-11-05 17:38:14.895000001 +0100
++++ linux-2.6.37-rc1/drivers/cbus/lipocharge.h	2010-11-06 17:28:21.873000001 +0100
 @@ -0,0 +1,50 @@
 +#ifndef LIPOCHARGE_H_
 +#define LIPOCHARGE_H_
@@ -638,8 +638,8 @@ Index: linux-2.6.37-rc1/drivers/cbus/lipocharge.h
 +#endif /* LIPOCHARGE_H_ */
 Index: linux-2.6.37-rc1/drivers/cbus/tahvo.h
 ===================================================================
---- linux-2.6.37-rc1.orig/drivers/cbus/tahvo.h	2010-11-05 17:38:14.835000037 +0100
-+++ linux-2.6.37-rc1/drivers/cbus/tahvo.h	2010-11-05 17:38:14.895000001 +0100
+--- linux-2.6.37-rc1.orig/drivers/cbus/tahvo.h	2010-11-06 17:28:21.813000041 +0100
++++ linux-2.6.37-rc1/drivers/cbus/tahvo.h	2010-11-06 17:28:21.873000001 +0100
 @@ -30,8 +30,14 @@
  #define TAHVO_REG_IDR		0x01	/* Interrupt ID */
  #define TAHVO_REG_IDSR		0x02	/* Interrupt status */