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

Commit 76d8a23b authored by Anton Vorontsov's avatar Anton Vorontsov
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux 



The merge is merely to fix conflicts before sending a pull request.

Conflicts:
	drivers/power/ab8500_btemp.c
	drivers/power/ab8500_charger.c
	drivers/power/ab8500_fg.c
	drivers/power/abx500_chargalg.c
	drivers/power/max8925_power.c

Signed-off-by: default avatarAnton Vorontsov <anton.vorontsov@linaro.org>
parents eba3b670 1ebaf4f4

CREDITS

+5 −0
Original line number Diff line number Diff line
@@ -1823,6 +1823,11 @@ S: Kattreinstr 38 
S: D-64295

S: Germany



N: Avi Kivity

E: avi.kivity@gmail.com

D: Kernel-based Virtual Machine (KVM)

S: Ra'annana, Israel



N: Andi Kleen

E: andi@firstfloor.org

U: http://www.halobates.de

Documentation/ABI/testing/sysfs-bus-iio

+24 −0
Original line number Diff line number Diff line
@@ -189,6 +189,14 @@ Description: 
		A computed peak value based on the sum squared magnitude of

		the underlying value in the specified directions.



What:		/sys/bus/iio/devices/iio:deviceX/in_pressureY_raw

What:		/sys/bus/iio/devices/iio:deviceX/in_pressure_raw

KernelVersion:	3.8

Contact:	linux-iio@vger.kernel.org

Description:

		Raw pressure measurement from channel Y. Units after

		application of scale and offset are kilopascal.



What:		/sys/bus/iio/devices/iio:deviceX/in_accel_offset

What:		/sys/bus/iio/devices/iio:deviceX/in_accel_x_offset

What:		/sys/bus/iio/devices/iio:deviceX/in_accel_y_offset
@@ -197,6 +205,8 @@ What: /sys/bus/iio/devices/iio:deviceX/in_voltageY_offset 
What:		/sys/bus/iio/devices/iio:deviceX/in_voltage_offset

What:		/sys/bus/iio/devices/iio:deviceX/in_tempY_offset

What:		/sys/bus/iio/devices/iio:deviceX/in_temp_offset

What:		/sys/bus/iio/devices/iio:deviceX/in_pressureY_offset

What:		/sys/bus/iio/devices/iio:deviceX/in_pressure_offset

KernelVersion:	2.6.35

Contact:	linux-iio@vger.kernel.org

Description:
@@ -226,6 +236,8 @@ What: /sys/bus/iio/devices/iio:deviceX/in_magn_scale 
What:		/sys/bus/iio/devices/iio:deviceX/in_magn_x_scale

What:		/sys/bus/iio/devices/iio:deviceX/in_magn_y_scale

What:		/sys/bus/iio/devices/iio:deviceX/in_magn_z_scale

What:		/sys/bus/iio/devices/iio:deviceX/in_pressureY_scale

What:		/sys/bus/iio/devices/iio:deviceX/in_pressure_scale

KernelVersion:	2.6.35

Contact:	linux-iio@vger.kernel.org

Description:
@@ -245,6 +257,8 @@ What: /sys/bus/iio/devices/iio:deviceX/in_anglvel_y_calibbias 
What:		/sys/bus/iio/devices/iio:deviceX/in_anglvel_z_calibbias

What:		/sys/bus/iio/devices/iio:deviceX/in_illuminance0_calibbias

What:		/sys/bus/iio/devices/iio:deviceX/in_proximity0_calibbias

What:		/sys/bus/iio/devices/iio:deviceX/in_pressureY_calibbias

What:		/sys/bus/iio/devices/iio:deviceX/in_pressure_calibbias

KernelVersion:	2.6.35

Contact:	linux-iio@vger.kernel.org

Description:
@@ -262,6 +276,8 @@ What /sys/bus/iio/devices/iio:deviceX/in_anglvel_y_calibscale 
What		/sys/bus/iio/devices/iio:deviceX/in_anglvel_z_calibscale

