omap24xx: Export certain n8x0 GPIO switches as input device

[openwrt/svn-archive/archive.git] / target / linux / omap24xx / patches-2.6.36 / 900-n810-battery-management.patch

diff --git a/target/linux/omap24xx/patches-2.6.36/900-n810-battery-management.patch b/target/linux/omap24xx/patches-2.6.36/900-n810-battery-management.patch
index c3507fba992cd3ffbe6c1a16370a5a5afb66f087..f3b8edbe86404b5455d358f4761065aa27b23ffb 100644 (file)
--- a/target/linux/omap24xx/patches-2.6.36/900-n810-battery-management.patch
+++ b/target/linux/omap24xx/patches-2.6.36/900-n810-battery-management.patch
@@ -7,8 +7,8 @@
  drivers/cbus/retu.h              |    2 
  6 files changed, 425 insertions(+), 3 deletions(-)
 
---- linux-2.6.36-rc4.orig/drivers/cbus/Kconfig
-+++ linux-2.6.36-rc4/drivers/cbus/Kconfig
+--- linux-2.6.36-rc5.orig/drivers/cbus/Kconfig
++++ linux-2.6.36-rc5/drivers/cbus/Kconfig
 @@ -94,4 +94,16 @@ config CBUS_RETU_HEADSET
          to Retu/Vilma. Detection state and events are exposed through
          sysfs.
@@ -26,15 +26,15 @@
 +        If unsure, say N.
 +
  endmenu
---- linux-2.6.36-rc4.orig/drivers/cbus/Makefile
-+++ linux-2.6.36-rc4/drivers/cbus/Makefile
+--- linux-2.6.36-rc5.orig/drivers/cbus/Makefile
++++ linux-2.6.36-rc5/drivers/cbus/Makefile
 @@ -12,3 +12,4 @@ obj-$(CONFIG_CBUS_RETU_WDT)  += retu-wdt.
  obj-$(CONFIG_CBUS_TAHVO_USER) += tahvo-user.o
  obj-$(CONFIG_CBUS_RETU_USER)  += retu-user.o
  obj-$(CONFIG_CBUS_RETU_HEADSET)       += retu-headset.o
 +obj-$(CONFIG_N810BM)          += n810bm.o
 --- /dev/null
-+++ linux-2.6.36-rc4/drivers/cbus/n810bm.c
++++ linux-2.6.36-rc5/drivers/cbus/n810bm.c
 @@ -0,0 +1,396 @@
 +/*
 + *   Nokia n810 battery management
@@ -432,8 +432,8 @@
 +MODULE_DESCRIPTION("Nokia n810 battery management");
 +MODULE_LICENSE("GPL");
 +MODULE_AUTHOR("Michael Buesch");
---- linux-2.6.36-rc4.orig/drivers/cbus/retu.c
-+++ linux-2.6.36-rc4/drivers/cbus/retu.c
+--- linux-2.6.36-rc5.orig/drivers/cbus/retu.c
++++ linux-2.6.36-rc5/drivers/cbus/retu.c
 @@ -85,10 +85,10 @@ int retu_read_reg(int reg)
   *
   * This function writes a value to the specified register
@@ -447,8 +447,8 @@
  }
  
  void retu_set_clear_reg_bits(int reg, u16 set, u16 clear)
---- linux-2.6.36-rc4.orig/drivers/cbus/retu.h
-+++ linux-2.6.36-rc4/drivers/cbus/retu.h
+--- linux-2.6.36-rc5.orig/drivers/cbus/retu.h
++++ linux-2.6.36-rc5/drivers/cbus/retu.h
 @@ -58,7 +58,7 @@
  #define       MAX_RETU_IRQ_HANDLERS   16
  
@@ -458,9 +458,9 @@
  void retu_set_clear_reg_bits(int reg, u16 set, u16 clear);
  int retu_read_adc(int channel);
  int retu_request_irq(int id, void *irq_handler, unsigned long arg, char *name);
---- linux-2.6.36-rc4.orig/arch/arm/mach-omap2/board-n8x0.c
-+++ linux-2.6.36-rc4/arch/arm/mach-omap2/board-n8x0.c
-@@ -833,6 +833,17 @@ static void __init n8x0_gpio_switches_in
+--- linux-2.6.36-rc5.orig/arch/arm/mach-omap2/board-n8x0.c
++++ linux-2.6.36-rc5/arch/arm/mach-omap2/board-n8x0.c
+@@ -906,6 +906,17 @@ static void __init n8x0_gpio_switches_in
                                    ARRAY_SIZE(n8x0_gpio_switches));
  }
  
@@ -478,7 +478,7 @@
  static void __init n8x0_init_machine(void)
  {
        omap2420_mux_init(board_mux, OMAP_PACKAGE_ZAC);
-@@ -860,6 +871,8 @@ static void __init n8x0_init_machine(voi
+@@ -933,6 +944,8 @@ static void __init n8x0_init_machine(voi
        n8x0_onenand_init();
        n8x0_mmc_init();
        n8x0_usb_init();