Merge branch 'master' of... (dff243f7) · Commits · e / devices / samsung / android_kernel_samsung_exynos7580-common

CREDITS

+22 −8

Original line number	Original line	Diff line number	Diff line
	@@ -464,6 +464,11 @@ S: 1200 Goldenrod Dr.
	S: Nampa, Idaho 83686		S: Nampa, Idaho 83686
	S: USA		S: USA

			N: Dirk J. Brandewie
			E: dirk.j.brandewie@intel.com
			E: linux-wimax@intel.com
			D: Intel Wireless WiMAX Connection 2400 SDIO driver

	N: Derrick J. Brashear		N: Derrick J. Brashear
	E: shadow@dementia.org		E: shadow@dementia.org
	W: http://www.dementia.org/~shadow		W: http://www.dementia.org/~shadow
	@@ -1681,7 +1686,7 @@ E: ajoshi@shell.unixbox.com
	D: fbdev hacking		D: fbdev hacking

	N: Jesper Juhl		N: Jesper Juhl
	E: jesper.juhl@gmail.com		E: jj@chaosbits.net
	D: Various fixes, cleanups and minor features all over the tree.		D: Various fixes, cleanups and minor features all over the tree.
	D: Wrote initial version of the hdaps driver (since passed on to others).		D: Wrote initial version of the hdaps driver (since passed on to others).
	S: Lemnosvej 1, 3.tv		S: Lemnosvej 1, 3.tv
	@@ -2119,6 +2124,11 @@ N: H.J. Lu
	E: hjl@gnu.ai.mit.edu		E: hjl@gnu.ai.mit.edu
	D: GCC + libraries hacker		D: GCC + libraries hacker

			N: Yanir Lubetkin
			E: yanirx.lubatkin@intel.com
			E: linux-wimax@intel.com
			D: Intel Wireless WiMAX Connection 2400 driver

	N: Michal Ludvig		N: Michal Ludvig
	E: michal@logix.cz		E: michal@logix.cz
	E: michal.ludvig@asterisk.co.nz		E: michal.ludvig@asterisk.co.nz
	@@ -2693,6 +2703,13 @@ S: RR #5, 497 Pole Line Road
	S: Thunder Bay, Ontario		S: Thunder Bay, Ontario
	S: CANADA P7C 5M9		S: CANADA P7C 5M9

			N: Inaky Perez-Gonzalez
			E: inaky.perez-gonzalez@intel.com
			E: linux-wimax@intel.com
			E: inakypg@yahoo.com
			D: WiMAX stack
			D: Intel Wireless WiMAX Connection 2400 driver

	N: Yuri Per		N: Yuri Per
	E: yuri@pts.mipt.ru		E: yuri@pts.mipt.ru
	D: Some smbfs fixes		D: Some smbfs fixes
	@@ -3769,14 +3786,11 @@ S: The Netherlands

	N: David Woodhouse		N: David Woodhouse
	E: dwmw2@infradead.org		E: dwmw2@infradead.org
	D: ARCnet stuff, Applicom board driver, SO_BINDTODEVICE,		D: JFFS2 file system, Memory Technology Device subsystem,
	D: some Alpha platform porting from 2.0, Memory Technology Devices,
	D: Acquire watchdog timer, PC speaker driver maintenance,
	D: various other stuff that annoyed me by not working.		D: various other stuff that annoyed me by not working.
	S: c/o Red Hat Engineering		S: c/o Intel Corporation
	S: Rustat House		S: Pipers Way
	S: 60 Clifton Road		S: Swindon. SN3 1RJ
	S: Cambridge. CB1 7EG
	S: England		S: England

	N: Chris Wright		N: Chris Wright

Documentation/ABI/testing/sysfs-class-regulator

+60 −76

