Merge tag 'at91-fixes' of git://github.com/at91linux/linux-at91 into fixes (2adca567) · Commits · e / devices / android_kernel_fairphone_FP5

.gitignore

+0 −6

Original line number	Original line	Diff line number	Diff line
	@@ -14,10 +14,6 @@
	.o.		.o.
	*.a		*.a
	*.s		*.s
	*.ko.unsigned
	*.ko.stripped
	*.ko.stripped.dig
	*.ko.stripped.sig
	*.ko		*.ko
	*.so		*.so
	*.so.dbg		*.so.dbg
	@@ -95,6 +91,4 @@ GTAGS
	extra_certificates		extra_certificates
	signing_key.priv		signing_key.priv
	signing_key.x509		signing_key.x509
	signing_key.x509.keyid
	signing_key.x509.signer
	x509.genkey		x509.genkey

Documentation/DocBook/media/Makefile

+38 −38

Documentation/DocBook/networking.tmpl

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -56,7 +56,7 @@
	!Enet/core/filter.c		!Enet/core/filter.c
	</sect1>		</sect1>
	<sect1><title>Generic Network Statistics</title>		<sect1><title>Generic Network Statistics</title>
	!Iinclude/linux/gen_stats.h		!Iinclude/uapi/linux/gen_stats.h
	!Enet/core/gen_stats.c		!Enet/core/gen_stats.c
	!Enet/core/gen_estimator.c		!Enet/core/gen_estimator.c
	</sect1>		</sect1>
	@@ -80,7 +80,7 @@
	!Enet/wimax/op-rfkill.c		!Enet/wimax/op-rfkill.c
	!Enet/wimax/stack.c		!Enet/wimax/stack.c
	!Iinclude/net/wimax.h		!Iinclude/net/wimax.h
	!Iinclude/linux/wimax.h		!Iinclude/uapi/linux/wimax.h
	</sect1>		</sect1>
	</chapter>		</chapter>

Documentation/IPMI.txt

+3 −62

