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

Commit 877c357e authored by Len Brown's avatar Len Brown
Browse files

Merge branches 'release', 'acpi_pm_device_sleep_state' and 'battery' into release

parents 488b5ec8 ad3399c3 7c2670bb

drivers/acpi/battery.c

+5 −0
Original line number Original line Diff line number Diff line
@@ -194,6 +194,9 @@ static int acpi_battery_get_property(struct power_supply *psy, 
	case POWER_SUPPLY_PROP_MANUFACTURER:

	case POWER_SUPPLY_PROP_MANUFACTURER:

		val->strval = battery->oem_info;

		val->strval = battery->oem_info;

		break;

		break;

	case POWER_SUPPLY_PROP_SERIAL_NUMBER:

		val->strval = battery->serial_number;

		break;

	default:

	default:

		return -EINVAL;

		return -EINVAL;

	}

	}
@@ -212,6 +215,7 @@ static enum power_supply_property charge_battery_props[] = { 
	POWER_SUPPLY_PROP_CHARGE_NOW,

	POWER_SUPPLY_PROP_CHARGE_NOW,

	POWER_SUPPLY_PROP_MODEL_NAME,

	POWER_SUPPLY_PROP_MODEL_NAME,

	POWER_SUPPLY_PROP_MANUFACTURER,

	POWER_SUPPLY_PROP_MANUFACTURER,

	POWER_SUPPLY_PROP_SERIAL_NUMBER,

};

};





static enum power_supply_property energy_battery_props[] = {

static enum power_supply_property energy_battery_props[] = {
@@ -226,6 +230,7 @@ static enum power_supply_property energy_battery_props[] = { 
	POWER_SUPPLY_PROP_ENERGY_NOW,

	POWER_SUPPLY_PROP_ENERGY_NOW,

	POWER_SUPPLY_PROP_MODEL_NAME,

	POWER_SUPPLY_PROP_MODEL_NAME,

	POWER_SUPPLY_PROP_MANUFACTURER,

	POWER_SUPPLY_PROP_MANUFACTURER,

	POWER_SUPPLY_PROP_SERIAL_NUMBER,

};

};

#endif

#endif

drivers/acpi/sleep/main.c

+12 −3
Original line number Original line Diff line number Diff line
@@ -472,12 +472,21 @@ int acpi_pm_device_sleep_state(struct device *dev, int wake, int *d_min_p) 
	if (acpi_target_sleep_state == ACPI_STATE_S0 ||

	if (acpi_target_sleep_state == ACPI_STATE_S0 ||

	    (wake && adev->wakeup.state.enabled &&

	    (wake && adev->wakeup.state.enabled &&

	     adev->wakeup.sleep_state <= acpi_target_sleep_state)) {

	     adev->wakeup.sleep_state <= acpi_target_sleep_state)) {

		acpi_status status;



		acpi_method[3] = 'W';

		acpi_method[3] = 'W';

		acpi_evaluate_integer(handle, acpi_method, NULL, &d_max);

		status = acpi_evaluate_integer(handle, acpi_method, NULL,

		/* Sanity check */

						&d_max);

		if (d_max < d_min)

		if (ACPI_FAILURE(status)) {

			d_max = d_min;

		} else if (d_max < d_min) {

			/* Warn the user of the broken DSDT */

			printk(KERN_WARNING "ACPI: Wrong value from %s\n",

				acpi_method);

			/* Sanitize it */

			d_min = d_max;

			d_min = d_max;

		}

		}

	}





	if (d_min_p)

	if (d_min_p)

		*d_min_p = d_min;

		*d_min_p = d_min;

drivers/power/power_supply_sysfs.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -116,6 +116,7 @@ static struct device_attribute power_supply_attrs[] = { 
	/* Properties of type `const char *' */

	/* Properties of type `const char *' */

	POWER_SUPPLY_ATTR(model_name),

	POWER_SUPPLY_ATTR(model_name),

	POWER_SUPPLY_ATTR(manufacturer),

	POWER_SUPPLY_ATTR(manufacturer),

	POWER_SUPPLY_ATTR(serial_number),

};

};





static ssize_t power_supply_show_static_attrs(struct device *dev,

static ssize_t power_supply_show_static_attrs(struct device *dev,

include/linux/power_supply.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -94,6 +94,7 @@ enum power_supply_property { 
	/* Properties of type `const char *' */

	/* Properties of type `const char *' */

	POWER_SUPPLY_PROP_MODEL_NAME,

	POWER_SUPPLY_PROP_MODEL_NAME,

	POWER_SUPPLY_PROP_MANUFACTURER,

	POWER_SUPPLY_PROP_MANUFACTURER,

	POWER_SUPPLY_PROP_SERIAL_NUMBER,

};

};





enum power_supply_type {

enum power_supply_type {