Original line number	Original line	Diff line number	Diff line
	@@ -3,8 +3,9 @@ Date: April 2008
	KernelVersion: 2.6.26		KernelVersion: 2.6.26
	Contact: Liam Girdwood <lrg@slimlogic.co.uk>		Contact: Liam Girdwood <lrg@slimlogic.co.uk>
	Description:		Description:
	Each regulator directory will contain a field called		Some regulator directories will contain a field called
	state. This holds the regulator output state.		state. This reports the regulator enable status, for
			regulators which can report that value.

	This will be one of the following strings:		This will be one of the following strings:

	@@ -18,7 +19,8 @@ Description:
	'disabled' means the regulator output is OFF and is not		'disabled' means the regulator output is OFF and is not
	supplying power to the system..		supplying power to the system..

	'unknown' means software cannot determine the state.		'unknown' means software cannot determine the state, or
			the reported state is invalid.

	NOTE: this field can be used in conjunction with microvolts		NOTE: this field can be used in conjunction with microvolts
	and microamps to determine regulator output levels.		and microamps to determine regulator output levels.
	@@ -53,9 +55,10 @@ Date: April 2008
	KernelVersion: 2.6.26		KernelVersion: 2.6.26
	Contact: Liam Girdwood <lrg@slimlogic.co.uk>		Contact: Liam Girdwood <lrg@slimlogic.co.uk>
	Description:		Description:
	Each regulator directory will contain a field called		Some regulator directories will contain a field called
	microvolts. This holds the regulator output voltage setting		microvolts. This holds the regulator output voltage setting
	measured in microvolts (i.e. E-6 Volts).		measured in microvolts (i.e. E-6 Volts), for regulators
			which can report that voltage.

	NOTE: This value should not be used to determine the regulator		NOTE: This value should not be used to determine the regulator
	output voltage level as this value is the same regardless of		output voltage level as this value is the same regardless of
	@@ -67,9 +70,10 @@ Date: April 2008
	KernelVersion: 2.6.26		KernelVersion: 2.6.26
	Contact: Liam Girdwood <lrg@slimlogic.co.uk>		Contact: Liam Girdwood <lrg@slimlogic.co.uk>
	Description:		Description:
	Each regulator directory will contain a field called		Some regulator directories will contain a field called
	microamps. This holds the regulator output current limit		microamps. This holds the regulator output current limit
	setting measured in microamps (i.e. E-6 Amps).		setting measured in microamps (i.e. E-6 Amps), for regulators
			which can report that current.

	NOTE: This value should not be used to determine the regulator		NOTE: This value should not be used to determine the regulator
	output current level as this value is the same regardless of		output current level as this value is the same regardless of
	@@ -81,8 +85,9 @@ Date: April 2008
	KernelVersion: 2.6.26		KernelVersion: 2.6.26
	Contact: Liam Girdwood <lrg@slimlogic.co.uk>		Contact: Liam Girdwood <lrg@slimlogic.co.uk>
	Description:		Description:
	Each regulator directory will contain a field called		Some regulator directories will contain a field called
	opmode. This holds the regulator operating mode setting.		opmode. This holds the current regulator operating mode,
			for regulators which can report it.

	The opmode value can be one of the following strings:		The opmode value can be one of the following strings:

	@@ -92,7 +97,7 @@ Description:
	'standby'		'standby'
	'unknown'		'unknown'

	The modes are described in include/linux/regulator/regulator.h		The modes are described in include/linux/regulator/consumer.h

	NOTE: This value should not be used to determine the regulator		NOTE: This value should not be used to determine the regulator
	output operating mode as this value is the same regardless of		output operating mode as this value is the same regardless of
	@@ -104,9 +109,10 @@ Date: April 2008
	KernelVersion: 2.6.26		KernelVersion: 2.6.26
	Contact: Liam Girdwood <lrg@slimlogic.co.uk>		Contact: Liam Girdwood <lrg@slimlogic.co.uk>
	Description:		Description:
	Each regulator directory will contain a field called		Some regulator directories will contain a field called
	min_microvolts. This holds the minimum safe working regulator		min_microvolts. This holds the minimum safe working regulator
	output voltage setting for this domain measured in microvolts.		output voltage setting for this domain measured in microvolts,
			for regulators which support voltage constraints.

	NOTE: this will return the string 'constraint not defined' if		NOTE: this will return the string 'constraint not defined' if
	the power domain has no min microvolts constraint defined by		the power domain has no min microvolts constraint defined by
	@@ -118,9 +124,10 @@ Date: April 2008
	KernelVersion: 2.6.26		KernelVersion: 2.6.26
	Contact: Liam Girdwood <lrg@slimlogic.co.uk>		Contact: Liam Girdwood <lrg@slimlogic.co.uk>
	Description:		Description:
	Each regulator directory will contain a field called		Some regulator directories will contain a field called
	max_microvolts. This holds the maximum safe working regulator		max_microvolts. This holds the maximum safe working regulator
	output voltage setting for this domain measured in microvolts.		output voltage setting for this domain measured in microvolts,
			for regulators which support voltage constraints.

	NOTE: this will return the string 'constraint not defined' if		NOTE: this will return the string 'constraint not defined' if
	the power domain has no max microvolts constraint defined by		the power domain has no max microvolts constraint defined by
	@@ -132,10 +139,10 @@ Date: April 2008
	KernelVersion: 2.6.26		KernelVersion: 2.6.26
	Contact: Liam Girdwood <lrg@slimlogic.co.uk>		Contact: Liam Girdwood <lrg@slimlogic.co.uk>
	Description:		Description:
	Each regulator directory will contain a field called		Some regulator directories will contain a field called
	min_microamps. This holds the minimum safe working regulator		min_microamps. This holds the minimum safe working regulator
	output current limit setting for this domain measured in		output current limit setting for this domain measured in
	microamps.		microamps, for regulators which support current constraints.

	NOTE: this will return the string 'constraint not defined' if		NOTE: this will return the string 'constraint not defined' if
	the power domain has no min microamps constraint defined by		the power domain has no min microamps constraint defined by
	@@ -147,10 +154,10 @@ Date: April 2008
	KernelVersion: 2.6.26		KernelVersion: 2.6.26
	Contact: Liam Girdwood <lrg@slimlogic.co.uk>		Contact: Liam Girdwood <lrg@slimlogic.co.uk>
	Description:		Description:
	Each regulator directory will contain a field called		Some regulator directories will contain a field called
	max_microamps. This holds the maximum safe working regulator		max_microamps. This holds the maximum safe working regulator
	output current limit setting for this domain measured in		output current limit setting for this domain measured in
	microamps.		microamps, for regulators which support current constraints.

	NOTE: this will return the string 'constraint not defined' if		NOTE: this will return the string 'constraint not defined' if
	the power domain has no max microamps constraint defined by		the power domain has no max microamps constraint defined by
	@@ -185,7 +192,7 @@ Date: April 2008
	KernelVersion: 2.6.26		KernelVersion: 2.6.26
	Contact: Liam Girdwood <lrg@slimlogic.co.uk>		Contact: Liam Girdwood <lrg@slimlogic.co.uk>
	Description:		Description:
	Each regulator directory will contain a field called		Some regulator directories will contain a field called
	requested_microamps. This holds the total requested load		requested_microamps. This holds the total requested load
	current in microamps for this regulator from all its consumer		current in microamps for this regulator from all its consumer
	devices.		devices.
	@@ -204,125 +211,102 @@ Date: May 2008
	KernelVersion: 2.6.26		KernelVersion: 2.6.26
	Contact: Liam Girdwood <lrg@slimlogic.co.uk>		Contact: Liam Girdwood <lrg@slimlogic.co.uk>
	Description:		Description:
	Each regulator directory will contain a field called		Some regulator directories will contain a field called
	suspend_mem_microvolts. This holds the regulator output		suspend_mem_microvolts. This holds the regulator output
	voltage setting for this domain measured in microvolts when		voltage setting for this domain measured in microvolts when
	the system is suspended to memory.		the system is suspended to memory, for voltage regulators
			implementing suspend voltage configuration constraints.
	NOTE: this will return the string 'not defined' if
	the power domain has no suspend to memory voltage defined by
	platform code.

	What: /sys/class/regulator/.../suspend_disk_microvolts		What: /sys/class/regulator/.../suspend_disk_microvolts
	Date: May 2008		Date: May 2008
	KernelVersion: 2.6.26		KernelVersion: 2.6.26
	Contact: Liam Girdwood <lrg@slimlogic.co.uk>		Contact: Liam Girdwood <lrg@slimlogic.co.uk>
	Description:		Description:
	Each regulator directory will contain a field called		Some regulator directories will contain a field called
	suspend_disk_microvolts. This holds the regulator output		suspend_disk_microvolts. This holds the regulator output
	voltage setting for this domain measured in microvolts when		voltage setting for this domain measured in microvolts when
	the system is suspended to disk.		the system is suspended to disk, for voltage regulators
			implementing suspend voltage configuration constraints.
	NOTE: this will return the string 'not defined' if
	the power domain has no suspend to disk voltage defined by
	platform code.

	What: /sys/class/regulator/.../suspend_standby_microvolts		What: /sys/class/regulator/.../suspend_standby_microvolts
	Date: May 2008		Date: May 2008
	KernelVersion: 2.6.26		KernelVersion: 2.6.26
	Contact: Liam Girdwood <lrg@slimlogic.co.uk>		Contact: Liam Girdwood <lrg@slimlogic.co.uk>
	Description:		Description:
	Each regulator directory will contain a field called		Some regulator directories will contain a field called
	suspend_standby_microvolts. This holds the regulator output		suspend_standby_microvolts. This holds the regulator output
	voltage setting for this domain measured in microvolts when		voltage setting for this domain measured in microvolts when
	the system is suspended to standby.		the system is suspended to standby, for voltage regulators
			implementing suspend voltage configuration constraints.
	NOTE: this will return the string 'not defined' if
	the power domain has no suspend to standby voltage defined by
	platform code.

	What: /sys/class/regulator/.../suspend_mem_mode		What: /sys/class/regulator/.../suspend_mem_mode
	Date: May 2008		Date: May 2008
	KernelVersion: 2.6.26		KernelVersion: 2.6.26
	Contact: Liam Girdwood <lrg@slimlogic.co.uk>		Contact: Liam Girdwood <lrg@slimlogic.co.uk>
	Description:		Description:
	Each regulator directory will contain a field called		Some regulator directories will contain a field called
	suspend_mem_mode. This holds the regulator operating mode		suspend_mem_mode. This holds the regulator operating mode
	setting for this domain when the system is suspended to		setting for this domain when the system is suspended to
	memory.		memory, for regulators implementing suspend mode
			configuration constraints.
	NOTE: this will return the string 'not defined' if
	the power domain has no suspend to memory mode defined by
	platform code.

	What: /sys/class/regulator/.../suspend_disk_mode		What: /sys/class/regulator/.../suspend_disk_mode
	Date: May 2008		Date: May 2008
	KernelVersion: 2.6.26		KernelVersion: 2.6.26
	Contact: Liam Girdwood <lrg@slimlogic.co.uk>		Contact: Liam Girdwood <lrg@slimlogic.co.uk>
	Description:		Description:
	Each regulator directory will contain a field called		Some regulator directories will contain a field called
	suspend_disk_mode. This holds the regulator operating mode		suspend_disk_mode. This holds the regulator operating mode
	setting for this domain when the system is suspended to disk.		setting for this domain when the system is suspended to disk,
			for regulators implementing suspend mode configuration
	NOTE: this will return the string 'not defined' if		constraints.
	the power domain has no suspend to disk mode defined by
	platform code.

	What: /sys/class/regulator/.../suspend_standby_mode		What: /sys/class/regulator/.../suspend_standby_mode
	Date: May 2008		Date: May 2008
	KernelVersion: 2.6.26		KernelVersion: 2.6.26
	Contact: Liam Girdwood <lrg@slimlogic.co.uk>		Contact: Liam Girdwood <lrg@slimlogic.co.uk>
	Description:		Description:
	Each regulator directory will contain a field called		Some regulator directories will contain a field called
	suspend_standby_mode. This holds the regulator operating mode		suspend_standby_mode. This holds the regulator operating mode
	setting for this domain when the system is suspended to		setting for this domain when the system is suspended to
	standby.		standby, for regulators implementing suspend mode
			configuration constraints.
	NOTE: this will return the string 'not defined' if
	the power domain has no suspend to standby mode defined by
	platform code.

	What: /sys/class/regulator/.../suspend_mem_state		What: /sys/class/regulator/.../suspend_mem_state
	Date: May 2008		Date: May 2008
	KernelVersion: 2.6.26		KernelVersion: 2.6.26
	Contact: Liam Girdwood <lrg@slimlogic.co.uk>		Contact: Liam Girdwood <lrg@slimlogic.co.uk>
	Description:		Description:
	Each regulator directory will contain a field called		Some regulator directories will contain a field called
	suspend_mem_state. This holds the regulator operating state		suspend_mem_state. This holds the regulator operating state
	when suspended to memory.		when suspended to memory, for regulators implementing suspend
			configuration constraints.
	This will be one of the following strings:

	'enabled'		This will be one of the same strings reported by
	'disabled'		the "state" attribute.
	'not defined'

	What: /sys/class/regulator/.../suspend_disk_state		What: /sys/class/regulator/.../suspend_disk_state
	Date: May 2008		Date: May 2008
	KernelVersion: 2.6.26		KernelVersion: 2.6.26
	Contact: Liam Girdwood <lrg@slimlogic.co.uk>		Contact: Liam Girdwood <lrg@slimlogic.co.uk>
	Description:		Description:
	Each regulator directory will contain a field called		Some regulator directories will contain a field called
	suspend_disk_state. This holds the regulator operating state		suspend_disk_state. This holds the regulator operating state
	when suspended to disk.		when suspended to disk, for regulators implementing
			suspend configuration constraints.
	This will be one of the following strings:

	'enabled'		This will be one of the same strings reported by
	'disabled'		the "state" attribute.
	'not defined'

	What: /sys/class/regulator/.../suspend_standby_state		What: /sys/class/regulator/.../suspend_standby_state
	Date: May 2008		Date: May 2008
	KernelVersion: 2.6.26		KernelVersion: 2.6.26
	Contact: Liam Girdwood <lrg@slimlogic.co.uk>		Contact: Liam Girdwood <lrg@slimlogic.co.uk>
	Description:		Description:
	Each regulator directory will contain a field called		Some regulator directories will contain a field called
	suspend_standby_state. This holds the regulator operating		suspend_standby_state. This holds the regulator operating
	state when suspended to standby.		state when suspended to standby, for regulators implementing
			suspend configuration constraints.
	This will be one of the following strings:

	'enabled'		This will be one of the same strings reported by
	'disabled'		the "state" attribute.
	'not defined'

