Commit d2be8992 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branches 'acpi-rtc', 'acpi-lpss' and 'acpi-battery' 

* acpi-rtc:
  ACPI / RTC: Fix CMOS RTC opregion handler accesses to wrong addresses

* acpi-lpss:
  ACPI / LPSS: complete PM entries for LPSS power domain

* acpi-battery:
  Revert "ACPI / battery: fix wrong value of capacity_now reported when fully charged"
  Revert "ACPI / battery: Fix warning message in acpi_battery_get_state()"
parents 1c00f73c 9389f46e f4168b61 508b3c67

drivers/acpi/acpi_cmos_rtc.c

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ acpi_cmos_rtc_space_handler(u32 function, acpi_physical_address address, 
		      void *handler_context, void *region_context)

{

	int i;

	u8 *value = (u8 *)&value64;

	u8 *value = (u8 *)value64;



	if (address > 0xff || !value64)

		return AE_BAD_PARAMETER;

drivers/acpi/acpi_lpss.c

+5 −5
Original line number Diff line number Diff line
@@ -610,7 +610,7 @@ static int acpi_lpss_suspend_late(struct device *dev) 
	return acpi_dev_suspend_late(dev);

}



static int acpi_lpss_restore_early(struct device *dev)

static int acpi_lpss_resume_early(struct device *dev)

{

	int ret = acpi_dev_resume_early(dev);
@@ -650,15 +650,15 @@ static int acpi_lpss_runtime_resume(struct device *dev) 
static struct dev_pm_domain acpi_lpss_pm_domain = {

	.ops = {

#ifdef CONFIG_PM_SLEEP

		.suspend_late = acpi_lpss_suspend_late,

		.restore_early = acpi_lpss_restore_early,

		.prepare = acpi_subsys_prepare,

		.complete = acpi_subsys_complete,

		.suspend = acpi_subsys_suspend,

		.resume_early = acpi_subsys_resume_early,

		.suspend_late = acpi_lpss_suspend_late,

		.resume_early = acpi_lpss_resume_early,

		.freeze = acpi_subsys_freeze,

		.poweroff = acpi_subsys_suspend,

		.poweroff_late = acpi_subsys_suspend_late,

		.poweroff_late = acpi_lpss_suspend_late,

		.restore_early = acpi_lpss_resume_early,

#endif

#ifdef CONFIG_PM_RUNTIME

		.runtime_suspend = acpi_lpss_runtime_suspend,

drivers/acpi/battery.c

+0 −14
Original line number Diff line number Diff line
@@ -534,20 +534,6 @@ static int acpi_battery_get_state(struct acpi_battery *battery) 
			" invalid.\n");

	}



	/*

	 * When fully charged, some batteries wrongly report

	 * capacity_now = design_capacity instead of = full_charge_capacity

	 */

	if (battery->capacity_now > battery->full_charge_capacity

	    && battery->full_charge_capacity != ACPI_BATTERY_VALUE_UNKNOWN) {

		if (battery->capacity_now != battery->design_capacity)

			printk_once(KERN_WARNING FW_BUG

				"battery: reported current charge level (%d) "

				"is higher than reported maximum charge level (%d).\n",

				battery->capacity_now, battery->full_charge_capacity);

		battery->capacity_now = battery->full_charge_capacity;

	}



	if (test_bit(ACPI_BATTERY_QUIRK_PERCENTAGE_CAPACITY, &battery->flags)

	    && battery->capacity_now >= 0 && battery->capacity_now <= 100)

		battery->capacity_now = (battery->capacity_now *

CRA Git | Maintained and supported by SUSTech CRA and CCSE