what		/sys/bus/iio/devices/iio:deviceX/in_illuminance0_calibscale

what		/sys/bus/iio/devices/iio:deviceX/in_proximity0_calibscale

What:		/sys/bus/iio/devices/iio:deviceX/in_pressureY_calibscale

What:		/sys/bus/iio/devices/iio:deviceX/in_pressure_calibscale

KernelVersion:	2.6.35

Contact:	linux-iio@vger.kernel.org

Description:
@@ -275,6 +291,8 @@ What: /sys/.../iio:deviceX/in_voltage-voltage_scale_available 
What:		/sys/.../iio:deviceX/out_voltageX_scale_available

What:		/sys/.../iio:deviceX/out_altvoltageX_scale_available

What:		/sys/.../iio:deviceX/in_capacitance_scale_available

What:		/sys/.../iio:deviceX/in_pressure_scale_available

What:		/sys/.../iio:deviceX/in_pressureY_scale_available

KernelVersion:	2.6.35

Contact:	linux-iio@vger.kernel.org

Description:
@@ -694,6 +712,8 @@ What: /sys/.../buffer/scan_elements/in_voltageY_en 
What:		/sys/.../buffer/scan_elements/in_voltageY-voltageZ_en

What:		/sys/.../buffer/scan_elements/in_incli_x_en

What:		/sys/.../buffer/scan_elements/in_incli_y_en

What:		/sys/.../buffer/scan_elements/in_pressureY_en

What:		/sys/.../buffer/scan_elements/in_pressure_en

KernelVersion:	2.6.37

Contact:	linux-iio@vger.kernel.org

Description:
@@ -707,6 +727,8 @@ What: /sys/.../buffer/scan_elements/in_voltageY_type 
What:		/sys/.../buffer/scan_elements/in_voltage_type

What:		/sys/.../buffer/scan_elements/in_voltageY_supply_type

What:		/sys/.../buffer/scan_elements/in_timestamp_type

What:		/sys/.../buffer/scan_elements/in_pressureY_type

What:		/sys/.../buffer/scan_elements/in_pressure_type

KernelVersion:	2.6.37

Contact:	linux-iio@vger.kernel.org

Description:
@@ -751,6 +773,8 @@ What: /sys/.../buffer/scan_elements/in_magn_z_index 
What:		/sys/.../buffer/scan_elements/in_incli_x_index

What:		/sys/.../buffer/scan_elements/in_incli_y_index

What:		/sys/.../buffer/scan_elements/in_timestamp_index

What:		/sys/.../buffer/scan_elements/in_pressureY_index

What:		/sys/.../buffer/scan_elements/in_pressure_index

KernelVersion:	2.6.37

Contact:	linux-iio@vger.kernel.org

Description:

Documentation/ABI/testing/sysfs-class-devfreq

+36 −8
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ What: /sys/class/devfreq/.../governor 
Date:		September 2011

Contact:	MyungJoo Ham <myungjoo.ham@samsung.com>

Description:

		The /sys/class/devfreq/.../governor shows the name of the

		The /sys/class/devfreq/.../governor show or set the name of the

		governor used by the corresponding devfreq object.



What:		/sys/class/devfreq/.../cur_freq
@@ -19,15 +19,16 @@ Date: September 2011 
Contact:	MyungJoo Ham <myungjoo.ham@samsung.com>

Description:

		The /sys/class/devfreq/.../cur_freq shows the current

		frequency of the corresponding devfreq object.

		frequency of the corresponding devfreq object. Same as

		target_freq when get_cur_freq() is not implemented by

		devfreq driver.



What:		/sys/class/devfreq/.../central_polling

Date:		September 2011

Contact:	MyungJoo Ham <myungjoo.ham@samsung.com>

What:		/sys/class/devfreq/.../target_freq

