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

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

Merge branch 'linus' into timers/core

Make sure the upstream fixes are applied before adding further
modifications.
parents daa67b4b e2608180
Loading
Loading
Loading
Loading
+11 −0
Original line number Original line Diff line number Diff line
@@ -2049,6 +2049,10 @@ D: pirq addr, CS5535 alsa audio driver
S: Gurgaon, India
S: Gurgaon, India
S: Kuala Lumpur, Malaysia
S: Kuala Lumpur, Malaysia


N: Mohit Kumar
D: ST Microelectronics SPEAr13xx PCI host bridge driver
D: Synopsys Designware PCI host bridge driver

N: Gabor Kuti
N: Gabor Kuti
M: seasons@falcon.sch.bme.hu
M: seasons@falcon.sch.bme.hu
M: seasons@makosteszta.sote.hu
M: seasons@makosteszta.sote.hu
@@ -3705,6 +3709,13 @@ N: Dirk Verworner
D: Co-author of German book ``Linux-Kernel-Programmierung''
D: Co-author of German book ``Linux-Kernel-Programmierung''
D: Co-founder of Berlin Linux User Group
D: Co-founder of Berlin Linux User Group


N: Andrew Victor
E: linux@maxim.org.za
W: http://maxim.org.za/at91_26.html
D: First maintainer of Atmel ARM-based SoC, aka AT91
D: Introduced support for at91rm9200, the first chip of AT91 family
S: South Africa

N: Riku Voipio
N: Riku Voipio
E: riku.voipio@iki.fi
E: riku.voipio@iki.fi
D: Author of PCA9532 LED and Fintek f75375s hwmon driver
D: Author of PCA9532 LED and Fintek f75375s hwmon driver
+10 −0
Original line number Original line Diff line number Diff line
@@ -222,3 +222,13 @@ Description:
		The number of blocks that are marked as reserved, if any, in
		The number of blocks that are marked as reserved, if any, in
		this partition. These are typically used to store the in-flash
		this partition. These are typically used to store the in-flash
		bad block table (BBT).
		bad block table (BBT).

What:		/sys/class/mtd/mtdX/offset
Date:		March 2015
KernelVersion:	4.1
Contact:	linux-mtd@lists.infradead.org
Description:
		For a partition, the offset of that partition from the start
		of the master device in bytes. This attribute is absent on
		main devices, so it can be used to distinguish between
		partitions and devices that aren't partitions.
+80 −13
Original line number Original line Diff line number Diff line
@@ -8,9 +8,11 @@ Description: This file controls the keyboard backlight operation mode, valid
			* 0x2  -> AUTO (also called TIMER)
			* 0x2  -> AUTO (also called TIMER)
			* 0x8  -> ON
			* 0x8  -> ON
			* 0x10 -> OFF
			* 0x10 -> OFF
		Note that the kernel 3.16 onwards this file accepts all listed
		Note that from kernel 3.16 onwards this file accepts all listed
		parameters, kernel 3.15 only accepts the first two (FN-Z and
		parameters, kernel 3.15 only accepts the first two (FN-Z and
		AUTO).
		AUTO).
		Also note that toggling this value on type 1 devices, requires
		a reboot for changes to take effect.
Users:		KToshiba
Users:		KToshiba


What:		/sys/devices/LNXSYSTM:00/LNXSYBUS:00/TOS{1900,620{0,7,8}}:00/kbd_backlight_timeout
What:		/sys/devices/LNXSYSTM:00/LNXSYBUS:00/TOS{1900,620{0,7,8}}:00/kbd_backlight_timeout
@@ -67,15 +69,72 @@ Description: This file shows the current keyboard backlight type,
			* 2 -> Type 2, supporting modes TIMER, ON and OFF
			* 2 -> Type 2, supporting modes TIMER, ON and OFF
Users:		KToshiba
Users:		KToshiba


What:		/sys/devices/LNXSYSTM:00/LNXSYBUS:00/TOS{1900,620{0,7,8}}:00/usb_sleep_charge
Date:		January 23, 2015
KernelVersion:	4.0
Contact:	Azael Avalos <coproscefalo@gmail.com>
Description:	This file controls the USB Sleep & Charge charging mode, which
		can be:
			* 0 -> Disabled		(0x00)
			* 1 -> Alternate	(0x09)
			* 2 -> Auto		(0x21)
			* 3 -> Typical		(0x11)
		Note that from kernel 4.1 onwards this file accepts all listed
		values, kernel 4.0 only supports the first three.
		Note that this feature only works when connected to power, if
		you want to use it under battery, see the entry named
		"sleep_functions_on_battery"
Users:		KToshiba

