Merge branch 'for-linus' into for-next (4654eba8) · Commits · e / devices / android_kernel_teracube_emerald

.gitignore

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -127,3 +127,7 @@ all.config

	# Kdevelop4		# Kdevelop4
	*.kdev4		*.kdev4

			#Automatically generated by ASN.1 compiler
			net/ipv4/netfilter/nf_nat_snmp_basic-asn1.c
			net/ipv4/netfilter/nf_nat_snmp_basic-asn1.h

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

0 → 100644

+39 −0

Original line number	Original line	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-devices-system-cpu

+75 −2

Original line number	Original line	Diff line number	Diff line
	@@ -108,6 +108,8 @@ Description: CPU topology files that describe a logical CPU's relationship

	What: /sys/devices/system/cpu/cpuidle/current_driver		What: /sys/devices/system/cpu/cpuidle/current_driver
	/sys/devices/system/cpu/cpuidle/current_governer_ro		/sys/devices/system/cpu/cpuidle/current_governer_ro
			/sys/devices/system/cpu/cpuidle/available_governors
			/sys/devices/system/cpu/cpuidle/current_governor
	Date: September 2007		Date: September 2007
	Contact: Linux kernel mailing list <linux-kernel@vger.kernel.org>		Contact: Linux kernel mailing list <linux-kernel@vger.kernel.org>
	Description: Discover cpuidle policy and mechanism		Description: Discover cpuidle policy and mechanism
	@@ -119,13 +121,84 @@ Description: Discover cpuidle policy and mechanism
	Idle policy (governor) is differentiated from idle mechanism		Idle policy (governor) is differentiated from idle mechanism
	(driver)		(driver)

	current_driver: displays current idle mechanism		current_driver: (RO) displays current idle mechanism

	current_governor_ro: displays current idle policy		current_governor_ro: (RO) displays current idle policy

			With the cpuidle_sysfs_switch boot option enabled (meant for
			developer testing), the following three attributes are visible
			instead:

			current_driver: same as described above

			available_governors: (RO) displays a space separated list of
			available governors

			current_governor: (RW) displays current idle policy. Users can
			switch the governor at runtime by writing to this file.

	See files in Documentation/cpuidle/ for more information.		See files in Documentation/cpuidle/ for more information.


			What: /sys/devices/system/cpu/cpuX/cpuidle/stateN/name
			/sys/devices/system/cpu/cpuX/cpuidle/stateN/latency
			/sys/devices/system/cpu/cpuX/cpuidle/stateN/power
			/sys/devices/system/cpu/cpuX/cpuidle/stateN/time
			/sys/devices/system/cpu/cpuX/cpuidle/stateN/usage
			Date: September 2007
			KernelVersion: v2.6.24
			Contact: Linux power management list <linux-pm@vger.kernel.org>
			Description:
			The directory /sys/devices/system/cpu/cpuX/cpuidle contains per
			logical CPU specific cpuidle information for each online cpu X.
			The processor idle states which are available for use have the
			following attributes:

			name: (RO) Name of the idle state (string).

			latency: (RO) The latency to exit out of this idle state (in
			microseconds).

			power: (RO) The power consumed while in this idle state (in
			milliwatts).

			time: (RO) The total time spent in this idle state (in microseconds).

			usage: (RO) Number of times this state was entered (a count).


			What: /sys/devices/system/cpu/cpuX/cpuidle/stateN/desc
			Date: February 2008
			KernelVersion: v2.6.25
			Contact: Linux power management list <linux-pm@vger.kernel.org>
			Description:
			(RO) A small description about the idle state (string).


			What: /sys/devices/system/cpu/cpuX/cpuidle/stateN/disable
			Date: March 2012
			KernelVersion: v3.10
			Contact: Linux power management list <linux-pm@vger.kernel.org>
			Description:
			(RW) Option to disable this idle state (bool). The behavior and
			the effect of the disable variable depends on the implementation
			of a particular governor. In the ladder governor, for example,
			it is not coherent, i.e. if one is disabling a light state, then
			all deeper states are disabled as well, but the disable variable
			does not reflect it. Likewise, if one enables a deep state but a
			lighter state still is disabled, then this has no effect.


			What: /sys/devices/system/cpu/cpuX/cpuidle/stateN/residency
			Date: March 2014
			KernelVersion: v3.15
			Contact: Linux power management list <linux-pm@vger.kernel.org>
			Description:
			(RO) Display the target residency i.e. the minimum amount of
			time (in microseconds) this cpu should spend in this idle state
			to make the transition worth the effort.


	What: /sys/devices/system/cpu/cpu#/cpufreq/*		What: /sys/devices/system/cpu/cpu#/cpufreq/*
	Date: pre-git history		Date: pre-git history
	Contact: linux-pm@vger.kernel.org		Contact: linux-pm@vger.kernel.org

Documentation/ABI/testing/sysfs-platform-dptf

0 → 100644

+40 −0

Original line number	Original line	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.

Documentation/PCI/pci.txt

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -570,7 +570,9 @@ your driver if they're helpful, or just use plain hex constants.
	The device IDs are arbitrary hex numbers (vendor controlled) and normally used		The device IDs are arbitrary hex numbers (vendor controlled) and normally used
	only in a single location, the pci_device_id table.		only in a single location, the pci_device_id table.

	Please DO submit new vendor/device IDs to http://pciids.sourceforge.net/.		Please DO submit new vendor/device IDs to http://pci-ids.ucw.cz/.
			There are mirrors of the pci.ids file at http://pciids.sourceforge.net/
			and https://github.com/pciutils/pciids.