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

Commit 88efdb80 authored by Marcus Cooper's avatar Marcus Cooper Committed by Lee Jones
Browse files

ab8500-charger: Use USBLink1Status Register 



The newer AB's such as the AB8505, AB9540 etc include a
USBLink1 Status register which detects a larger range of
external devices. This should be used instead of the
USBLine Status register.

Signed-off-by: default avatarMarcus Cooper <marcus.xm.cooper@stericsson.com>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
Reviewed-by: default avatarHakan BERG <hakan.berg@stericsson.com>
Reviewed-by: default avatarJonas ABERG <jonas.aberg@stericsson.com>
Tested-by: default avatarYang QU <yang.qu@stericsson.com>
parent 861a30da

drivers/power/ab8500_charger.c

+16 −5
Original line number Diff line number Diff line
@@ -2320,8 +2320,13 @@ static void ab8500_charger_usb_link_status_work(struct work_struct *work) 
	 * to start the charging process. but by jumping

	 * thru a few hoops it can be forced to start.

	 */

	if (is_ab8500(di->parent))

		ret = abx500_get_register_interruptible(di->dev, AB8500_USB,

					AB8500_USB_LINE_STAT_REG, &val);

	else

		ret = abx500_get_register_interruptible(di->dev, AB8500_USB,

					AB8500_USB_LINK1_STAT_REG, &val);



	if (ret >= 0)

		dev_dbg(di->dev, "UsbLineStatus register = 0x%02x\n", val);

	else
@@ -2357,9 +2362,15 @@ static void ab8500_charger_usb_link_status_work(struct work_struct *work) 
			abx500_mask_and_set_register_interruptible(di->dev, AB8500_USB,

					AB8500_MCH_IPT_CURLVL_REG, 0x01, 0x00);

			/*Check link status*/

			if (is_ab8500(di->parent))

				ret = abx500_get_register_interruptible(di->dev,

					AB8500_USB,

					AB8500_USB_LINE_STAT_REG, &val);

					AB8500_USB, AB8500_USB_LINE_STAT_REG,

					&val);

			else

				ret = abx500_get_register_interruptible(di->dev,

					AB8500_USB, AB8500_USB_LINK1_STAT_REG,

					&val);



			dev_dbg(di->dev, "USB link status= 0x%02x\n",

				(val & link_status) >> USB_LINK_STATUS_SHIFT);

			di->invalid_charger_detect_state = 2;