Documentation/DMA-API.txt

+4 −5

Original line number	Original line	Diff line number	Diff line
	@@ -170,16 +170,15 @@ Returns: 0 if successful and a negative error if not.
	u64		u64
	dma_get_required_mask(struct device *dev)		dma_get_required_mask(struct device *dev)

	After setting the mask with dma_set_mask(), this API returns the		This API returns the mask that the platform requires to
	actual mask (within that already set) that the platform actually		operate efficiently. Usually this means the returned mask
	requires to operate efficiently. Usually this means the returned mask
	is the minimum required to cover all of memory. Examining the		is the minimum required to cover all of memory. Examining the
	required mask gives drivers with variable descriptor sizes the		required mask gives drivers with variable descriptor sizes the
	opportunity to use smaller descriptors as necessary.		opportunity to use smaller descriptors as necessary.

	Requesting the required mask does not alter the current mask. If you		Requesting the required mask does not alter the current mask. If you
	wish to take advantage of it, you should issue another dma_set_mask()		wish to take advantage of it, you should issue a dma_set_mask()
	call to lower the mask again.		call to set the mask to the value returned.


	Part Id - Streaming DMA mappings		Part Id - Streaming DMA mappings

Documentation/DocBook/Makefile

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -12,7 +12,7 @@ DOCBOOKS := z8530book.xml mcabook.xml \
	kernel-api.xml filesystems.xml lsm.xml usb.xml kgdb.xml \		kernel-api.xml filesystems.xml lsm.xml usb.xml kgdb.xml \
	gadget.xml libata.xml mtdnand.xml librs.xml rapidio.xml \		gadget.xml libata.xml mtdnand.xml librs.xml rapidio.xml \
	genericirq.xml s390-drivers.xml uio-howto.xml scsi.xml \		genericirq.xml s390-drivers.xml uio-howto.xml scsi.xml \
	mac80211.xml debugobjects.xml sh.xml		mac80211.xml debugobjects.xml sh.xml regulator.xml

	###		###
	# The build process is as follows (targets):		# The build process is as follows (targets):

Documentation/DocBook/networking.tmpl

+8 −0

Original line number	Original line	Diff line number	Diff line
	@@ -74,6 +74,14 @@
	!Enet/sunrpc/rpcb_clnt.c		!Enet/sunrpc/rpcb_clnt.c
	!Enet/sunrpc/clnt.c		!Enet/sunrpc/clnt.c
	</sect1>		</sect1>
			<sect1><title>WiMAX</title>
			!Enet/wimax/op-msg.c
			!Enet/wimax/op-reset.c
			!Enet/wimax/op-rfkill.c
			!Enet/wimax/stack.c
			!Iinclude/net/wimax.h
			!Iinclude/linux/wimax.h
			</sect1>
	</chapter>		</chapter>

	<chapter id="netdev">		<chapter id="netdev">