Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a21e22f2 authored by lme00437's avatar lme00437 Committed by Lee Jones
Browse files

pm2301-charger: lpn pin used only in C2C boards 



This patch restricts use of LPN pin to C2C boards to avoid
conflict on HSI for GPIO 60 use.

Signed-off-by: default avatarBenoit GAUTHIER <benoit.gauthier-xsig@stericsson.com>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
Reviewed-by: default avatarMustapha BEN-ZOUBEIR <mustapha.ben.zoubeir-xsig@stericsson.com>
Reviewed-by: default avatarPhilippe LANGLAIS <philippe.langlais@stericsson.com>
Tested-by: default avatarBenoit GAUTHIER <benoit.gauthier-xsig@stericsson.com>
parent 3c01b367

drivers/power/pm2301_charger.c

+32 −34
Original line number Original line Diff line number Diff line
@@ -113,17 +113,16 @@ static const struct i2c_device_id pm2xxx_ident[] = { 




static void set_lpn_pin(struct pm2xxx_charger *pm2)

static void set_lpn_pin(struct pm2xxx_charger *pm2)

{

{

	if (!pm2->ac.charger_connected && gpio_is_valid(pm2->lpn_pin)) {

		gpio_set_value(pm2->lpn_pin, 1);

		gpio_set_value(pm2->lpn_pin, 1);

		usleep_range(SLEEP_MIN, SLEEP_MAX);

		usleep_range(SLEEP_MIN, SLEEP_MAX);



	}

	return;

}

}





static void clear_lpn_pin(struct pm2xxx_charger *pm2)

static void clear_lpn_pin(struct pm2xxx_charger *pm2)

{

{

	if (!pm2->ac.charger_connected && gpio_is_valid(pm2->lpn_pin))

		gpio_set_value(pm2->lpn_pin, 0);

		gpio_set_value(pm2->lpn_pin, 0);



	return;

}

}





static int pm2xxx_reg_read(struct pm2xxx_charger *pm2, int reg, u8 *val)

static int pm2xxx_reg_read(struct pm2xxx_charger *pm2, int reg, u8 *val)
@@ -1035,14 +1034,6 @@ static int pm2xxx_wall_charger_probe(struct i2c_client *i2c_client, 




	pm2->bat = pl_data->battery;

	pm2->bat = pl_data->battery;





	/*get lpn GPIO from platform data*/

	if (!pm2->pdata->lpn_gpio) {

		dev_err(pm2->dev, "no lpn gpio data supplied\n");

		ret = -EINVAL;

		goto free_device_info;

	}

	pm2->lpn_pin = pm2->pdata->lpn_gpio;



	if (!i2c_check_functionality(i2c_client->adapter,

	if (!i2c_check_functionality(i2c_client->adapter,

			I2C_FUNC_SMBUS_BYTE_DATA |

			I2C_FUNC_SMBUS_BYTE_DATA |

			I2C_FUNC_SMBUS_READ_WORD_DATA)) {

			I2C_FUNC_SMBUS_READ_WORD_DATA)) {
@@ -1146,12 +1137,17 @@ static int pm2xxx_wall_charger_probe(struct i2c_client *i2c_client, 




	mutex_init(&pm2->lock);

	mutex_init(&pm2->lock);





	if (gpio_is_valid(pm2->pdata->lpn_gpio)) {

		/* get lpn GPIO from platform data */

		pm2->lpn_pin = pm2->pdata->lpn_gpio;



		/*

		/*

		 * Charger detection mechanism requires pulling up the LPN pin

		 * Charger detection mechanism requires pulling up the LPN pin

		 * while i2c communication if Charger is not connected

		 * while i2c communication if Charger is not connected

		 * LPN pin of PM2301 is GPIO60 of AB9540

		 * LPN pin of PM2301 is GPIO60 of AB9540

		 */

		 */

		ret = gpio_request(pm2->lpn_pin, "pm2301_lpm_gpio");

		ret = gpio_request(pm2->lpn_pin, "pm2301_lpm_gpio");



		if (ret < 0) {

		if (ret < 0) {

			dev_err(pm2->dev, "pm2301_lpm_gpio request failed\n");

			dev_err(pm2->dev, "pm2301_lpm_gpio request failed\n");

			goto disable_pm2_irq_wake;

			goto disable_pm2_irq_wake;
@@ -1161,8 +1157,8 @@ static int pm2xxx_wall_charger_probe(struct i2c_client *i2c_client, 
			dev_err(pm2->dev, "pm2301_lpm_gpio direction failed\n");

			dev_err(pm2->dev, "pm2301_lpm_gpio direction failed\n");

			goto free_gpio;

			goto free_gpio;

		}

		}



		set_lpn_pin(pm2);

		set_lpn_pin(pm2);

	}





	/* read  interrupt registers */

	/* read  interrupt registers */

	for (i = 0; i < PM2XXX_NUM_INT_REG; i++)

	for (i = 0; i < PM2XXX_NUM_INT_REG; i++)
@@ -1184,6 +1180,7 @@ static int pm2xxx_wall_charger_probe(struct i2c_client *i2c_client, 
	return 0;

	return 0;





free_gpio:

free_gpio:

	if (gpio_is_valid(pm2->lpn_pin))

		gpio_free(pm2->lpn_pin);

		gpio_free(pm2->lpn_pin);

disable_pm2_irq_wake:

disable_pm2_irq_wake:

	disable_irq_wake(gpio_to_irq(pm2->pdata->gpio_irq_number));

	disable_irq_wake(gpio_to_irq(pm2->pdata->gpio_irq_number));
@@ -1229,6 +1226,7 @@ static int pm2xxx_wall_charger_remove(struct i2c_client *i2c_client) 




	power_supply_unregister(&pm2->ac_chg.psy);

	power_supply_unregister(&pm2->ac_chg.psy);





	if (gpio_is_valid(pm2->lpn_pin))

		gpio_free(pm2->lpn_pin);

		gpio_free(pm2->lpn_pin);





	kfree(pm2);

	kfree(pm2);
@@ -1266,7 +1264,7 @@ static void __exit pm2xxx_charger_exit(void) 
	i2c_del_driver(&pm2xxx_charger_driver);

	i2c_del_driver(&pm2xxx_charger_driver);

}

}





subsys_initcall_sync(pm2xxx_charger_init);

device_initcall_sync(pm2xxx_charger_init);

module_exit(pm2xxx_charger_exit);

module_exit(pm2xxx_charger_exit);





MODULE_LICENSE("GPL v2");

MODULE_LICENSE("GPL v2");