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

Commit f2006e27 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

Merge branch 'linus' into timers/urgent



Get upstream changes so we can apply fixes against them

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parents e399eb56 9903883f
Loading
Loading
Loading
Loading
+7 −3
Original line number Diff line number Diff line
@@ -4,9 +4,13 @@ Description:

	/sys/module/MODULENAME
		The name of the module that is in the kernel.  This
		module name will show up either if the module is built
		directly into the kernel, or if it is loaded as a
		dynamic module.
		module name will always show up if the module is loaded as a
		dynamic module.  If it is built directly into the kernel, it
		will only show up if it has a version or at least one
		parameter.

		Note: The conditions of creation in the built-in case are not
		by design and may be removed in the future.

	/sys/module/MODULENAME/parameters
		This directory contains individual files that are each
+58 −0
Original line number Diff line number Diff line
What:		/sys/bus/acpi/devices/.../path
Date:		December 2006
Contact:	Rafael J. Wysocki <rjw@rjwysocki.net>
Description:
		This attribute indicates the full path of ACPI namespace
		object associated with the device object.  For example,
		\_SB_.PCI0.
		This file is not present for device objects representing
		fixed ACPI hardware features (like power and sleep
		buttons).

What:		/sys/bus/acpi/devices/.../modalias
Date:		July 2007
Contact:	Rafael J. Wysocki <rjw@rjwysocki.net>
Description:
		This attribute indicates the PNP IDs of the device object.
		That is acpi:HHHHHHHH:[CCCCCCC:].  Where each HHHHHHHH or
		CCCCCCCC contains device object's PNPID (_HID or _CID).

What:		/sys/bus/acpi/devices/.../hid
Date:		April 2005
Contact:	Rafael J. Wysocki <rjw@rjwysocki.net>
Description:
		This attribute indicates the hardware ID (_HID) of the
		device object.  For example, PNP0103.
		This file is present for device objects having the _HID
		control method.

What:		/sys/bus/acpi/devices/.../description
Date:		October 2012
Contact:	Rafael J. Wysocki <rjw@rjwysocki.net>
Description:
		This attribute contains the output of the device object's
		_STR control method, if present.

What:		/sys/bus/acpi/devices/.../adr
Date:		October 2012
Contact:	Rafael J. Wysocki <rjw@rjwysocki.net>
Description:
		This attribute contains the output of the device object's
		_ADR control method, which is present for ACPI device
		objects representing devices having standard enumeration
		algorithms, such as PCI.

What:		/sys/bus/acpi/devices/.../uid
Date:		October 2012
Contact:	Rafael J. Wysocki <rjw@rjwysocki.net>
Description:
		This attribute contains the output of the device object's
		_UID control method, if present.

What:		/sys/bus/acpi/devices/.../eject
Date:		December 2006
Contact:	Rafael J. Wysocki <rjw@rjwysocki.net>
Description:
		Writing 1 to this attribute will trigger hot removal of
		this device object.  This file exists for every device
		object that has _EJ0 method.
+20 −0
Original line number Diff line number Diff line
@@ -78,3 +78,23 @@ Contact: Nishanth Menon <nm@ti.com>
Description:
		The /sys/class/devfreq/.../available_governors shows
		currently available governors in the system.

What:		/sys/class/devfreq/.../min_freq
Date:		January 2013
Contact:	MyungJoo Ham <myungjoo.ham@samsung.com>
Description:
		The /sys/class/devfreq/.../min_freq shows and stores
		the minimum frequency requested by users. It is 0 if
		the user does not care. min_freq overrides the
		frequency requested by governors.

What:		/sys/class/devfreq/.../max_freq
Date:		January 2013
Contact:	MyungJoo Ham <myungjoo.ham@samsung.com>
Description:
		The /sys/class/devfreq/.../max_freq shows and stores
		the maximum frequency requested by users. It is 0 if
		the user does not care. max_freq overrides the
		frequency requested by governors and min_freq.
		The max_freq overrides min_freq because max_freq may be
		used to throttle devices to avoid overheating.