Original line number	Original line	Diff line number	Diff line
	@@ -42,13 +42,7 @@ The driver interface depends on your hardware. If your system
	properly provides the SMBIOS info for IPMI, the driver will detect it		properly provides the SMBIOS info for IPMI, the driver will detect it
	and just work. If you have a board with a standard interface (These		and just work. If you have a board with a standard interface (These
	will generally be either "KCS", "SMIC", or "BT", consult your hardware		will generally be either "KCS", "SMIC", or "BT", consult your hardware
	manual), choose the 'IPMI SI handler' option. A driver also exists		manual), choose the 'IPMI SI handler' option.
	for direct I2C access to the IPMI management controller. Some boards
	support this, but it is unknown if it will work on every board. For
	this, choose 'IPMI SMBus handler', but be ready to try to do some
	figuring to see if it will work on your system if the SMBIOS/APCI
	information is wrong or not present. It is fairly safe to have both
	these enabled and let the drivers auto-detect what is present.

	You should generally enable ACPI on your system, as systems with IPMI		You should generally enable ACPI on your system, as systems with IPMI
	can have ACPI tables describing them.		can have ACPI tables describing them.
	@@ -58,8 +52,7 @@ their job correctly, the IPMI controller should be automatically
	detected (via ACPI or SMBIOS tables) and should just work. Sadly,		detected (via ACPI or SMBIOS tables) and should just work. Sadly,
	many boards do not have this information. The driver attempts		many boards do not have this information. The driver attempts
	standard defaults, but they may not work. If you fall into this		standard defaults, but they may not work. If you fall into this
	situation, you need to read the section below named 'The SI Driver' or		situation, you need to read the section below named 'The SI Driver'.
	"The SMBus Driver" on how to hand-configure your system.

	IPMI defines a standard watchdog timer. You can enable this with the		IPMI defines a standard watchdog timer. You can enable this with the
	'IPMI Watchdog Timer' config option. If you compile the driver into		'IPMI Watchdog Timer' config option. If you compile the driver into
	@@ -104,12 +97,7 @@ driver, each open file for this device ties in to the message handler
	as an IPMI user.		as an IPMI user.

	ipmi_si - A driver for various system interfaces. This supports KCS,		ipmi_si - A driver for various system interfaces. This supports KCS,
	SMIC, and BT interfaces. Unless you have an SMBus interface or your		SMIC, and BT interfaces.
	own custom interface, you probably need to use this.

	ipmi_smb - A driver for accessing BMCs on the SMBus. It uses the
	I2C kernel driver's SMBus interfaces to send and receive IPMI messages
	over the SMBus.

	ipmi_watchdog - IPMI requires systems to have a very capable watchdog		ipmi_watchdog - IPMI requires systems to have a very capable watchdog
	timer. This driver implements the standard Linux watchdog timer		timer. This driver implements the standard Linux watchdog timer
	@@ -482,53 +470,6 @@ for specifying an interface. Note that when removing an interface,
	only the first three parameters (si type, address type, and address)		only the first three parameters (si type, address type, and address)
	are used for the comparison. Any options are ignored for removing.		are used for the comparison. Any options are ignored for removing.

	The SMBus Driver
	----------------

	The SMBus driver allows up to 4 SMBus devices to be configured in the
	system. By default, the driver will register any SMBus interfaces it finds
	in the I2C address range of 0x20 to 0x4f on any adapter. You can change this
	at module load time (for a module) with:

	modprobe ipmi_smb.o
	addr=<adapter1>,<i2caddr1>[,<adapter2>,<i2caddr2>[,...]]
	dbg=<flags1>,<flags2>...
	[defaultprobe=1] [dbg_probe=1]

	The addresses are specified in pairs, the first is the adapter ID and the
	second is the I2C address on that adapter.

	The debug flags are bit flags for each BMC found, they are:
	IPMI messages: 1, driver state: 2, timing: 4, I2C probe: 8

	Setting smb_defaultprobe to zero disabled the default probing of SMBus
	interfaces at address range 0x20 to 0x4f. This means that only the
	BMCs specified on the smb_addr line will be detected.

	Setting smb_dbg_probe to 1 will enable debugging of the probing and
	detection process for BMCs on the SMBusses.

	Discovering the IPMI compliant BMC on the SMBus can cause devices
	on the I2C bus to fail. The SMBus driver writes a "Get Device ID" IPMI
	message as a block write to the I2C bus and waits for a response.
	This action can be detrimental to some I2C devices. It is highly recommended
	that the known I2c address be given to the SMBus driver in the smb_addr
	parameter. The default address range will not be used when a smb_addr
	parameter is provided.

	When compiled into the kernel, the addresses can be specified on the
	kernel command line as:

	ipmb_smb.addr=<adapter1>,<i2caddr1>[,<adapter2>,<i2caddr2>[,...]]
	ipmi_smb.dbg=<flags1>,<flags2>...
	ipmi_smb.defaultprobe=0 ipmi_smb.dbg_probe=1

	These are the same options as on the module command line.

	Note that you might need some I2C changes if CONFIG_IPMI_PANIC_EVENT
	is enabled along with this, so the I2C driver knows to run to
	completion during sending a panic event.


	Other Pieces		Other Pieces
	------------		------------

Documentation/devicetree/bindings/arm/atmel-at91.txt

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -8,7 +8,7 @@ PIT Timer required properties:
	shared across all System Controller members.		shared across all System Controller members.

	TC/TCLIB Timer required properties:		TC/TCLIB Timer required properties:
	- compatible: Should be "atmel,<chip>-pit".		- compatible: Should be "atmel,<chip>-tcb".
	<chip> can be "at91rm9200" or "at91sam9x5"		<chip> can be "at91rm9200" or "at91sam9x5"
	- reg: Should contain registers location and length		- reg: Should contain registers location and length
	- interrupts: Should contain all interrupts for the TC block		- interrupts: Should contain all interrupts for the TC block

