Commit 5031a2a7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-v3.8-part2' of git://git.infradead.org/battery-2.6 

Pull battery update, part 2, from Anton Vorontsov:
 "These are left overs that I didn't have time to review/apply before
  the merge window opened.  I didn't want to "spoil" the first pull
  request with these late patches, so they were not included:

   - A small patch for the RX51 OMAP board (Nokia N900 phone), the patch
     creates a battery monitor device instance, so that it can be
     probed.  It was acked by the OMAP maintainer;

   - A couple of late bug fixes for the charger-manager: corrects corner
     cases for the battery full handling."

* tag 'for-v3.8-part2' of git://git.infradead.org/battery-2.6:
  charger-manager: Fix bug when check dropped voltage after fullbatt event
  charger-manager: Fix bug related to checking fully charged state of battery
  ARM: OMAP: rx51: Register platform device for rx51_battery
parents 7a684c45 f36b9ddb

arch/arm/mach-omap2/board-rx51-peripherals.c

+6 −0
Original line number Diff line number Diff line
@@ -256,6 +256,11 @@ static struct spi_board_info rx51_peripherals_spi_board_info[] __initdata = { 
	},

};



static struct platform_device rx51_battery_device = {

	.name	= "rx51-battery",

	.id	= -1,

};



static void rx51_charger_set_power(bool on)

{

	gpio_set_value(RX51_USB_TRANSCEIVER_RST_GPIO, on);
@@ -277,6 +282,7 @@ static void __init rx51_charger_init(void) 
	WARN_ON(gpio_request_one(RX51_USB_TRANSCEIVER_RST_GPIO,

		GPIOF_OUT_INIT_HIGH, "isp1704_reset"));



	platform_device_register(&rx51_battery_device);

	platform_device_register(&rx51_charger_device);

}

drivers/power/charger-manager.c

+16 −22
Original line number Diff line number Diff line
@@ -239,44 +239,37 @@ static bool is_full_charged(struct charger_manager *cm) 
	int uV;



	/* If there is no battery, it cannot be charged */

	if (!is_batt_present(cm)) {

		val.intval = 0;

		goto out;

	}

	if (!is_batt_present(cm))

		return false;



	if (cm->fuel_gauge && desc->fullbatt_full_capacity > 0) {

		val.intval = 0;



		/* Not full if capacity of fuel gauge isn't full */

		ret = cm->fuel_gauge->get_property(cm->fuel_gauge,

				POWER_SUPPLY_PROP_CHARGE_FULL, &val);

		if (!ret && val.intval > desc->fullbatt_full_capacity) {

			val.intval = 1;

			goto out;

		}

		if (!ret && val.intval > desc->fullbatt_full_capacity)

			return true;

	}



	/* Full, if it's over the fullbatt voltage */

	if (desc->fullbatt_uV > 0) {

		ret = get_batt_uV(cm, &uV);

		if (!ret && uV >= desc->fullbatt_uV) {

			val.intval = 1;

			goto out;

		}

		if (!ret && uV >= desc->fullbatt_uV)

			return true;

	}



	/* Full, if the capacity is more than fullbatt_soc */

	if (cm->fuel_gauge && desc->fullbatt_soc > 0) {

		val.intval = 0;



		ret = cm->fuel_gauge->get_property(cm->fuel_gauge,

				POWER_SUPPLY_PROP_CAPACITY, &val);

		if (!ret && val.intval >= desc->fullbatt_soc) {

			val.intval = 1;

			goto out;

		}

		if (!ret && val.intval >= desc->fullbatt_soc)

			return true;

	}



	val.intval = 0;



out:

	return val.intval ? true : false;

	return false;

}



/**
@@ -489,8 +482,9 @@ static void fullbatt_vchk(struct work_struct *work) 
		return;

	}



	diff = desc->fullbatt_uV;

	diff -= batt_uV;

	diff = desc->fullbatt_uV - batt_uV;

	if (diff < 0)

		return;



	dev_info(cm->dev, "VBATT dropped %duV after full-batt.\n", diff);

CRA Git | Maintained and supported by SUSTech CRA and CCSE