* [PATCH] MIPS: JZ4740: qi_lb60: Add gpio-charger device @ 2011-02-08 2:43 Lars-Peter Clausen 2011-02-08 2:43 ` [PATCH] MIPS: JZ4740: Set nand ecc offsets for the qi_lb60 board Lars-Peter Clausen 2011-03-25 12:30 ` [PATCH] MIPS: JZ4740: qi_lb60: Add gpio-charger device Ralf Baechle 0 siblings, 2 replies; 4+ messages in thread From: Lars-Peter Clausen @ 2011-02-08 2:43 UTC (permalink / raw) To: Ralf Baechle; +Cc: linux-mips, linux-kernel, Lars-Peter Clausen Register the gpio-charger device which reports whether device is currently charging or not. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> --- arch/mips/jz4740/board-qi_lb60.c | 24 ++++++++++++++++++++++++ 1 files changed, 24 insertions(+), 0 deletions(-) diff --git a/arch/mips/jz4740/board-qi_lb60.c b/arch/mips/jz4740/board-qi_lb60.c index 3e33264..e3f21ba 100644 --- 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> @@ -395,6 +396,28 @@ static struct platform_device qi_lb60_pwm_beeper = { }, }; +/* 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, + .supplied_to = qi_lb60_batteries, + .num_supplicants = 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, @@ -409,6 +432,7 @@ static struct platform_device *jz_platform_devices[] __initdata = { &jz4740_adc_device, &qi_lb60_gpio_keys, &qi_lb60_pwm_beeper, + &qi_lb60_charger_device, }; static void __init board_gpio_setup(void) -- 1.7.2.3 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH] MIPS: JZ4740: Set nand ecc offsets for the qi_lb60 board 2011-02-08 2:43 [PATCH] MIPS: JZ4740: qi_lb60: Add gpio-charger device Lars-Peter Clausen @ 2011-02-08 2:43 ` Lars-Peter Clausen 2011-03-25 12:31 ` Ralf Baechle 2011-03-25 12:30 ` [PATCH] MIPS: JZ4740: qi_lb60: Add gpio-charger device Ralf Baechle 1 sibling, 1 reply; 4+ messages in thread From: Lars-Peter Clausen @ 2011-02-08 2:43 UTC (permalink / raw) To: Ralf Baechle; +Cc: linux-mips, linux-kernel, Lars-Peter Clausen The jz4740 nand driver now requires that the ecc offsets are set. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> --- This should go into 2.6.38 --- arch/mips/jz4740/board-qi_lb60.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/mips/jz4740/board-qi_lb60.c b/arch/mips/jz4740/board-qi_lb60.c index e3f21ba..34f5227 100644 --- a/arch/mips/jz4740/board-qi_lb60.c +++ b/arch/mips/jz4740/board-qi_lb60.c @@ -50,14 +50,14 @@ static bool is_avt2; /* NAND */ static struct nand_ecclayout qi_lb60_ecclayout_1gb = { -/* .eccbytes = 36, + .eccbytes = 36, .eccpos = { 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41 - },*/ + }, .oobfree = { { .offset = 2, .length = 4 }, { .offset = 42, .length = 22 } @@ -86,7 +86,7 @@ static struct mtd_partition qi_lb60_partitions_1gb[] = { }; static struct nand_ecclayout qi_lb60_ecclayout_2gb = { -/* .eccbytes = 72, + .eccbytes = 72, .eccpos = { 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, @@ -97,7 +97,7 @@ static struct nand_ecclayout qi_lb60_ecclayout_2gb = { 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83 - },*/ + }, .oobfree = { { .offset = 2, .length = 10 }, { .offset = 84, .length = 44 }, -- 1.7.2.3 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] MIPS: JZ4740: Set nand ecc offsets for the qi_lb60 board 2011-02-08 2:43 ` [PATCH] MIPS: JZ4740: Set nand ecc offsets for the qi_lb60 board Lars-Peter Clausen @ 2011-03-25 12:31 ` Ralf Baechle 0 siblings, 0 replies; 4+ messages in thread From: Ralf Baechle @ 2011-03-25 12:31 UTC (permalink / raw) To: Lars-Peter Clausen; +Cc: linux-mips, linux-kernel Queued for 2.6.39. Thanks, Ralf ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] MIPS: JZ4740: qi_lb60: Add gpio-charger device 2011-02-08 2:43 [PATCH] MIPS: JZ4740: qi_lb60: Add gpio-charger device Lars-Peter Clausen 2011-02-08 2:43 ` [PATCH] MIPS: JZ4740: Set nand ecc offsets for the qi_lb60 board Lars-Peter Clausen @ 2011-03-25 12:30 ` Ralf Baechle 1 sibling, 0 replies; 4+ messages in thread From: Ralf Baechle @ 2011-03-25 12:30 UTC (permalink / raw) To: Lars-Peter Clausen; +Cc: linux-mips, linux-kernel Queued for 2.6.39. Thanks, Ralf ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2011-03-25 12:31 UTC | newest] Thread overview: 4+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2011-02-08 2:43 [PATCH] MIPS: JZ4740: qi_lb60: Add gpio-charger device Lars-Peter Clausen 2011-02-08 2:43 ` [PATCH] MIPS: JZ4740: Set nand ecc offsets for the qi_lb60 board Lars-Peter Clausen 2011-03-25 12:31 ` Ralf Baechle 2011-03-25 12:30 ` [PATCH] MIPS: JZ4740: qi_lb60: Add gpio-charger device Ralf Baechle
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.