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

Commit 3872fe83 authored by Russell King's avatar Russell King
Browse files

Merge branch 'kprobe-fixes' of https://git.linaro.org/people/tixy/kernel into fixes

parents 3cc070c1 974310d0

Documentation/admin-guide/kernel-parameters.txt

+9 −0
Original line number Diff line number Diff line
@@ -653,6 +653,9 @@ 
	cpuidle.off=1	[CPU_IDLE]

			disable the cpuidle sub-system



	cpufreq.off=1	[CPU_FREQ]

			disable the cpufreq sub-system



	cpu_init_udelay=N

			[X86] Delay for N microsec between assert and de-assert

			of APIC INIT to start processors.  This delay occurs
@@ -1183,6 +1186,12 @@ 
			functions that can be changed at run time by the

			set_graph_notrace file in the debugfs tracing directory.



	ftrace_graph_max_depth=<uint>

			[FTRACE] Used with the function graph tracer. This is

			the max depth it will trace into a function. This value

			can be changed at run time by the max_graph_depth file

			in the tracefs tracing directory. default: 0 (no limit)



	gamecon.map[2|3]=

			[HW,JOY] Multisystem joystick and NES/SNES/PSX pad

			support via parallel port (up to 5 devices per port)

Documentation/arm64/silicon-errata.txt

+1 −0
Original line number Diff line number Diff line
@@ -68,3 +68,4 @@ stable kernels. 
|                |                 |                 |                             |

| Qualcomm Tech. | Falkor v1       | E1003           | QCOM_FALKOR_ERRATUM_1003    |

| Qualcomm Tech. | Falkor v1       | E1009           | QCOM_FALKOR_ERRATUM_1009    |

| Qualcomm Tech. | QDF2400 ITS     | E0065           | QCOM_QDF2400_ERRATUM_0065   |

Documentation/dev-tools/kcov.rst

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ Note that kcov does not aim to collect as much coverage as possible. It aims 
to collect more or less stable coverage that is function of syscall inputs.

To achieve this goal it does not collect coverage in soft/hard interrupts

and instrumentation of some inherently non-deterministic parts of kernel is

disbled (e.g. scheduler, locking).

disabled (e.g. scheduler, locking).



Usage

-----

Documentation/devicetree/bindings/regulator/ti-abb-regulator.txt

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ Required Properties: 
Optional Properties:

- reg-names: In addition to the required properties, the following are optional

  - "efuse-address"	- Contains efuse base address used to pick up ABB info.

  - "ldo-address"	- Contains address of ABB LDO overide register address.

  - "ldo-address"	- Contains address of ABB LDO override register.

	"efuse-address" is required for this.

- ti,ldovbb-vset-mask	- Required if ldo-address is set, mask for LDO override

	register to provide override vset value.

Documentation/devicetree/bindings/usb/usb251xb.txt

+18 −35
Original line number Diff line number Diff line
@@ -7,18 +7,18 @@ Required properties : 
 - compatible : Should be "microchip,usb251xb" or one of the specific types:

	"microchip,usb2512b", "microchip,usb2512bi", "microchip,usb2513b",

	"microchip,usb2513bi", "microchip,usb2514b", "microchip,usb2514bi"

 - hub-reset-gpios : Should specify the gpio for hub reset

 - reset-gpios : Should specify the gpio for hub reset

 - reg : I2C address on the selected bus (default is <0x2C>)



Optional properties :

 - reg : I2C address on the selected bus (default is <0x2C>)

 - skip-config : Skip Hub configuration, but only send the USB-Attach command

 - vendor-id : USB Vendor ID of the hub (16 bit, default is 0x0424)

 - product-id : USB Product ID of the hub (16 bit, default depends on type)

 - device-id : USB Device ID of the hub (16 bit, default is 0x0bb3)

 - language-id : USB Language ID (16 bit, default is 0x0000)

 - manufacturer : USB Manufacturer string (max 31 characters long)

 - product : USB Product string (max 31 characters long)

 - serial : USB Serial string (max 31 characters long)

 - vendor-id : Set USB Vendor ID of the hub (16 bit, default is 0x0424)

 - product-id : Set USB Product ID of the hub (16 bit, default depends on type)

 - device-id : Set USB Device ID of the hub (16 bit, default is 0x0bb3)

 - language-id : Set USB Language ID (16 bit, default is 0x0000)

 - manufacturer : Set USB Manufacturer string (max 31 characters long)

 - product : Set USB Product string (max 31 characters long)

 - serial : Set USB Serial string (max 31 characters long)

 - {bus,self}-powered : selects between self- and bus-powered operation (default

	is self-powered)

 - disable-hi-speed : disable USB Hi-Speed support
@@ -31,8 +31,10 @@ Optional properties : 
	(default is individual)

 - dynamic-power-switching : enable auto-switching from self- to bus-powered

	operation if the local power source is removed or unavailable

 - oc-delay-{100us,4ms,8ms,16ms} : set over current timer delay (default is 8ms)

 - compound-device : indicated the hub is part of a compound device

 - oc-delay-us : Delay time (in microseconds) for filtering the over-current

	sense inputs. Valid values are 100, 4000, 8000 (default) and 16000. If

	an invalid value is given, the default is used instead.

 - compound-device : indicate the hub is part of a compound device

 - port-mapping-mode : enable port mapping mode

 - string-support : enable string descriptor support (required for manufacturer,

	product and serial string configuration)
@@ -40,34 +42,15 @@ Optional properties : 
	device connected.

 - sp-disabled-ports : Specifies the ports which will be self-power disabled

 - bp-disabled-ports : Specifies the ports which will be bus-power disabled

 - max-sp-power : Specifies the maximum current the hub consumes from an

	upstream port when operating as self-powered hub including the power

	consumption of a permanently attached peripheral if the hub is

	configured as a compound device. The value is given in mA in a 0 - 500

	range (default is 2).

 - max-bp-power : Specifies the maximum current the hub consumes from an

	upstream port when operating as bus-powered hub including the power

	consumption of a permanently attached peripheral if the hub is

	configured as a compound device. The value is given in mA in a 0 - 500

	range (default is 100).

 - max-sp-current : Specifies the maximum current the hub consumes from an

	upstream port when operating as self-powered hub EXCLUDING the power

	consumption of a permanently attached peripheral if the hub is

	configured as a compound device. The value is given in mA in a 0 - 500

	range (default is 2).

 - max-bp-current : Specifies the maximum current the hub consumes from an

	upstream port when operating as bus-powered hub EXCLUDING the power

	consumption of a permanently attached peripheral if the hub is

	configured as a compound device. The value is given in mA in a 0 - 500

	range (default is 100).

 - power-on-time : Specifies the time it takes from the time the host initiates

	the power-on sequence to a port until the port has adequate power. The

	value is given in ms in a 0 - 510 range (default is 100ms).

 - power-on-time-ms : Specifies the time it takes from the time the host

	initiates the power-on sequence to a port until the port has adequate

	power. The value is given in ms in a 0 - 510 range (default is 100ms).



Examples:

	usb2512b@2c {

		compatible = "microchip,usb2512b";

		hub-reset-gpios = <&gpio1 4 GPIO_ACTIVE_LOW>;

		reg = <0x2c>;

		reset-gpios = <&gpio1 4 GPIO_ACTIVE_LOW>;

	};



	usb2514b@2c {