Commit b059b485 authored by Sebastian Reichel's avatar Sebastian Reichel
Browse files

Merge tag 'ib-psy-pxa-for-5.12-signed' into psy-next 



Immutable branch between mach-pxa and power-supply for for 5.12

This immutable branch replaces legacy gpio API in wm97xx_battery and
z2_battery with new gpiod API, which involves the drivers in
power-supply and some mach-pxa board files.

Signed-off-by: default avatarSebastian Reichel <sebastian.reichel@collabora.com>
parents 3235d130 cb6d6918

arch/arm/mach-pxa/mioa701.c

+0 −1
Original line number Diff line number Diff line
@@ -577,7 +577,6 @@ static struct platform_device power_dev = { 
static struct wm97xx_batt_pdata mioa701_battery_data = {

	.batt_aux	= WM97XX_AUX_ID1,

	.temp_aux	= -1,

	.charge_gpio	= -1,

	.min_voltage	= 0xc00,

	.max_voltage	= 0xfc0,

	.batt_tech	= POWER_SUPPLY_TECHNOLOGY_LION,

arch/arm/mach-pxa/palm27x.c

+0 −1
Original line number Diff line number Diff line
@@ -212,7 +212,6 @@ void __init palm27x_irda_init(int pwdn) 
static struct wm97xx_batt_pdata palm27x_batt_pdata = {

	.batt_aux	= WM97XX_AUX_ID3,

	.temp_aux	= WM97XX_AUX_ID2,

	.charge_gpio	= -1,

	.batt_mult	= 1000,

	.batt_div	= 414,

	.temp_mult	= 1,

arch/arm/mach-pxa/palmte2.c

+0 −1
Original line number Diff line number Diff line
@@ -273,7 +273,6 @@ static struct platform_device power_supply = { 
static struct wm97xx_batt_pdata palmte2_batt_pdata = {

	.batt_aux	= WM97XX_AUX_ID3,

	.temp_aux	= WM97XX_AUX_ID2,

	.charge_gpio	= -1,

	.max_voltage	= PALMTE2_BAT_MAX_VOLTAGE,

	.min_voltage	= PALMTE2_BAT_MIN_VOLTAGE,

	.batt_mult	= 1000,

arch/arm/mach-pxa/z2.c

+11 −1
Original line number Diff line number Diff line
@@ -488,7 +488,6 @@ static struct z2_battery_info batt_chip_info = { 
	.batt_I2C_bus	= 0,

	.batt_I2C_addr	= 0x55,

	.batt_I2C_reg	= 2,

	.charge_gpio	= GPIO0_ZIPITZ2_AC_DETECT,

	.min_voltage	= 3475000,

	.max_voltage	= 4190000,

	.batt_div	= 59,
@@ -497,9 +496,19 @@ static struct z2_battery_info batt_chip_info = { 
	.batt_name	= "Z2",

};



static struct gpiod_lookup_table z2_battery_gpio_table = {

	.dev_id = "aer915",

	.table = {

		GPIO_LOOKUP("gpio-pxa", GPIO0_ZIPITZ2_AC_DETECT,

			    NULL, GPIO_ACTIVE_HIGH),

		{ },

	},

};



static struct i2c_board_info __initdata z2_i2c_board_info[] = {

	{

		I2C_BOARD_INFO("aer915", 0x55),

		.dev_name = "aer915",

		.platform_data	= &batt_chip_info,

	}, {

		I2C_BOARD_INFO("wm8750", 0x1b),
@@ -510,6 +519,7 @@ static struct i2c_board_info __initdata z2_i2c_board_info[] = { 
static void __init z2_i2c_init(void)

{

	pxa_set_i2c_info(NULL);

	gpiod_add_lookup_table(&z2_battery_gpio_table);

	i2c_register_board_info(0, ARRAY_AND_SIZE(z2_i2c_board_info));

}

#else

drivers/power/supply/wm97xx_battery.c

+19 −26
Original line number Diff line number Diff line
@@ -15,11 +15,12 @@ 
#include <linux/wm97xx.h>

#include <linux/spinlock.h>

#include <linux/interrupt.h>

#include <linux/gpio.h>

#include <linux/gpio/consumer.h>

#include <linux/irq.h>

#include <linux/slab.h>



static struct work_struct bat_work;

static struct gpio_desc *charge_gpiod;

static DEFINE_MUTEX(work_lock);

static int bat_status = POWER_SUPPLY_STATUS_UNKNOWN;

static enum power_supply_property *prop;
@@ -96,12 +97,11 @@ static void wm97xx_bat_external_power_changed(struct power_supply *bat_ps) 
static void wm97xx_bat_update(struct power_supply *bat_ps)

{

	int old_status = bat_status;

	struct wm97xx_batt_pdata *pdata = power_supply_get_drvdata(bat_ps);



	mutex_lock(&work_lock);



	bat_status = (pdata->charge_gpio >= 0) ?

			(gpio_get_value(pdata->charge_gpio) ?

	bat_status = (charge_gpiod) ?

			(gpiod_get_value(charge_gpiod) ?

			POWER_SUPPLY_STATUS_DISCHARGING :

			POWER_SUPPLY_STATUS_CHARGING) :

			POWER_SUPPLY_STATUS_UNKNOWN;
@@ -171,18 +171,19 @@ static int wm97xx_bat_probe(struct platform_device *dev) 
	if (dev->id != -1)

		return -EINVAL;



	if (gpio_is_valid(pdata->charge_gpio)) {

		ret = gpio_request(pdata->charge_gpio, "BATT CHRG");

		if (ret)

			goto err;

		ret = gpio_direction_input(pdata->charge_gpio);

		if (ret)

			goto err2;

		ret = request_irq(gpio_to_irq(pdata->charge_gpio),

	charge_gpiod = devm_gpiod_get_optional(&dev->dev, NULL, GPIOD_IN);

	if (IS_ERR(charge_gpiod))

		return dev_err_probe(&dev->dev,

				     PTR_ERR(charge_gpiod),

				     "failed to get charge GPIO\n");

	if (charge_gpiod) {

		gpiod_set_consumer_name(charge_gpiod, "BATT CHRG");

		ret = request_irq(gpiod_to_irq(charge_gpiod),

				wm97xx_chrg_irq, 0,

				"AC Detect", dev);

		if (ret)

			goto err2;

			return dev_err_probe(&dev->dev, ret,

					     "failed to request GPIO irq\n");

		props++;	/* POWER_SUPPLY_PROP_STATUS */

	}
@@ -204,7 +205,7 @@ static int wm97xx_bat_probe(struct platform_device *dev) 
	}



	prop[i++] = POWER_SUPPLY_PROP_PRESENT;

	if (pdata->charge_gpio >= 0)

	if (charge_gpiod)

		prop[i++] = POWER_SUPPLY_PROP_STATUS;

	if (pdata->batt_tech >= 0)

		prop[i++] = POWER_SUPPLY_PROP_TECHNOLOGY;
@@ -242,23 +243,15 @@ static int wm97xx_bat_probe(struct platform_device *dev) 
err4:

	kfree(prop);

err3:

	if (gpio_is_valid(pdata->charge_gpio))

		free_irq(gpio_to_irq(pdata->charge_gpio), dev);

err2:

	if (gpio_is_valid(pdata->charge_gpio))

		gpio_free(pdata->charge_gpio);

err:

	if (charge_gpiod)

		free_irq(gpiod_to_irq(charge_gpiod), dev);

	return ret;

}



static int wm97xx_bat_remove(struct platform_device *dev)

{

	struct wm97xx_batt_pdata *pdata = dev->dev.platform_data;



	if (pdata && gpio_is_valid(pdata->charge_gpio)) {

		free_irq(gpio_to_irq(pdata->charge_gpio), dev);

		gpio_free(pdata->charge_gpio);

	}

	if (charge_gpiod)

		free_irq(gpiod_to_irq(charge_gpiod), dev);

	cancel_work_sync(&bat_work);

	power_supply_unregister(bat_psy);

	kfree(prop);