Date:		September 2012

Contact:	Rajagopal Venkat <rajagopal.venkat@linaro.org>

Description:

		The /sys/class/devfreq/.../central_polling shows whether

		the devfreq ojbect is using devfreq-provided central

		polling mechanism or not.

		The /sys/class/devfreq/.../target_freq shows the next governor

		predicted target frequency of the corresponding devfreq object.



What:		/sys/class/devfreq/.../polling_interval

Date:		September 2011
@@ -43,6 +44,17 @@ Description: 
		(/sys/class/devfreq/.../central_polling is 0), this value

		may be useless.



What:		/sys/class/devfreq/.../trans_stat

Date:		October 2012

Contact:	MyungJoo Ham <myungjoo.ham@samsung.com>

Descrtiption:

		This ABI shows the statistics of devfreq behavior on a

		specific device. It shows the time spent in each state and

		the number of transitions between states.

		In order to activate this ABI, the devfreq target device

		driver should provide the list of available frequencies

		with its profile.



What:		/sys/class/devfreq/.../userspace/set_freq

Date:		September 2011

Contact:	MyungJoo Ham <myungjoo.ham@samsung.com>
@@ -50,3 +62,19 @@ Description: 
		The /sys/class/devfreq/.../userspace/set_freq shows and

		sets the requested frequency for the devfreq object if

		userspace governor is in effect.



What:		/sys/class/devfreq/.../available_frequencies

Date:		October 2012

Contact:	Nishanth Menon <nm@ti.com>

Description:

		The /sys/class/devfreq/.../available_frequencies shows

		the available frequencies of the corresponding devfreq object.

		This is a snapshot of available frequencies and not limited

		by the min/max frequency restrictions.



What:		/sys/class/devfreq/.../available_governors

Date:		October 2012

Contact:	Nishanth Menon <nm@ti.com>

Description:

		The /sys/class/devfreq/.../available_governors shows

		currently available governors in the system.

Documentation/ABI/testing/sysfs-devices-power

+31 −0
Original line number Diff line number Diff line
@@ -204,3 +204,34 @@ Description: 


		This attribute has no effect on system-wide suspend/resume and

		hibernation.



What:		/sys/devices/.../power/pm_qos_no_power_off

Date:		September 2012

Contact:	Rafael J. Wysocki <rjw@sisk.pl>

Description:

		The /sys/devices/.../power/pm_qos_no_power_off attribute

		is used for manipulating the PM QoS "no power off" flag.  If

		set, this flag indicates to the kernel that power should not

		be removed entirely from the device.



		Not all drivers support this attribute.  If it isn't supported,

		it is not present.



		This attribute has no effect on system-wide suspend/resume and

		hibernation.



What:		/sys/devices/.../power/pm_qos_remote_wakeup

Date:		September 2012

Contact:	Rafael J. Wysocki <rjw@sisk.pl>

Description:

		The /sys/devices/.../power/pm_qos_remote_wakeup attribute

		is used for manipulating the PM QoS "remote wakeup required"

		flag.  If set, this flag indicates to the kernel that the

		device is a source of user events that have to be signaled from

		its low-power states.



		Not all drivers support this attribute.  If it isn't supported,

		it is not present.



		This attribute has no effect on system-wide suspend/resume and

		hibernation.

Documentation/ABI/testing/sysfs-devices-sun

0 → 100644
+14 −0
Original line number Diff line number Diff line 
Whatt:		/sys/devices/.../sun

Date:		October 2012

Contact:	Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com>

Description:

		The file contains a Slot-unique ID which provided by the _SUN

		method in the ACPI namespace. The value is written in Advanced

		Configuration and Power Interface Specification as follows:



		"The _SUN value is required to be unique among the slots of

		the same type. It is also recommended that this number match

		the slot number printed on the physical slot whenever possible."



		So reading the sysfs file, we can identify a physical position

		of the slot in the system.