What:		/sys/devices/LNXSYSTM:00/LNXSYBUS:00/TOS{1900,620{0,7,8}}:00/sleep_functions_on_battery
Date:		January 23, 2015
KernelVersion:	4.0
Contact:	Azael Avalos <coproscefalo@gmail.com>
Description:	This file controls the USB Sleep Functions under battery, and
		set the level at which point they will be disabled, accepted
		values can be:
			* 0	-> Disabled
			* 1-100	-> Battery level to disable sleep functions
		Currently it prints two values, the first one indicates if the
		feature is enabled or disabled, while the second one shows the
		current battery level set.
		Note that when the value is set to disabled, the sleep function
		will only work when connected to power.
Users:		KToshiba

What:		/sys/devices/LNXSYSTM:00/LNXSYBUS:00/TOS{1900,620{0,7,8}}:00/usb_rapid_charge
Date:		January 23, 2015
KernelVersion:	4.0
Contact:	Azael Avalos <coproscefalo@gmail.com>
Description:	This file controls the USB Rapid Charge state, which can be:
			* 0 -> Disabled
			* 1 -> Enabled
		Note that toggling this value requires a reboot for changes to
		take effect.
Users:		KToshiba

What:		/sys/devices/LNXSYSTM:00/LNXSYBUS:00/TOS{1900,620{0,7,8}}:00/usb_sleep_music
Date:		January 23, 2015
KernelVersion:	4.0
Contact:	Azael Avalos <coproscefalo@gmail.com>
Description:	This file controls the Sleep & Music state, which values can be:
			* 0 -> Disabled
			* 1 -> Enabled
		Note that this feature only works when connected to power, if
		you want to use it under battery, see the entry named
		"sleep_functions_on_battery"
Users:		KToshiba

What:		/sys/devices/LNXSYSTM:00/LNXSYBUS:00/TOS{1900,620{0,7,8}}:00/version
What:		/sys/devices/LNXSYSTM:00/LNXSYBUS:00/TOS{1900,620{0,7,8}}:00/version
Date:		February, 2015
Date:		February 12, 2015
KernelVersion:	3.20
KernelVersion:	4.0
Contact:	Azael Avalos <coproscefalo@gmail.com>
Contact:	Azael Avalos <coproscefalo@gmail.com>
Description:	This file shows the current version of the driver
Description:	This file shows the current version of the driver
Users:		KToshiba


What:		/sys/devices/LNXSYSTM:00/LNXSYBUS:00/TOS{1900,620{0,7,8}}:00/fan
What:		/sys/devices/LNXSYSTM:00/LNXSYBUS:00/TOS{1900,620{0,7,8}}:00/fan
Date:		February, 2015
Date:		February 12, 2015
KernelVersion:	3.20
KernelVersion:	4.0
Contact:	Azael Avalos <coproscefalo@gmail.com>
Contact:	Azael Avalos <coproscefalo@gmail.com>
Description:	This file controls the state of the internal fan, valid
Description:	This file controls the state of the internal fan, valid
		values are:
		values are:
@@ -83,8 +142,8 @@ Description: This file controls the state of the internal fan, valid
			* 1 -> ON
			* 1 -> ON


What:		/sys/devices/LNXSYSTM:00/LNXSYBUS:00/TOS{1900,620{0,7,8}}:00/kbd_function_keys
What:		/sys/devices/LNXSYSTM:00/LNXSYBUS:00/TOS{1900,620{0,7,8}}:00/kbd_function_keys
Date:		February, 2015
Date:		February 12, 2015
KernelVersion:	3.20
KernelVersion:	4.0
Contact:	Azael Avalos <coproscefalo@gmail.com>
Contact:	Azael Avalos <coproscefalo@gmail.com>
Description:	This file controls the Special Functions (hotkeys) operation
Description:	This file controls the Special Functions (hotkeys) operation
		mode, valid values are:
		mode, valid values are:
@@ -94,21 +153,29 @@ Description: This file controls the Special Functions (hotkeys) operation
		and the hotkeys are accessed via FN-F{1-12}.
		and the hotkeys are accessed via FN-F{1-12}.
		In the "Special Functions" mode, the F{1-12} keys trigger the
		In the "Special Functions" mode, the F{1-12} keys trigger the
		hotkey and the F{1-12} keys are accessed via FN-F{1-12}.
		hotkey and the F{1-12} keys are accessed via FN-F{1-12}.
		Note that toggling this value requires a reboot for changes to
		take effect.
Users:		KToshiba


What:		/sys/devices/LNXSYSTM:00/LNXSYBUS:00/TOS{1900,620{0,7,8}}:00/panel_power_on
What:		/sys/devices/LNXSYSTM:00/LNXSYBUS:00/TOS{1900,620{0,7,8}}:00/panel_power_on
Date:		February, 2015
Date:		February 12, 2015
KernelVersion:	3.20
KernelVersion:	4.0
Contact:	Azael Avalos <coproscefalo@gmail.com>
Contact:	Azael Avalos <coproscefalo@gmail.com>
Description:	This file controls whether the laptop should turn ON whenever
Description:	This file controls whether the laptop should turn ON whenever
		the LID is opened, valid values are:
		the LID is opened, valid values are:
			* 0 -> Disabled
			* 0 -> Disabled
			* 1 -> Enabled
			* 1 -> Enabled
		Note that toggling this value requires a reboot for changes to
		take effect.
