Fixed patches: madde.patch bq27x00_battery.patch

diff --git a/kernel-power-2.6.28/debian/madde.patch b/kernel-power-2.6.28/debian/madde.patch
index 0b25158..1a6c575 100644 (file)
--- a/kernel-power-2.6.28/debian/madde.patch
+++ b/kernel-power-2.6.28/debian/madde.patch
@@ -1,17 +1,30 @@
---- kernel-power-2.6.28/debian/control 2011-04-16 06:23:23.000000000 +0200
-+++ kernel-power-2.6.28/debian/control 2011-04-16 06:24:33.000000000 +0200
+diff --git kernel-power-2.6.28/debian/control kernel-power-2.6.28/debian/control
+index 9b9e930..578e377 100644
+--- kernel-power-2.6.28/debian/control
++++ kernel-power-2.6.28/debian/control
 @@ -3,7 +3,7 @@ Section: utils
  Priority: optional
- Maintainer: Thomas Tanner <maemo@tannerlab.com>
+ Maintainer: Pali Rohár <pali.rohar@gmail.com>
  XSBC-Bugtracker: https://garage.maemo.org/tracker/?group_id=1528
 -Build-Depends: debhelper (>= 4.0.0), quilt, sdk-fiasco-gen, libncurses5-dev, sharutils
 +Build-Depends: debhelper (>= 4.0.0), quilt, libncurses5-dev, sharutils
  Standards-Version: 3.8.0
  
  Package: kernel-power-flasher
---- kernel-power-2.6.28/debian/rules   2011-04-16 03:24:39.000000000 +0200
-+++ kernel-power-2.6.28/debian/rules   2011-04-16 03:34:38.000000000 +0200
-@@ -96,7 +96,10 @@ install-kernel:
+diff --git kernel-power-2.6.28/debian/patches/series kernel-power-2.6.28/debian/patches/series
+index 4ae2339..93a7c2d 100644
+--- kernel-power-2.6.28/debian/patches/series
++++ kernel-power-2.6.28/debian/patches/series
+@@ -35,3 +35,4 @@ l2cap_parent.patch
+ wl12xx-rx-fix.diff
+ vanilla-2.6.28-anti-io-stalling.patch
+ joikuspot.diff
++madde.patch
+diff --git kernel-power-2.6.28/debian/rules kernel-power-2.6.28/debian/rules
+index ec876fa..e6f0a1c 100755
+--- kernel-power-2.6.28/debian/rules
++++ kernel-power-2.6.28/debian/rules
+@@ -101,7 +101,10 @@ install-kernel:
        dh_installdirs
  
        install -d -m 755 $(CURDIR)/debian/$(KERNEL_PACKAGE)/boot
@@ -23,7 +36,7 @@
                        -k $(BUILDTMP)/arch/arm/boot/zImage -v $(RELEASE)
        chmod 644 $(CURDIR)/debian/$(KERNEL_PACKAGE)/boot/zImage-$(RELEASE).fiasco
  
-@@ -125,12 +128,12 @@ install-headers:
+@@ -134,12 +137,12 @@ install-headers:
        dh_installdirs
  
        install -d -m755 $(CURDIR)/debian/$(HEADERS_PACKAGE)/usr/src/$(HEADERS_PACKAGE)/
@@ -41,7 +54,7 @@
                $(CURDIR)/debian/$(HEADERS_PACKAGE)/usr/src/$(HEADERS_PACKAGE)/include/config/kernel.release
        cd $(KSRC) && \
                find arch/$(ARCH) $(foreach dir,$(INCLUDE_HEADERS),include/$(dir)) -name '*.h' \
-@@ -229,9 +232,6 @@ endif
+@@ -238,9 +241,6 @@ endif
        dh_installchangelogs -s
        dh_installdocs -s
        dh_install -s
@@ -51,43 +64,3 @@
        dh_compress -s
        dh_fixperms -s --exclude /usr/src/kernel-headers
        dh_installdeb -s
---- kernel-power-2.6.28/debian/patches/series  2011-04-16 06:19:32.000000000 +0200
-+++ kernel-power-2.6.28/debian/patches/series  2011-04-16 06:19:41.000000000 +0200
-@@ -35,3 +35,4 @@ l2cap_parent.patch
- wl12xx-rx-fix.diff
- vanilla-2.6.28-anti-io-stalling.patch
- joikuspot.diff
-+madde.patch
---- kernel-power-2.6.28/debian/patches/madde.patch     2011-04-15 15:30:29.223356000 +0200
-+++ kernel-power-2.6.28/debian/patches/madde.patch     2011-04-16 06:19:19.000000000 +0200
-@@ -0,0 +1,30 @@
-+--- kernel-power-2.6.28/Makefile      2011-01-23 14:06:07.000000000 +0100
-++++ kernel-power-2.6.28/Makefile      2011-01-23 14:06:53.000000000 +0100
-+@@ -4,6 +4,8 @@ SUBLEVEL = 28
-+ EXTRAVERSION = .10power
-+ NAME = Erotic Pickled Herring
-+ 
-++export PATH := /usr/bin:$(HOME)/.madde/0.6.72/toolchains/arm-2007q3-51sb6-gdb701-arm-none-linux-gnueabi_linux/bin:$(PATH)
-++
-+ # *DOCUMENTATION*
-+ # To see a list of typical targets execute "make help"
-+ # More info can be located in ./README
-+@@ -196,7 +198,7 @@ SUBARCH := arm
-+ # Note: Some architectures assign CROSS_COMPILE in their arch/*/Makefile
-+ export KBUILD_BUILDHOST := $(SUBARCH)
-+ ARCH         ?= $(SUBARCH)
-+-CROSS_COMPILE        ?= arm-linux-
-++CROSS_COMPILE        ?= arm-none-linux-gnueabi-
-+ 
-+ # Architecture as present in compile.h
-+ UTS_MACHINE  := $(ARCH)
-+--- kernel-power-2.6.28/scripts/unifdef.c     2011-01-23 18:22:03.000000000 +0100
-++++ kernel-power-2.6.28/scripts/unifdef.c     2011-01-23 18:22:17.000000000 +0100
-+@@ -206,6 +206,7 @@
-+ static void             error(const char *);
-+ static int              findsym(const char *);
-+ static void             flushline(bool);
-++#define getline _getline
-+ static Linetype         getline(void);
-+ static Linetype         ifeval(const char **);
-+ static void             ignoreoff(void);