Original line number	Original line	Diff line number	Diff line
	@@ -56,15 +56,15 @@ FUNCS = \
	write \		write \

	IOCTLS = \		IOCTLS = \
	$(shell perl -ne 'print "$$1 " if /\#define\s+([^\s]+)\s+_IO/' $(srctree)/include/linux/videodev2.h) \		$(shell perl -ne 'print "$$1 " if /\#define\s+([^\s]+)\s+_IO/' $(srctree)/include/uapi/linux/videodev2.h) \
	$(shell perl -ne 'print "$$1 " if /\#define\s+([^\s]+)\s+_IO/' $(srctree)/include/linux/dvb/audio.h) \		$(shell perl -ne 'print "$$1 " if /\#define\s+([^\s]+)\s+_IO/' $(srctree)/include/uapi/linux/dvb/audio.h) \
	$(shell perl -ne 'print "$$1 " if /\#define\s+([^\s]+)\s+_IO/' $(srctree)/include/linux/dvb/ca.h) \		$(shell perl -ne 'print "$$1 " if /\#define\s+([^\s]+)\s+_IO/' $(srctree)/include/uapi/linux/dvb/ca.h) \
	$(shell perl -ne 'print "$$1 " if /\#define\s+([^\s]+)\s+_IO/' $(srctree)/include/linux/dvb/dmx.h) \		$(shell perl -ne 'print "$$1 " if /\#define\s+([^\s]+)\s+_IO/' $(srctree)/include/uapi/linux/dvb/dmx.h) \
	$(shell perl -ne 'print "$$1 " if /\#define\s+([^\s]+)\s+_IO/' $(srctree)/include/linux/dvb/frontend.h) \		$(shell perl -ne 'print "$$1 " if /\#define\s+([^\s]+)\s+_IO/' $(srctree)/include/uapi/linux/dvb/frontend.h) \
	$(shell perl -ne 'print "$$1 " if /\#define\s+([A-Z][^\s]+)\s+_IO/' $(srctree)/include/linux/dvb/net.h) \		$(shell perl -ne 'print "$$1 " if /\#define\s+([A-Z][^\s]+)\s+_IO/' $(srctree)/include/uapi/linux/dvb/net.h) \
	$(shell perl -ne 'print "$$1 " if /\#define\s+([^\s]+)\s+_IO/' $(srctree)/include/linux/dvb/video.h) \		$(shell perl -ne 'print "$$1 " if /\#define\s+([^\s]+)\s+_IO/' $(srctree)/include/uapi/linux/dvb/video.h) \
	$(shell perl -ne 'print "$$1 " if /\#define\s+([^\s]+)\s+_IO/' $(srctree)/include/linux/media.h) \		$(shell perl -ne 'print "$$1 " if /\#define\s+([^\s]+)\s+_IO/' $(srctree)/include/uapi/linux/media.h) \
	$(shell perl -ne 'print "$$1 " if /\#define\s+([^\s]+)\s+_IO/' $(srctree)/include/linux/v4l2-subdev.h) \		$(shell perl -ne 'print "$$1 " if /\#define\s+([^\s]+)\s+_IO/' $(srctree)/include/uapi/linux/v4l2-subdev.h) \
	VIDIOC_SUBDEV_G_FRAME_INTERVAL \		VIDIOC_SUBDEV_G_FRAME_INTERVAL \
	VIDIOC_SUBDEV_S_FRAME_INTERVAL \		VIDIOC_SUBDEV_S_FRAME_INTERVAL \
	VIDIOC_SUBDEV_ENUM_MBUS_CODE \		VIDIOC_SUBDEV_ENUM_MBUS_CODE \
	@@ -74,32 +74,32 @@ IOCTLS = \
	VIDIOC_SUBDEV_S_SELECTION \		VIDIOC_SUBDEV_S_SELECTION \

	TYPES = \		TYPES = \
	$(shell perl -ne 'print "$$1 " if /^typedef\s+[^\s]+\s+([^\s]+)\;/' $(srctree)/include/linux/videodev2.h) \		$(shell perl -ne 'print "$$1 " if /^typedef\s+[^\s]+\s+([^\s]+)\;/' $(srctree)/include/uapi/linux/videodev2.h) \
	$(shell perl -ne 'print "$$1 " if /^}\s+([a-z0-9_]+_t)/' $(srctree)/include/linux/dvb/frontend.h)		$(shell perl -ne 'print "$$1 " if /^}\s+([a-z0-9_]+_t)/' $(srctree)/include/uapi/linux/dvb/frontend.h)

	ENUMS = \		ENUMS = \
	$(shell perl -ne 'print "$$1 " if /^enum\s+([^\s]+)\s+/' $(srctree)/include/linux/videodev2.h) \		$(shell perl -ne 'print "$$1 " if /^enum\s+([^\s]+)\s+/' $(srctree)/include/uapi/linux/videodev2.h) \
	$(shell perl -ne 'print "$$1 " if /^enum\s+([^\s]+)\s+/' $(srctree)/include/linux/dvb/audio.h) \		$(shell perl -ne 'print "$$1 " if /^enum\s+([^\s]+)\s+/' $(srctree)/include/uapi/linux/dvb/audio.h) \
	$(shell perl -ne 'print "$$1 " if /^enum\s+([^\s]+)\s+/' $(srctree)/include/linux/dvb/ca.h) \		$(shell perl -ne 'print "$$1 " if /^enum\s+([^\s]+)\s+/' $(srctree)/include/uapi/linux/dvb/ca.h) \
	$(shell perl -ne 'print "$$1 " if /^enum\s+([^\s]+)\s+/' $(srctree)/include/linux/dvb/dmx.h) \		$(shell perl -ne 'print "$$1 " if /^enum\s+([^\s]+)\s+/' $(srctree)/include/uapi/linux/dvb/dmx.h) \
	$(shell perl -ne 'print "$$1 " if /^enum\s+([^\s]+)\s+/' $(srctree)/include/linux/dvb/frontend.h) \		$(shell perl -ne 'print "$$1 " if /^enum\s+([^\s]+)\s+/' $(srctree)/include/uapi/linux/dvb/frontend.h) \
	$(shell perl -ne 'print "$$1 " if /^enum\s+([^\s]+)\s+/' $(srctree)/include/linux/dvb/net.h) \		$(shell perl -ne 'print "$$1 " if /^enum\s+([^\s]+)\s+/' $(srctree)/include/uapi/linux/dvb/net.h) \
	$(shell perl -ne 'print "$$1 " if /^enum\s+([^\s]+)\s+/' $(srctree)/include/linux/dvb/video.h) \		$(shell perl -ne 'print "$$1 " if /^enum\s+([^\s]+)\s+/' $(srctree)/include/uapi/linux/dvb/video.h) \
	$(shell perl -ne 'print "$$1 " if /^enum\s+([^\s]+)\s+/' $(srctree)/include/linux/media.h) \		$(shell perl -ne 'print "$$1 " if /^enum\s+([^\s]+)\s+/' $(srctree)/include/uapi/linux/media.h) \
	$(shell perl -ne 'print "$$1 " if /^enum\s+([^\s]+)\s+/' $(srctree)/include/linux/v4l2-mediabus.h) \		$(shell perl -ne 'print "$$1 " if /^enum\s+([^\s]+)\s+/' $(srctree)/include/uapi/linux/v4l2-mediabus.h) \
	$(shell perl -ne 'print "$$1 " if /^enum\s+([^\s]+)\s+/' $(srctree)/include/linux/v4l2-subdev.h)		$(shell perl -ne 'print "$$1 " if /^enum\s+([^\s]+)\s+/' $(srctree)/include/uapi/linux/v4l2-subdev.h)

	STRUCTS = \		STRUCTS = \
	$(shell perl -ne 'print "$$1 " if /^struct\s+([^\s]+)\s+/' $(srctree)/include/linux/videodev2.h) \		$(shell perl -ne 'print "$$1 " if /^struct\s+([^\s]+)\s+/' $(srctree)/include/uapi/linux/videodev2.h) \
	$(shell perl -ne 'print "$$1 " if (/^struct\s+([^\s\{]+)\s*/)' $(srctree)/include/linux/dvb/audio.h) \		$(shell perl -ne 'print "$$1 " if (/^struct\s+([^\s\{]+)\s*/)' $(srctree)/include/uapi/linux/dvb/audio.h) \
	$(shell perl -ne 'print "$$1 " if (/^struct\s+([^\s]+)\s+/)' $(srctree)/include/linux/dvb/ca.h) \		$(shell perl -ne 'print "$$1 " if (/^struct\s+([^\s]+)\s+/)' $(srctree)/include/uapi/linux/dvb/ca.h) \
	$(shell perl -ne 'print "$$1 " if (/^struct\s+([^\s]+)\s+/)' $(srctree)/include/linux/dvb/dmx.h) \		$(shell perl -ne 'print "$$1 " if (/^struct\s+([^\s]+)\s+/)' $(srctree)/include/uapi/linux/dvb/dmx.h) \