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

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

Merge branches 'acpi-ec', 'acpi-tables' and 'acpi-doc' 

* acpi-ec:
  ACPI / EC: Restore polling during noirq suspend/resume phases

* acpi-tables:
  ACPI: SPCR: Mark expected switch fall-through in acpi_parse_spcr

* acpi-doc:
  ACPI: dock: document sysfs interface
  ACPI / DPTF: Document dptf_power sysfs atttributes
parents 67dcc26d 3cd091a7 5a9e59e8 22029845

Documentation/ABI/testing/sysfs-devices-platform-dock

0 → 100644
+39 −0
Original line number Diff line number Diff line 
What:		/sys/devices/platform/dock.N/docked

Date:		Dec, 2006

KernelVersion:	2.6.19

Contact:	linux-acpi@vger.kernel.org

Description:

		(RO) Value 1 or 0 indicates whether the software believes the

		laptop is docked in a docking station.



What:		/sys/devices/platform/dock.N/undock

Date:		Dec, 2006

KernelVersion:	2.6.19

Contact:	linux-acpi@vger.kernel.org

Description:

		(WO) Writing to this file causes the software to initiate an

		undock request to the firmware.



What:		/sys/devices/platform/dock.N/uid

Date:		Feb, 2007

KernelVersion:	v2.6.21

Contact:	linux-acpi@vger.kernel.org

Description:

		(RO) Displays the docking station the laptop is docked to.



What:		/sys/devices/platform/dock.N/flags

Date:		May, 2007

KernelVersion:	v2.6.21

Contact:	linux-acpi@vger.kernel.org

Description:

		(RO) Show dock station flags, useful for checking if undock

		request has been made by the user (from the immediate_undock

		option).



What:		/sys/devices/platform/dock.N/type

Date:		Aug, 2008

KernelVersion:	v2.6.27

Contact:	linux-acpi@vger.kernel.org

Description:

		(RO) Display the dock station type- dock_station, ata_bay or

		battery_bay.

Documentation/ABI/testing/sysfs-platform-dptf

0 → 100644
+40 −0
Original line number Diff line number Diff line 
What:		/sys/bus/platform/devices/INT3407:00/dptf_power/charger_type

Date:		Jul, 2016

KernelVersion:	v4.10

Contact:	linux-acpi@vger.kernel.org

Description:

		(RO) The charger type - Traditional, Hybrid or NVDC.



What:		/sys/bus/platform/devices/INT3407:00/dptf_power/adapter_rating_mw

Date:		Jul, 2016

KernelVersion:	v4.10

Contact:	linux-acpi@vger.kernel.org

Description:

		(RO) Adapter rating in milliwatts (the maximum Adapter power).

		Must be 0 if no AC Adaptor is plugged in.



What:		/sys/bus/platform/devices/INT3407:00/dptf_power/max_platform_power_mw

Date:		Jul, 2016

KernelVersion:	v4.10

Contact:	linux-acpi@vger.kernel.org

Description:

		(RO) Maximum platform power that can be supported by the battery

		in milliwatts.



What:		/sys/bus/platform/devices/INT3407:00/dptf_power/platform_power_source

Date:		Jul, 2016

KernelVersion:	v4.10

Contact:	linux-acpi@vger.kernel.org

Description:

		(RO) Display the platform power source

		0x00 = DC

		0x01 = AC

		0x02 = USB

		0x03 = Wireless Charger



What:		/sys/bus/platform/devices/INT3407:00/dptf_power/battery_steady_power

Date:		Jul, 2016

KernelVersion:	v4.10

Contact:	linux-acpi@vger.kernel.org

Description:

		(RO) The maximum sustained power for battery in milliwatts.

drivers/acpi/ec.c

+6 −0
Original line number Diff line number Diff line
@@ -1927,6 +1927,9 @@ static int acpi_ec_suspend_noirq(struct device *dev) 
	    ec->reference_count >= 1)

		acpi_set_gpe(NULL, ec->gpe, ACPI_GPE_DISABLE);



	if (acpi_sleep_no_ec_events())

		acpi_ec_enter_noirq(ec);



	return 0;

}
@@ -1934,6 +1937,9 @@ static int acpi_ec_resume_noirq(struct device *dev) 
{

	struct acpi_ec *ec = acpi_driver_data(to_acpi_device(dev));



	if (acpi_sleep_no_ec_events())

		acpi_ec_leave_noirq(ec);



	if (ec_no_wakeup && test_bit(EC_FLAGS_STARTED, &ec->flags) &&

	    ec->reference_count >= 1)

		acpi_set_gpe(NULL, ec->gpe, ACPI_GPE_ENABLE);

drivers/acpi/spcr.c

+1 −0
Original line number Diff line number Diff line
@@ -115,6 +115,7 @@ int __init acpi_parse_spcr(bool enable_earlycon, bool enable_console) 
			table->serial_port.access_width))) {

		default:

			pr_err("Unexpected SPCR Access Width.  Defaulting to byte size\n");

			/* fall through */

		case 8:

			iotype = "mmio";

			break;