diff --git a/kernel-power-2.6.28/debian/patches/bq27x00_battery.patch b/kernel-power-2.6.28/debian/patches/bq27x00_battery.patch
index bced80b..b46ed98 100644 (file)
--- a/kernel-power-2.6.28/debian/patches/bq27x00_battery.patch
+++ b/kernel-power-2.6.28/debian/patches/bq27x00_battery.patch
@@ -23,7 +23,7 @@
  #include <linux/module.h>
  #include <linux/param.h>
  #include <linux/jiffies.h>
-@@ -24,144 +33,410 @@
+@@ -24,144 +33,407 @@
  #include <linux/power_supply.h>
  #include <linux/idr.h>
  #include <linux/i2c.h>
@@ -85,7 +85,6 @@
 +      int time_to_empty_avg;
 +      int time_to_full;
 +      int charge_full;
-+      int cycle_count;
 +      int capacity;
 +      int flags;
 +
@@ -130,7 +129,6 @@
 +      POWER_SUPPLY_PROP_CHARGE_FULL,
 +      POWER_SUPPLY_PROP_CHARGE_NOW,
 +      POWER_SUPPLY_PROP_CHARGE_FULL_DESIGN,
-+      POWER_SUPPLY_PROP_CYCLE_COUNT,
  };
  
 +static unsigned int poll_interval = 360;
@@ -319,7 +317,6 @@
 +              cache.time_to_empty_avg = bq27x00_battery_read_time(di, BQ27x00_REG_TTECP);
 +              cache.time_to_full = bq27x00_battery_read_time(di, BQ27x00_REG_TTF);
 +              cache.charge_full = bq27x00_battery_read_lmd(di);
-+              cache.cycle_count = bq27x00_battery_read_cyct(di);
 +
 +              if (!is_bq27500)
 +                      cache.current_now = bq27x00_read(di, BQ27x00_REG_AI, false);
@@ -500,7 +497,7 @@
  }
  
  #define to_bq27x00_device_info(x) container_of((x), \
-@@ -171,89 +446,164 @@ static int bq27x00_battery_get_property(
+@@ -171,89 +443,161 @@ static int bq27x00_battery_get_property(
                                        enum power_supply_property psp,
                                        union power_supply_propval *val)
  {
@@ -563,9 +560,6 @@
 +      case POWER_SUPPLY_PROP_CHARGE_FULL_DESIGN:
 +              ret = bq27x00_simple_value(di->charge_design_full, val);
 +              break;
-+      case POWER_SUPPLY_PROP_CYCLE_COUNT:
-+              ret = bq27x00_simple_value(di->cache.cycle_count, val);
-+              break;
 +      case POWER_SUPPLY_PROP_ENERGY_NOW:
 +              ret = bq27x00_battery_energy(di, val);
                break;
@@ -707,7 +701,7 @@
        int num;
        int retval = 0;
  
-@@ -267,7 +617,7 @@ static int bq27200_battery_probe(struct 
+@@ -267,7 +611,7 @@ static int bq27200_battery_probe(struct 
        if (retval < 0)
                return retval;
  
@@ -716,7 +710,7 @@
        if (!name) {
                dev_err(&client->dev, "failed to allocate device name\n");
                retval = -ENOMEM;
-@@ -280,37 +630,20 @@ static int bq27200_battery_probe(struct 
+@@ -280,37 +624,20 @@ static int bq27200_battery_probe(struct 
                retval = -ENOMEM;
                goto batt_failed_2;
        }
@@ -760,7 +754,7 @@
  batt_failed_3:
        kfree(di);
  batt_failed_2:
-@@ -323,11 +656,11 @@ batt_failed_1:
+@@ -323,11 +650,11 @@ batt_failed_1:
        return retval;
  }
  
@@ -774,7 +768,7 @@
  
        kfree(di->bat.name);
  
-@@ -340,31 +673,180 @@ static int bq27200_battery_remove(struct
+@@ -340,31 +667,180 @@ static int bq27200_battery_remove(struct
        return 0;
  }
  
@@ -968,7 +962,7 @@
  
        return ret;
  }
-@@ -372,7 +854,8 @@ module_init(bq27x00_battery_init);
+@@ -372,7 +848,8 @@ module_init(bq27x00_battery_init);
  
  static void __exit bq27x00_battery_exit(void)
  {