aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/xburst/patches-2.6.36/020-qi_lb60-add-gpio-charger.patch
diff options
context:
space:
mode:
authorLars-Peter Clausen <lars@metafoo.de>2010-10-13 01:55:44 +0000
committerLars-Peter Clausen <lars@metafoo.de>2010-10-13 01:55:44 +0000
commit6144179d612a4b1e127f30db8f2817c6e5f6712b (patch)
tree1416e7daeb47700eb1353d37aa5e621b57591490 /target/linux/xburst/patches-2.6.36/020-qi_lb60-add-gpio-charger.patch
parent9d9f68c6511d12f8f015d1a57adcc881210d1cb6 (diff)
downloadupstream-6144179d612a4b1e127f30db8f2817c6e5f6712b.tar.gz
upstream-6144179d612a4b1e127f30db8f2817c6e5f6712b.tar.bz2
upstream-6144179d612a4b1e127f30db8f2817c6e5f6712b.zip
Add 2.6.36 patches
SVN-Revision: 23421
Diffstat (limited to 'target/linux/xburst/patches-2.6.36/020-qi_lb60-add-gpio-charger.patch')
-rw-r--r--target/linux/xburst/patches-2.6.36/020-qi_lb60-add-gpio-charger.patch57
1 files changed, 57 insertions, 0 deletions
diff --git a/target/linux/xburst/patches-2.6.36/020-qi_lb60-add-gpio-charger.patch b/target/linux/xburst/patches-2.6.36/020-qi_lb60-add-gpio-charger.patch
new file mode 100644
index 0000000000..ae88e9f0d7
--- /dev/null
+++ b/target/linux/xburst/patches-2.6.36/020-qi_lb60-add-gpio-charger.patch
@@ -0,0 +1,57 @@
+From 11f9a327e3dfc62773cfd4b3c93af19e7132cc7a Mon Sep 17 00:00:00 2001
+From: Lars-Peter Clausen <lars@metafoo.de>
+Date: Sat, 17 Jul 2010 11:16:29 +0000
+Subject: [PATCH] MIPS: JZ4740: qi_lb60: Add gpio-charger device
+
+Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
+---
+ arch/mips/jz4740/board-qi_lb60.c | 24 ++++++++++++++++++++++++
+ 1 files changed, 24 insertions(+), 0 deletions(-)
+
+--- a/arch/mips/jz4740/board-qi_lb60.c
++++ b/arch/mips/jz4740/board-qi_lb60.c
+@@ -23,6 +23,7 @@
+ #include <linux/spi/spi_gpio.h>
+ #include <linux/power_supply.h>
+ #include <linux/power/jz4740-battery.h>
++#include <linux/power/gpio-charger.h>
+
+ #include <asm/mach-jz4740/jz4740_fb.h>
+ #include <asm/mach-jz4740/jz4740_mmc.h>
+@@ -396,6 +397,28 @@ static struct platform_device qi_lb60_pw
+ },
+ };
+
++/* charger */
++static char *qi_lb60_batteries[] = {
++ "battery",
++};
++
++static struct gpio_charger_platform_data qi_lb60_charger_pdata = {
++ .name = "usb",
++ .type = POWER_SUPPLY_TYPE_USB,
++ .gpio = JZ_GPIO_PORTD(28),
++ .gpio_active_low = 1,
++ .batteries = qi_lb60_batteries,
++ .num_batteries = ARRAY_SIZE(qi_lb60_batteries),
++};
++
++static struct platform_device qi_lb60_charger_device = {
++ .name = "gpio-charger",
++ .dev = {
++ .platform_data = &qi_lb60_charger_pdata,
++ },
++};
++
++
+ static struct platform_device *jz_platform_devices[] __initdata = {
+ &jz4740_udc_device,
+ &jz4740_mmc_device,
+@@ -410,6 +433,7 @@ static struct platform_device *jz_platfo
+ &jz4740_adc_device,
+ &qi_lb60_gpio_keys,
+ &qi_lb60_pwm_beeper,
++ &qi_lb60_charger_device,
+ };
+
+ static void __init board_gpio_setup(void)