Merge tag 'v4.4.7' into linux-linaro-lsk-v4.4 (ad592b70) · Commits · e / devices / android_kernel_sony_msm8998

MAINTAINERS

+48 −48

Original line number	Diff line number	Diff line
		@@ -230,13 +230,13 @@ F: kernel/sys_ni.c

		ABIT UGURU 1,2 HARDWARE MONITOR DRIVER
		M: Hans de Goede <hdegoede@redhat.com>
		L: lm-sensors@lm-sensors.org
		L: linux-hwmon@vger.kernel.org
		S: Maintained
		F: drivers/hwmon/abituguru.c

		ABIT UGURU 3 HARDWARE MONITOR DRIVER
		M: Alistair John Strachan <alistair@devzero.co.uk>
		L: lm-sensors@lm-sensors.org
		L: linux-hwmon@vger.kernel.org
		S: Maintained
		F: drivers/hwmon/abituguru3.c

		@@ -373,14 +373,14 @@ S: Maintained

		ADM1025 HARDWARE MONITOR DRIVER
		M: Jean Delvare <jdelvare@suse.com>
		L: lm-sensors@lm-sensors.org
		L: linux-hwmon@vger.kernel.org
		S: Maintained
		F: Documentation/hwmon/adm1025
		F: drivers/hwmon/adm1025.c

		ADM1029 HARDWARE MONITOR DRIVER
		M: Corentin Labbe <clabbe.montjoie@gmail.com>
		L: lm-sensors@lm-sensors.org
		L: linux-hwmon@vger.kernel.org
		S: Maintained
		F: drivers/hwmon/adm1029.c

		@@ -425,7 +425,7 @@ F: drivers/video/backlight/adp8860_bl.c

		ADS1015 HARDWARE MONITOR DRIVER
		M: Dirk Eibach <eibach@gdsys.de>
		L: lm-sensors@lm-sensors.org
		L: linux-hwmon@vger.kernel.org
		S: Maintained
		F: Documentation/hwmon/ads1015
		F: drivers/hwmon/ads1015.c
		@@ -438,7 +438,7 @@ F: drivers/macintosh/therm_adt746x.c

		ADT7475 HARDWARE MONITOR DRIVER
		M: Jean Delvare <jdelvare@suse.com>
		L: lm-sensors@lm-sensors.org
		L: linux-hwmon@vger.kernel.org
		S: Maintained
		F: Documentation/hwmon/adt7475
		F: drivers/hwmon/adt7475.c
		@@ -615,7 +615,7 @@ F: include/linux/ccp.h

		AMD FAM15H PROCESSOR POWER MONITORING DRIVER
		M: Andreas Herrmann <herrmann.der.user@googlemail.com>
		L: lm-sensors@lm-sensors.org
		L: linux-hwmon@vger.kernel.org
		S: Maintained
		F: Documentation/hwmon/fam15h_power
		F: drivers/hwmon/fam15h_power.c
		@@ -779,7 +779,7 @@ F: drivers/input/mouse/bcm5974.c

		APPLE SMC DRIVER
		M: Henrik Rydberg <rydberg@bitmath.org>
		L: lm-sensors@lm-sensors.org
		L: linux-hwmon@vger.kernel.org
		S: Odd fixes
		F: drivers/hwmon/applesmc.c

		@@ -1777,7 +1777,7 @@ F: include/media/as3645a.h

		ASC7621 HARDWARE MONITOR DRIVER
		M: George Joseph <george.joseph@fairview5.com>
		L: lm-sensors@lm-sensors.org
		L: linux-hwmon@vger.kernel.org
		S: Maintained
		F: Documentation/hwmon/asc7621
		F: drivers/hwmon/asc7621.c
		@@ -1864,7 +1864,7 @@ F: drivers/net/wireless/ath/carl9170/

		ATK0110 HWMON DRIVER
		M: Luca Tettamanti <kronos.it@gmail.com>
		L: lm-sensors@lm-sensors.org
		L: linux-hwmon@vger.kernel.org
		S: Maintained
		F: drivers/hwmon/asus_atk0110.c

		@@ -2984,7 +2984,7 @@ F: mm/swap_cgroup.c

		CORETEMP HARDWARE MONITORING DRIVER
		M: Fenghua Yu <fenghua.yu@intel.com>
		L: lm-sensors@lm-sensors.org
		L: linux-hwmon@vger.kernel.org
		S: Maintained
		F: Documentation/hwmon/coretemp
		F: drivers/hwmon/coretemp.c
		@@ -3549,7 +3549,7 @@ T: git git://git.infradead.org/users/vkoul/slave-dma.git

		DME1737 HARDWARE MONITOR DRIVER
		M: Juerg Haefliger <juergh@gmail.com>
		L: lm-sensors@lm-sensors.org
		L: linux-hwmon@vger.kernel.org
		S: Maintained
		F: Documentation/hwmon/dme1737
		F: drivers/hwmon/dme1737.c
		@@ -4262,7 +4262,7 @@ F: include/video/exynos_mipi*

		F71805F HARDWARE MONITORING DRIVER
		M: Jean Delvare <jdelvare@suse.com>
		L: lm-sensors@lm-sensors.org
		L: linux-hwmon@vger.kernel.org
		S: Maintained
		F: Documentation/hwmon/f71805f
		F: drivers/hwmon/f71805f.c
		@@ -4341,7 +4341,7 @@ F: fs/*

		FINTEK F75375S HARDWARE MONITOR AND FAN CONTROLLER DRIVER
		M: Riku Voipio <riku.voipio@iki.fi>
		L: lm-sensors@lm-sensors.org
		L: linux-hwmon@vger.kernel.org
		S: Maintained
		F: drivers/hwmon/f75375s.c
		F: include/linux/f75375s.h
		@@ -4883,8 +4883,8 @@ F: drivers/media/usb/hackrf/
		HARDWARE MONITORING
		M: Jean Delvare <jdelvare@suse.com>
		M: Guenter Roeck <linux@roeck-us.net>
		L: lm-sensors@lm-sensors.org
		W: http://www.lm-sensors.org/
		L: linux-hwmon@vger.kernel.org
		W: http://hwmon.wiki.kernel.org/
		T: quilt http://jdelvare.nerim.net/devel/linux/jdelvare-hwmon/
		T: git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git
		S: Maintained
		@@ -5393,7 +5393,7 @@ F: drivers/usb/atm/ueagle-atm.c

		INA209 HARDWARE MONITOR DRIVER
		M: Guenter Roeck <linux@roeck-us.net>
		L: lm-sensors@lm-sensors.org
		L: linux-hwmon@vger.kernel.org
		S: Maintained
		F: Documentation/hwmon/ina209
		F: Documentation/devicetree/bindings/i2c/ina209.txt
		@@ -5401,7 +5401,7 @@ F: drivers/hwmon/ina209.c

		INA2XX HARDWARE MONITOR DRIVER
		M: Guenter Roeck <linux@roeck-us.net>
		L: lm-sensors@lm-sensors.org
		L: linux-hwmon@vger.kernel.org
		S: Maintained
		F: Documentation/hwmon/ina2xx
		F: drivers/hwmon/ina2xx.c
		@@ -5884,7 +5884,7 @@ F: drivers/isdn/hardware/eicon/

		IT87 HARDWARE MONITORING DRIVER
		M: Jean Delvare <jdelvare@suse.com>
		L: lm-sensors@lm-sensors.org
		L: linux-hwmon@vger.kernel.org
		S: Maintained
		F: Documentation/hwmon/it87
		F: drivers/hwmon/it87.c
		@@ -5920,7 +5920,7 @@ F: drivers/media/dvb-frontends/ix2505v*

		JC42.4 TEMPERATURE SENSOR DRIVER
		M: Guenter Roeck <linux@roeck-us.net>
		L: lm-sensors@lm-sensors.org
		L: linux-hwmon@vger.kernel.org
		S: Maintained
		F: drivers/hwmon/jc42.c
		F: Documentation/hwmon/jc42
		@@ -5970,14 +5970,14 @@ F: drivers/tty/serial/jsm/

		K10TEMP HARDWARE MONITORING DRIVER
		M: Clemens Ladisch <clemens@ladisch.de>
		L: lm-sensors@lm-sensors.org
		L: linux-hwmon@vger.kernel.org
		S: Maintained
		F: Documentation/hwmon/k10temp
		F: drivers/hwmon/k10temp.c

		K8TEMP HARDWARE MONITORING DRIVER
		M: Rudolf Marek <r.marek@assembler.cz>
		L: lm-sensors@lm-sensors.org
		L: linux-hwmon@vger.kernel.org
		S: Maintained
		F: Documentation/hwmon/k8temp
		F: drivers/hwmon/k8temp.c
		@@ -6485,27 +6485,27 @@ F: net/llc/

		LM73 HARDWARE MONITOR DRIVER
		M: Guillaume Ligneul <guillaume.ligneul@gmail.com>
		L: lm-sensors@lm-sensors.org
		L: linux-hwmon@vger.kernel.org
		S: Maintained
		F: drivers/hwmon/lm73.c

		LM78 HARDWARE MONITOR DRIVER
		M: Jean Delvare <jdelvare@suse.com>
		L: lm-sensors@lm-sensors.org
		L: linux-hwmon@vger.kernel.org
		S: Maintained
		F: Documentation/hwmon/lm78
		F: drivers/hwmon/lm78.c

		LM83 HARDWARE MONITOR DRIVER
		M: Jean Delvare <jdelvare@suse.com>
		L: lm-sensors@lm-sensors.org
		L: linux-hwmon@vger.kernel.org
		S: Maintained
		F: Documentation/hwmon/lm83
		F: drivers/hwmon/lm83.c

		LM90 HARDWARE MONITOR DRIVER
		M: Jean Delvare <jdelvare@suse.com>
		L: lm-sensors@lm-sensors.org
		L: linux-hwmon@vger.kernel.org
		S: Maintained
		F: Documentation/hwmon/lm90
		F: Documentation/devicetree/bindings/hwmon/lm90.txt
		@@ -6513,7 +6513,7 @@ F: drivers/hwmon/lm90.c

		LM95234 HARDWARE MONITOR DRIVER
		M: Guenter Roeck <linux@roeck-us.net>
		L: lm-sensors@lm-sensors.org
		L: linux-hwmon@vger.kernel.org
		S: Maintained
		F: Documentation/hwmon/lm95234
		F: drivers/hwmon/lm95234.c
		@@ -6580,7 +6580,7 @@ F: drivers/scsi/sym53c8xx_2/

		LTC4261 HARDWARE MONITOR DRIVER
		M: Guenter Roeck <linux@roeck-us.net>
		L: lm-sensors@lm-sensors.org
		L: linux-hwmon@vger.kernel.org
		S: Maintained
		F: Documentation/hwmon/ltc4261
		F: drivers/hwmon/ltc4261.c
		@@ -6749,28 +6749,28 @@ F: include/uapi/linux/matroxfb.h

		MAX16065 HARDWARE MONITOR DRIVER
		M: Guenter Roeck <linux@roeck-us.net>
		L: lm-sensors@lm-sensors.org
		L: linux-hwmon@vger.kernel.org
		S: Maintained
		F: Documentation/hwmon/max16065
		F: drivers/hwmon/max16065.c

		MAX20751 HARDWARE MONITOR DRIVER
		M: Guenter Roeck <linux@roeck-us.net>
		L: lm-sensors@lm-sensors.org
		L: linux-hwmon@vger.kernel.org
		S: Maintained
		F: Documentation/hwmon/max20751
		F: drivers/hwmon/max20751.c

		MAX6650 HARDWARE MONITOR AND FAN CONTROLLER DRIVER
		M: "Hans J. Koch" <hjk@hansjkoch.de>
		L: lm-sensors@lm-sensors.org
		L: linux-hwmon@vger.kernel.org
		S: Maintained
		F: Documentation/hwmon/max6650
		F: drivers/hwmon/max6650.c

		MAX6697 HARDWARE MONITOR DRIVER
		M: Guenter Roeck <linux@roeck-us.net>
		L: lm-sensors@lm-sensors.org
		L: linux-hwmon@vger.kernel.org
		S: Maintained
		F: Documentation/hwmon/max6697
		F: Documentation/devicetree/bindings/i2c/max6697.txt
		@@ -7303,7 +7303,7 @@ F: drivers/scsi/NCR_D700.*

		NCT6775 HARDWARE MONITOR DRIVER
		M: Guenter Roeck <linux@roeck-us.net>
		L: lm-sensors@lm-sensors.org
		L: linux-hwmon@vger.kernel.org
		S: Maintained
		F: Documentation/hwmon/nct6775
		F: drivers/hwmon/nct6775.c
		@@ -8064,7 +8064,7 @@ F: drivers/video/logo/logo_parisc*

		PC87360 HARDWARE MONITORING DRIVER
		M: Jim Cromie <jim.cromie@gmail.com>
		L: lm-sensors@lm-sensors.org
		L: linux-hwmon@vger.kernel.org
		S: Maintained
		F: Documentation/hwmon/pc87360
		F: drivers/hwmon/pc87360.c
		@@ -8076,7 +8076,7 @@ F: drivers/char/pc8736x_gpio.c

		PC87427 HARDWARE MONITORING DRIVER
		M: Jean Delvare <jdelvare@suse.com>
		L: lm-sensors@lm-sensors.org
		L: linux-hwmon@vger.kernel.org
		S: Maintained
		F: Documentation/hwmon/pc87427
		F: drivers/hwmon/pc87427.c
		@@ -8415,8 +8415,8 @@ F: drivers/rtc/rtc-puv3.c

		PMBUS HARDWARE MONITORING DRIVERS
		M: Guenter Roeck <linux@roeck-us.net>
		L: lm-sensors@lm-sensors.org
		W: http://www.lm-sensors.org/
		L: linux-hwmon@vger.kernel.org
		W: http://hwmon.wiki.kernel.org/
		W: http://www.roeck-us.net/linux/drivers/
		T: git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git
		S: Maintained
		@@ -8610,7 +8610,7 @@ F: drivers/media/usb/pwc/*

		PWM FAN DRIVER
		M: Kamil Debski <k.debski@samsung.com>
		L: lm-sensors@lm-sensors.org
		L: linux-hwmon@vger.kernel.org
		S: Supported
		F: Documentation/devicetree/bindings/hwmon/pwm-fan.txt
		F: Documentation/hwmon/pwm-fan
		@@ -9882,28 +9882,28 @@ F: Documentation/devicetree/bindings/media/i2c/nokia,smia.txt

		SMM665 HARDWARE MONITOR DRIVER
		M: Guenter Roeck <linux@roeck-us.net>
		L: lm-sensors@lm-sensors.org
		L: linux-hwmon@vger.kernel.org
		S: Maintained
		F: Documentation/hwmon/smm665
		F: drivers/hwmon/smm665.c

		SMSC EMC2103 HARDWARE MONITOR DRIVER
		M: Steve Glendinning <steve.glendinning@shawell.net>
		L: lm-sensors@lm-sensors.org
		L: linux-hwmon@vger.kernel.org
		S: Maintained
		F: Documentation/hwmon/emc2103
		F: drivers/hwmon/emc2103.c

		SMSC SCH5627 HARDWARE MONITOR DRIVER
		M: Hans de Goede <hdegoede@redhat.com>
		L: lm-sensors@lm-sensors.org
		L: linux-hwmon@vger.kernel.org
		S: Supported
		F: Documentation/hwmon/sch5627
		F: drivers/hwmon/sch5627.c

		SMSC47B397 HARDWARE MONITOR DRIVER
		M: Jean Delvare <jdelvare@suse.com>
		L: lm-sensors@lm-sensors.org
		L: linux-hwmon@vger.kernel.org
		S: Maintained
		F: Documentation/hwmon/smsc47b397
		F: drivers/hwmon/smsc47b397.c
		@@ -10830,7 +10830,7 @@ F: include/linux/mmc/sh_mobile_sdhi.h

		TMP401 HARDWARE MONITOR DRIVER
		M: Guenter Roeck <linux@roeck-us.net>
		L: lm-sensors@lm-sensors.org
		L: linux-hwmon@vger.kernel.org
		S: Maintained
		F: Documentation/hwmon/tmp401
		F: drivers/hwmon/tmp401.c
		@@ -11564,14 +11564,14 @@ F: Documentation/networking/vrf.txt

		VT1211 HARDWARE MONITOR DRIVER
		M: Juerg Haefliger <juergh@gmail.com>
		L: lm-sensors@lm-sensors.org
		L: linux-hwmon@vger.kernel.org
		S: Maintained
		F: Documentation/hwmon/vt1211
		F: drivers/hwmon/vt1211.c

		VT8231 HARDWARE MONITOR DRIVER
		M: Roger Lucas <vt8231@hiddenengine.co.uk>
		L: lm-sensors@lm-sensors.org
		L: linux-hwmon@vger.kernel.org
		S: Maintained
		F: drivers/hwmon/vt8231.c

		@@ -11590,21 +11590,21 @@ F: drivers/w1/

		W83791D HARDWARE MONITORING DRIVER
		M: Marc Hulsman <m.hulsman@tudelft.nl>
		L: lm-sensors@lm-sensors.org
		L: linux-hwmon@vger.kernel.org
		S: Maintained
		F: Documentation/hwmon/w83791d
		F: drivers/hwmon/w83791d.c

		W83793 HARDWARE MONITORING DRIVER
		M: Rudolf Marek <r.marek@assembler.cz>
		L: lm-sensors@lm-sensors.org
		L: linux-hwmon@vger.kernel.org
		S: Maintained
		F: Documentation/hwmon/w83793
		F: drivers/hwmon/w83793.c

		W83795 HARDWARE MONITORING DRIVER
		M: Jean Delvare <jdelvare@suse.com>
		L: lm-sensors@lm-sensors.org
		L: linux-hwmon@vger.kernel.org
		S: Maintained
		F: drivers/hwmon/w83795.c

Makefile

+1 −1

Original line number	Diff line number	Diff line
		VERSION = 4
		PATCHLEVEL = 4
		SUBLEVEL = 6
		SUBLEVEL = 7
		EXTRAVERSION =
		NAME = Blurry Fish Butt

arch/arc/include/asm/bitops.h

+0 −15

Original line number	Diff line number	Diff line
		@@ -35,21 +35,6 @@ static inline void op##_bit(unsigned long nr, volatile unsigned long *m)\
		\
		m += nr >> 5; \
		\
		/* \
		* ARC ISA micro-optimization: \
		* \
		* Instructions dealing with bitpos only consider lower 5 bits \
		* e.g (x << 33) is handled like (x << 1) by ASL instruction \
		* (mem pointer still needs adjustment to point to next word) \
		* \
		* Hence the masking to clamp @nr arg can be elided in general. \
		* \
		* However if @nr is a constant (above assumed in a register), \
		* and greater than 31, gcc can optimize away (x << 33) to 0, \
		* as overflow, given the 32-bit ISA. Thus masking needs to be \
		* done for const @nr, but no code is generated due to gcc \
		* const prop. \
		*/ \
		nr &= 0x1f; \
		\
		__asm__ __volatile__( \

arch/arc/include/asm/io.h

+13 −5

Original line number	Diff line number	Diff line
		@@ -129,15 +129,23 @@ static inline void __raw_writel(u32 w, volatile void __iomem *addr)
		#define writel(v,c) ({ __iowmb(); writel_relaxed(v,c); })

		/*
		* Relaxed API for drivers which can handle any ordering themselves
		* Relaxed API for drivers which can handle barrier ordering themselves
		*
		* Also these are defined to perform little endian accesses.
		* To provide the typical device register semantics of fixed endian,
		* swap the byte order for Big Endian
		*
		* http://lkml.kernel.org/r/201603100845.30602.arnd@arndb.de
		*/
		#define readb_relaxed(c) __raw_readb(c)
		#define readw_relaxed(c) __raw_readw(c)
		#define readl_relaxed(c) __raw_readl(c)
		#define readw_relaxed(c) ({ u16 __r = le16_to_cpu((__force __le16) \
		__raw_readw(c)); __r; })
		#define readl_relaxed(c) ({ u32 __r = le32_to_cpu((__force __le32) \
		__raw_readl(c)); __r; })

		#define writeb_relaxed(v,c) __raw_writeb(v,c)
		#define writew_relaxed(v,c) __raw_writew(v,c)
		#define writel_relaxed(v,c) __raw_writel(v,c)
		#define writew_relaxed(v,c) __raw_writew((__force u16) cpu_to_le16(v),c)
		#define writel_relaxed(v,c) __raw_writel((__force u32) cpu_to_le32(v),c)

		#include <asm-generic/io.h>

arch/arm/boot/dts/at91-sama5d3_xplained.dts

+1 −0

Original line number	Diff line number	Diff line
		@@ -303,6 +303,7 @@
		regulator-name = "mmc0-card-supply";
		regulator-min-microvolt = <3300000>;
		regulator-max-microvolt = <3300000>;
		regulator-always-on;
		};

		gpio_keys {