+79 −0
Original line number Diff line number Diff line
What:		/sys/class/pwm/
Date:		May 2013
KernelVersion:	3.11
Contact:	H Hartley Sweeten <hsweeten@visionengravers.com>
Description:
		The pwm/ class sub-directory belongs to the Generic PWM
		Framework and provides a sysfs interface for using PWM
		channels.

What:		/sys/class/pwm/pwmchipN/
Date:		May 2013
KernelVersion:	3.11
Contact:	H Hartley Sweeten <hsweeten@visionengravers.com>
Description:
		A /sys/class/pwm/pwmchipN directory is created for each
		probed PWM controller/chip where N is the base of the
		PWM chip.

What:		/sys/class/pwm/pwmchipN/npwm
Date:		May 2013
KernelVersion:	3.11
Contact:	H Hartley Sweeten <hsweeten@visionengravers.com>
Description:
		The number of PWM channels supported by the PWM chip.

What:		/sys/class/pwm/pwmchipN/export
Date:		May 2013
KernelVersion:	3.11
Contact:	H Hartley Sweeten <hsweeten@visionengravers.com>
Description:
		Exports a PWM channel from the PWM chip for sysfs control.
		Value is between 0 and /sys/class/pwm/pwmchipN/npwm - 1.

What:		/sys/class/pwm/pwmchipN/unexport
Date:		May 2013
KernelVersion:	3.11
Contact:	H Hartley Sweeten <hsweeten@visionengravers.com>
Description:
		Unexports a PWM channel.

What:		/sys/class/pwm/pwmchipN/pwmX
Date:		May 2013
KernelVersion:	3.11
Contact:	H Hartley Sweeten <hsweeten@visionengravers.com>
Description:
		A /sys/class/pwm/pwmchipN/pwmX directory is created for
		each exported PWM channel where X is the exported PWM
		channel number.

What:		/sys/class/pwm/pwmchipN/pwmX/period
Date:		May 2013
KernelVersion:	3.11
Contact:	H Hartley Sweeten <hsweeten@visionengravers.com>
Description:
		Sets the PWM signal period in nanoseconds.

What:		/sys/class/pwm/pwmchipN/pwmX/duty_cycle
Date:		May 2013
KernelVersion:	3.11
Contact:	H Hartley Sweeten <hsweeten@visionengravers.com>
Description:
		Sets the PWM signal duty cycle in nanoseconds.

What:		/sys/class/pwm/pwmchipN/pwmX/polarity
Date:		May 2013
KernelVersion:	3.11
Contact:	H Hartley Sweeten <hsweeten@visionengravers.com>
Description:
		Sets the output polarity of the PWM signal to "normal" or
		"inversed".

What:		/sys/class/pwm/pwmchipN/pwmX/enable
Date:		May 2013
KernelVersion:	3.11
Contact:	H Hartley Sweeten <hsweeten@visionengravers.com>
Description:
		Enable/disable the PWM signal.
		0 is disabled
		1 is enabled
+20 −0
Original line number Diff line number Diff line
What:		/sys/devices/.../online
Date:		April 2013
Contact:	Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Description:
		The /sys/devices/.../online attribute is only present for
		devices whose bus types provide .online() and .offline()
		callbacks.  The number read from it (0 or 1) reflects the value
		of the device's 'offline' field.  If that number is 1 and '0'
		(or 'n', or 'N') is written to this file, the device bus type's
		.offline() callback is executed for the device and (if
		successful) its 'offline' field is updated accordingly.  In
		turn, if that number is 0 and '1' (or 'y', or 'Y') is written to
		this file, the device bus type's .online() callback is executed
		for the device and (if successful) its 'offline' field is
		updated as appropriate.

		After a successful execution of the bus type's .offline()
		callback the device cannot be used for any purpose until either
		it is removed (i.e. device_del() is called for it), or its bus
		type's .online() is exeucted successfully.
Loading