aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars-Dominik Braun <lars@6xq.net>2011-12-31 16:42:50 +0100
committerLars-Dominik Braun <lars@6xq.net>2011-12-31 16:42:50 +0100
commit5d5a999ddd5fc5164ee16a08ab3131a277c16508 (patch)
tree6503b9bc8ee0045407c544579ad153b10137929a
parentc5ec6dae72fcb0faba636110ff62298d423ef163 (diff)
downloadbuildroot-n35-5d5a999ddd5fc5164ee16a08ab3131a277c16508.zip
buildroot-n35-5d5a999ddd5fc5164ee16a08ab3131a277c16508.tar.gz
buildroot-n35-5d5a999ddd5fc5164ee16a08ab3131a277c16508.tar.bz2
Update battery status patch
-rw-r--r--linux/3.1.6/0009-n30-Add-battery-status-for-Acer-n30-n35.patch55
1 files changed, 16 insertions, 39 deletions
diff --git a/linux/3.1.6/0009-n30-Add-battery-status-for-Acer-n30-n35.patch b/linux/3.1.6/0009-n30-Add-battery-status-for-Acer-n30-n35.patch
index d9ac7e5..e466b47 100644
--- a/linux/3.1.6/0009-n30-Add-battery-status-for-Acer-n30-n35.patch
+++ b/linux/3.1.6/0009-n30-Add-battery-status-for-Acer-n30-n35.patch
@@ -1,22 +1,6 @@
-From f28776d590b9f75bde803a37ae63de66b3069c56 Mon Sep 17 00:00:00 2001
-From: Jiri Pinkava <jiri.pinkava@vscht.cz>
-Date: Mon, 24 May 2010 10:48:10 +0200
-Subject: [PATCH 09/14] n30: Add battery status for Acer n30 / n35
-
-Signed-off-by: Jiri Pinkava <jiri.pinkava@vscht.cz>
----
- arch/arm/mach-s3c2410/mach-n30.c | 7 ++
- drivers/power/Kconfig | 6 ++
- drivers/power/Makefile | 1 +
- drivers/power/n30_battery.c | 116 ++++++++++++++++++++++++++++++++++++++
- 4 files changed, 130 insertions(+), 0 deletions(-)
- create mode 100644 drivers/power/n30_battery.c
-
-diff --git a/arch/arm/mach-s3c2410/mach-n30.c b/arch/arm/mach-s3c2410/mach-n30.c
-index c492f5d..36ed810 100644
---- a/arch/arm/mach-s3c2410/mach-n30.c
-+++ b/arch/arm/mach-s3c2410/mach-n30.c
-@@ -185,6 +185,11 @@ static struct s3c2410_ts_mach_info n30_ts_cfg __initdata = {
+--- linux-3.1.6/arch/arm/mach-s3c2410/mach-n30.c.orig 2011-12-31 16:38:31.958217564 +0100
++++ linux-3.1.6/arch/arm/mach-s3c2410/mach-n30.c 2011-12-31 16:38:56.694337733 +0100
+@@ -167,6 +167,11 @@
.cfg_gpio = s3c24xx_ts_cfg_gpio,
};
@@ -28,7 +12,7 @@ index c492f5d..36ed810 100644
static struct gpio_keys_button n30_buttons[] = {
{
.gpio = S3C2410_GPF(0),
-@@ -539,6 +544,7 @@ static struct platform_device *n30_devices[] __initdata = {
+@@ -521,6 +526,7 @@
&s3c_device_sdi,
&s3c_device_adc,
&s3c_device_ts,
@@ -36,7 +20,7 @@ index c492f5d..36ed810 100644
&n30_button_device,
&n30_blue_led,
&n30_warning_led,
-@@ -559,6 +565,7 @@ static struct platform_device *n35_devices[] __initdata = {
+@@ -539,6 +545,7 @@
&s3c_device_ts,
&s3c_device_timer[0],
&n35_backlight,
@@ -44,11 +28,9 @@ index c492f5d..36ed810 100644
&n35_button_device,
&n35_blue_led,
&n35_warning_led,
-diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig
-index 0734356..0f4559c 100644
---- a/drivers/power/Kconfig
-+++ b/drivers/power/Kconfig
-@@ -76,6 +76,12 @@ config BATTERY_DS2782
+--- linux-3.1.6/drivers/power/Kconfig.orig 2011-12-31 16:38:31.958217564 +0100
++++ linux-3.1.6/drivers/power/Kconfig 2011-12-31 16:38:56.695337657 +0100
+@@ -82,6 +82,12 @@
Say Y here to enable support for the DS2782/DS2786 standalone battery
gas-gauge.
@@ -61,20 +43,18 @@ index 0734356..0f4559c 100644
config BATTERY_PMU
tristate "Apple PMU battery"
depends on PPC32 && ADB_PMU
-diff --git a/drivers/power/Makefile b/drivers/power/Makefile
-index 10143aa..ee8dad2 100644
---- a/drivers/power/Makefile
-+++ b/drivers/power/Makefile
-@@ -37,3 +37,4 @@ obj-$(CONFIG_BATTERY_S3C_ADC) += s3c_adc_battery.o
+--- linux-3.1.6/drivers/power/Makefile.orig 2011-12-21 22:00:46.000000000 +0100
++++ linux-3.1.6/drivers/power/Makefile 2011-12-31 16:38:56.695337657 +0100
+@@ -32,6 +32,7 @@
obj-$(CONFIG_CHARGER_PCF50633) += pcf50633-charger.o
obj-$(CONFIG_BATTERY_JZ4740) += jz4740-battery.o
obj-$(CONFIG_BATTERY_INTEL_MID) += intel_mid_battery.o
+obj-$(CONFIG_BATTERY_N30) += n30_battery.o
-diff --git a/drivers/power/n30_battery.c b/drivers/power/n30_battery.c
-new file mode 100644
-index 0000000..c7d34aa
---- /dev/null
-+++ b/drivers/power/n30_battery.c
+ obj-$(CONFIG_CHARGER_ISP1704) += isp1704_charger.o
+ obj-$(CONFIG_CHARGER_MAX8903) += max8903_charger.o
+ obj-$(CONFIG_CHARGER_TWL4030) += twl4030_charger.o
+--- linux-3.1.6/drivers/power/n30_battery.c.orig 2011-12-31 16:38:56.696337581 +0100
++++ linux-3.1.6/drivers/power/n30_battery.c 2011-12-31 16:38:56.696337581 +0100
@@ -0,0 +1,116 @@
+/* Acer n30 battery driver.
+ *
@@ -192,6 +172,3 @@ index 0000000..c7d34aa
+MODULE_AUTHOR("Christer Weinigel <christer@weinigel.se>");
+MODULE_DESCRIPTION("Acer n30 battery driver");
+MODULE_LICENSE("GPL");
---
-1.7.3.1
-