aboutsummaryrefslogtreecommitdiffstats
path: root/recipes-kernel/linux/linux-yocto-3.14/tosa/0004-ARM-pxa-tosa-switch-to-gpio-charger.patch
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-kernel/linux/linux-yocto-3.14/tosa/0004-ARM-pxa-tosa-switch-to-gpio-charger.patch')
-rw-r--r--recipes-kernel/linux/linux-yocto-3.14/tosa/0004-ARM-pxa-tosa-switch-to-gpio-charger.patch90
1 files changed, 0 insertions, 90 deletions
diff --git a/recipes-kernel/linux/linux-yocto-3.14/tosa/0004-ARM-pxa-tosa-switch-to-gpio-charger.patch b/recipes-kernel/linux/linux-yocto-3.14/tosa/0004-ARM-pxa-tosa-switch-to-gpio-charger.patch
deleted file mode 100644
index 64679aa..0000000
--- a/recipes-kernel/linux/linux-yocto-3.14/tosa/0004-ARM-pxa-tosa-switch-to-gpio-charger.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-From a873ae1f53a4479e4c79bbd7ca12d5a75eba9e0c Mon Sep 17 00:00:00 2001
-From: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
-Date: Mon, 27 Jan 2014 16:56:39 +0400
-Subject: [PATCH 4/7] ARM: pxa: tosa: switch to gpio-charger
-
-Switch to simpler gpio-charger module. PDA power requires additional
-setup in platform file and is more suited for boards with separate AC
-and USB charging inputs. Tosa has a unified input, so it's better suited
-for gpio-charger.
-
-Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
----
- arch/arm/mach-pxa/tosa.c | 41 +++++++----------------------------------
- 1 file changed, 7 insertions(+), 34 deletions(-)
-
-diff --git a/arch/arm/mach-pxa/tosa.c b/arch/arm/mach-pxa/tosa.c
-index ef5557b..ac9f482 100644
---- a/arch/arm/mach-pxa/tosa.c
-+++ b/arch/arm/mach-pxa/tosa.c
-@@ -30,7 +30,7 @@
- #include <linux/gpio_keys.h>
- #include <linux/input.h>
- #include <linux/gpio.h>
--#include <linux/pda_power.h>
-+#include <linux/power/gpio-charger.h>
- #include <linux/spi/spi.h>
- #include <linux/spi/pxa2xx_spi.h>
- #include <linux/input/matrix_keypad.h>
-@@ -360,44 +360,17 @@ static struct pxaficp_platform_data tosa_ficp_platform_data = {
- /*
- * Tosa AC IN
- */
--static int tosa_power_init(struct device *dev)
--{
-- int ret = gpio_request(TOSA_GPIO_AC_IN, "ac in");
-- if (ret)
-- goto err_gpio_req;
--
-- ret = gpio_direction_input(TOSA_GPIO_AC_IN);
-- if (ret)
-- goto err_gpio_in;
--
-- return 0;
--
--err_gpio_in:
-- gpio_free(TOSA_GPIO_AC_IN);
--err_gpio_req:
-- return ret;
--}
--
--static void tosa_power_exit(struct device *dev)
--{
-- gpio_free(TOSA_GPIO_AC_IN);
--}
--
--static int tosa_power_ac_online(void)
--{
-- return gpio_get_value(TOSA_GPIO_AC_IN) == 0;
--}
--
- static char *tosa_ac_supplied_to[] = {
- "main-battery",
- "backup-battery",
- "jacket-battery",
- };
-
--static struct pda_power_pdata tosa_power_data = {
-- .init = tosa_power_init,
-- .is_ac_online = tosa_power_ac_online,
-- .exit = tosa_power_exit,
-+static struct gpio_charger_platform_data tosa_power_data = {
-+ .name = "charger",
-+ .type = POWER_SUPPLY_TYPE_MAINS,
-+ .gpio = TOSA_GPIO_AC_IN,
-+ .gpio_active_low = 1,
- .supplied_to = tosa_ac_supplied_to,
- .num_supplicants = ARRAY_SIZE(tosa_ac_supplied_to),
- };
-@@ -414,7 +387,7 @@ static struct resource tosa_power_resource[] = {
- };
-
- static struct platform_device tosa_power_device = {
-- .name = "pda-power",
-+ .name = "gpio-charger",
- .id = -1,
- .dev.platform_data = &tosa_power_data,
- .resource = tosa_power_resource,
---
-1.8.5.2
-