Merge branch 'for-tip' of... (52980189) · Commits · e / devices / android_kernel_oneplus_sm8150

CREDITS

+8 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1510,6 +1510,14 @@ D: Natsemi ethernet
	D: Cobalt Networks (x86) support		D: Cobalt Networks (x86) support
	D: This-and-That		D: This-and-That

			N: Mark M. Hoffman
			E: mhoffman@lightlink.com
			D: asb100, lm93 and smsc47b397 hardware monitoring drivers
			D: hwmon subsystem core
			D: hwmon subsystem maintainer
			D: i2c-sis96x and i2c-stub SMBus drivers
			S: USA

	N: Dirk Hohndel		N: Dirk Hohndel
	E: hohndel@suse.de		E: hohndel@suse.de
	D: The XFree86[tm] Project		D: The XFree86[tm] Project

+1 −5

Original line number	Original line	Diff line number	Diff line
	@@ -13,9 +13,6 @@ Required parent device properties:
	4 = active high level-sensitive		4 = active high level-sensitive
	8 = active low level-sensitive		8 = active low level-sensitive

	Optional parent device properties:
	- reg : contains the PRCMU mailbox address for the AB8500 i2c port

	The AB8500 consists of a large and varied group of sub-devices:		The AB8500 consists of a large and varied group of sub-devices:

	Device IRQ Names Supply Names Description		Device IRQ Names Supply Names Description
	@@ -86,9 +83,8 @@ Non-standard child device properties:
	- stericsson,amic2-bias-vamic1 : Analoge Mic wishes to use a non-standard Vamic		- stericsson,amic2-bias-vamic1 : Analoge Mic wishes to use a non-standard Vamic
	- stericsson,earpeice-cmv : Earpeice voltage (only: 950 \| 1100 \| 1270 \| 1580)		- stericsson,earpeice-cmv : Earpeice voltage (only: 950 \| 1100 \| 1270 \| 1580)

	ab8500@5 {		ab8500 {
	compatible = "stericsson,ab8500";		compatible = "stericsson,ab8500";
	reg = <5>; /* mailbox 5 is i2c */
	interrupts = <0 40 0x4>;		interrupts = <0 40 0x4>;
	interrupt-controller;		interrupt-controller;
	#interrupt-cells = <2>;		#interrupt-cells = <2>;

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -23,7 +23,7 @@ Supported chips:
	Datasheet: Publicly available at the Maxim website		Datasheet: Publicly available at the Maxim website
	http://www.maxim-ic.com/		http://www.maxim-ic.com/
	* Microchip (TelCom) TCN75		* Microchip (TelCom) TCN75
	Prefix: 'lm75'		Prefix: 'tcn75'
	Addresses scanned: none		Addresses scanned: none
	Datasheet: Publicly available at the Microchip website		Datasheet: Publicly available at the Microchip website
	http://www.microchip.com/		http://www.microchip.com/

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -5,7 +5,7 @@ Supported adapters:
	Documentation:		Documentation:
	http://www.diolan.com/i2c/u2c12.html		http://www.diolan.com/i2c/u2c12.html

	Author: Guenter Roeck <guenter.roeck@ericsson.com>		Author: Guenter Roeck <linux@roeck-us.net>

	Description		Description
	-----------		-----------

+7 −0

Original line number	Original line	Diff line number	Diff line
	@@ -15,6 +15,13 @@ amemthresh - INTEGER
	enabled and the variable is automatically set to 2, otherwise		enabled and the variable is automatically set to 2, otherwise
	the strategy is disabled and the variable is set to 1.		the strategy is disabled and the variable is set to 1.

			backup_only - BOOLEAN
			0 - disabled (default)
			not 0 - enabled

			If set, disable the director function while the server is
			in backup mode to avoid packet loops for DR/TUN methods.

	conntrack - BOOLEAN		conntrack - BOOLEAN
	0 - disabled (default)		0 - disabled (default)
	not 0 - enabled		not 0 - enabled