Users:		KToshiba


What:		/sys/devices/LNXSYSTM:00/LNXSYBUS:00/TOS{1900,620{0,7,8}}:00/usb_three
What:		/sys/devices/LNXSYSTM:00/LNXSYBUS:00/TOS{1900,620{0,7,8}}:00/usb_three
Date:		February, 2015
Date:		February 12, 2015
KernelVersion:	3.20
KernelVersion:	4.0
Contact:	Azael Avalos <coproscefalo@gmail.com>
Contact:	Azael Avalos <coproscefalo@gmail.com>
Description:	This file controls whether the USB 3 functionality, valid
Description:	This file controls the USB 3 functionality, valid values are:
		values are:
			* 0 -> Disabled (Acts as a regular USB 2)
			* 0 -> Disabled (Acts as a regular USB 2)
			* 1 -> Enabled (Full USB 3 functionality)
			* 1 -> Enabled (Full USB 3 functionality)
		Note that toggling this value requires a reboot for changes to
		take effect.
Users:		KToshiba
+69 −0
Original line number Original line Diff line number Diff line
What:		/sys/class/leds/dell::kbd_backlight/als_enabled
Date:		December 2014
KernelVersion:	3.19
Contact:	Gabriele Mazzotta <gabriele.mzt@gmail.com>,
		Pali Rohár <pali.rohar@gmail.com>
Description:
		This file allows to control the automatic keyboard
		illumination mode on some systems that have an ambient
		light sensor. Write 1 to this file to enable the auto
		mode, 0 to disable it.

What:		/sys/class/leds/dell::kbd_backlight/als_setting
Date:		December 2014
KernelVersion:	3.19
Contact:	Gabriele Mazzotta <gabriele.mzt@gmail.com>,
		Pali Rohár <pali.rohar@gmail.com>
Description:
		This file allows to specifiy the on/off threshold value,
		as reported by the ambient light sensor.

What:		/sys/class/leds/dell::kbd_backlight/start_triggers
Date:		December 2014
KernelVersion:	3.19
Contact:	Gabriele Mazzotta <gabriele.mzt@gmail.com>,
		Pali Rohár <pali.rohar@gmail.com>
Description:
		This file allows to control the input triggers that
		turn on the keyboard backlight illumination that is
		disabled because of inactivity.
		Read the file to see the triggers available. The ones
		enabled are preceded by '+', those disabled by '-'.

		To enable a trigger, write its name preceded by '+' to
		this file. To disable a trigger, write its name preceded
		by '-' instead.

		For example, to enable the keyboard as trigger run:
		    echo +keyboard > /sys/class/leds/dell::kbd_backlight/start_triggers
		To disable it:
		    echo -keyboard > /sys/class/leds/dell::kbd_backlight/start_triggers

		Note that not all the available triggers can be configured.

What:		/sys/class/leds/dell::kbd_backlight/stop_timeout
Date:		December 2014
KernelVersion:	3.19
Contact:	Gabriele Mazzotta <gabriele.mzt@gmail.com>,
		Pali Rohár <pali.rohar@gmail.com>
Description:
		This file allows to specify the interval after which the
		keyboard illumination is disabled because of inactivity.
		The timeouts are expressed in seconds, minutes, hours and
		days, for which the symbols are 's', 'm', 'h' and 'd'
		respectively.

		To configure the timeout, write to this file a value along
		with any the above units. If no unit is specified, the value
		is assumed to be expressed in seconds.

		For example, to set the timeout to 10 minutes run:
		    echo 10m > /sys/class/leds/dell::kbd_backlight/stop_timeout

		Note that when this file is read, the returned value might be
		expressed in a different unit than the one used when the timeout
		was set.

		Also note that only some timeouts are supported and that
		some systems might fall back to a specific timeout in case
		an invalid timeout is written to this file.
+1 −1
Original line number Original line Diff line number Diff line
@@ -2491,7 +2491,7 @@ that used it. It was originally scheduled for removal in 2.6.35.
        </listitem>
        </listitem>
        <listitem>
        <listitem>
	  <para>Added <constant>V4L2_EVENT_CTRL_CH_RANGE</constant> control event
	  <para>Added <constant>V4L2_EVENT_CTRL_CH_RANGE</constant> control event
	  changes flag. See <xref linkend="changes-flags"/>.</para>
	  changes flag. See <xref linkend="ctrl-changes-flags"/>.</para>
        </listitem>
        </listitem>
      </orderedlist>
      </orderedlist>
    </section>
    </section>
Loading