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

Commit 6a991acc authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge commit 'v3.5-rc3' into x86/debug 



Merge it in to pick up a fix that we are going to clean up in this
branch.

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 70fb74a5 485802a6

Documentation/devicetree/bindings/i2c/i2c-mux-pinctrl.txt

0 → 100644
+93 −0
Original line number Diff line number Diff line 
Pinctrl-based I2C Bus Mux



This binding describes an I2C bus multiplexer that uses pin multiplexing to

route the I2C signals, and represents the pin multiplexing configuration

using the pinctrl device tree bindings.



                                 +-----+  +-----+

                                 | dev |  | dev |

    +------------------------+   +-----+  +-----+

    | SoC                    |      |        |

    |                   /----|------+--------+

    |   +---+   +------+     | child bus A, on first set of pins

    |   |I2C|---|Pinmux|     |

    |   +---+   +------+     | child bus B, on second set of pins

    |                   \----|------+--------+--------+

    |                        |      |        |        |

    +------------------------+  +-----+  +-----+  +-----+

                                | dev |  | dev |  | dev |

                                +-----+  +-----+  +-----+



Required properties:

- compatible: i2c-mux-pinctrl

- i2c-parent: The phandle of the I2C bus that this multiplexer's master-side

  port is connected to.



Also required are:



* Standard pinctrl properties that specify the pin mux state for each child

  bus. See ../pinctrl/pinctrl-bindings.txt.



* Standard I2C mux properties. See mux.txt in this directory.



* I2C child bus nodes. See mux.txt in this directory.



For each named state defined in the pinctrl-names property, an I2C child bus

will be created. I2C child bus numbers are assigned based on the index into

the pinctrl-names property.



The only exception is that no bus will be created for a state named "idle". If

such a state is defined, it must be the last entry in pinctrl-names. For

example:



	pinctrl-names = "ddc", "pta", "idle"  ->  ddc = bus 0, pta = bus 1

	pinctrl-names = "ddc", "idle", "pta"  ->  Invalid ("idle" not last)

	pinctrl-names = "idle", "ddc", "pta"  ->  Invalid ("idle" not last)



Whenever an access is made to a device on a child bus, the relevant pinctrl

state will be programmed into hardware.



If an idle state is defined, whenever an access is not being made to a device

on a child bus, the idle pinctrl state will be programmed into hardware.



If an idle state is not defined, the most recently used pinctrl state will be

left programmed into hardware whenever no access is being made of a device on

a child bus.



Example:



	i2cmux {

		compatible = "i2c-mux-pinctrl";

		#address-cells = <1>;

		#size-cells = <0>;



		i2c-parent = <&i2c1>;



		pinctrl-names = "ddc", "pta", "idle";

		pinctrl-0 = <&state_i2cmux_ddc>;

		pinctrl-1 = <&state_i2cmux_pta>;

		pinctrl-2 = <&state_i2cmux_idle>;



		i2c@0 {

			reg = <0>;

			#address-cells = <1>;

			#size-cells = <0>;



			eeprom {

				compatible = "eeprom";

				reg = <0x50>;

			};

		};



		i2c@1 {

			reg = <1>;

			#address-cells = <1>;

			#size-cells = <0>;



			eeprom {

				compatible = "eeprom";

				reg = <0x50>;

			};

		};

	};

Documentation/networking/stmmac.txt

+25 −19
Original line number Diff line number Diff line
@@ -10,8 +10,8 @@ Currently this network device driver is for all STM embedded MAC/GMAC 
(i.e. 7xxx/5xxx SoCs), SPEAr (arm), Loongson1B (mips) and XLINX XC2V3000

FF1152AMT0221 D1215994A VIRTEX FPGA board.



DWC Ether MAC 10/100/1000 Universal version 3.60a (and older) and DWC Ether MAC 10/100

Universal version 4.0 have been used for developing this driver.

DWC Ether MAC 10/100/1000 Universal version 3.60a (and older) and DWC Ether

MAC 10/100 Universal version 4.0 have been used for developing this driver.



This driver supports both the platform bus and PCI.
@@ -54,27 +54,27 @@ net_device structure enabling the scatter/gather feature. 
When one or more packets are received, an interrupt happens. The interrupts

are not queued so the driver has to scan all the descriptors in the ring during

the receive process.

This is based on NAPI so the interrupt handler signals only if there is work to be

done, and it exits.

This is based on NAPI so the interrupt handler signals only if there is work

to be done, and it exits.

Then the poll method will be scheduled at some future point.

The incoming packets are stored, by the DMA, in a list of pre-allocated socket

buffers in order to avoid the memcpy (Zero-copy).



4.3) Timer-Driver Interrupt

Instead of having the device that asynchronously notifies the frame receptions, the

driver configures a timer to generate an interrupt at regular intervals.

Based on the granularity of the timer, the frames that are received by the device

will experience different levels of latency. Some NICs have dedicated timer

device to perform this task. STMMAC can use either the RTC device or the TMU

channel 2  on STLinux platforms.

Instead of having the device that asynchronously notifies the frame receptions,

the driver configures a timer to generate an interrupt at regular intervals.

Based on the granularity of the timer, the frames that are received by the

device will experience different levels of latency. Some NICs have dedicated

timer device to perform this task. STMMAC can use either the RTC device or the

TMU channel 2  on STLinux platforms.

The timers frequency can be passed to the driver as parameter; when change it,

take care of both hardware capability and network stability/performance impact.

Several performance tests on STM platforms showed this optimisation allows to spare

the CPU while having the maximum throughput.

Several performance tests on STM platforms showed this optimisation allows to

spare the CPU while having the maximum throughput.



4.4) WOL

Wake up on Lan feature through Magic and Unicast frames are supported for the GMAC

core.

Wake up on Lan feature through Magic and Unicast frames are supported for the

GMAC core.



4.5) DMA descriptors

Driver handles both normal and enhanced descriptors. The latter has been only
@@ -107,6 +107,7 @@ These are included in the include/linux/stmmac.h header file 
and detailed below as well:



struct plat_stmmacenet_data {

	char *phy_bus_name;

	int bus_id;

	int phy_addr;

	int interface;
@@ -124,19 +125,24 @@ and detailed below as well: 
	void (*bus_setup)(void __iomem *ioaddr);

	int (*init)(struct platform_device *pdev);

	void (*exit)(struct platform_device *pdev);

	void *custom_cfg;

	void *custom_data;

	void *bsp_priv;

 };



Where:

 o phy_bus_name: phy bus name to attach to the stmmac.

 o bus_id: bus identifier.

 o phy_addr: the physical address can be passed from the platform.

	    If it is set to -1 the driver will automatically

	    detect it at run-time by probing all the 32 addresses.

 o interface: PHY device's interface.

 o mdio_bus_data: specific platform fields for the MDIO bus.

 o dma_cfg: internal DMA parameters

   o pbl: the Programmable Burst Length is maximum number of beats to

       be transferred in one DMA transaction.

       GMAC also enables the 4xPBL by default.

   o fixed_burst/mixed_burst/burst_len

 o clk_csr: fixed CSR Clock range selection.

 o has_gmac: uses the GMAC core.

 o enh_desc: if sets the MAC will use the enhanced descriptor structure.
@@ -160,8 +166,9 @@ Where: 
	     this is sometime necessary on some platforms (e.g. ST boxes)

	     where the HW needs to have set some PIO lines or system cfg

	     registers.

 o custom_cfg: this is a custom configuration that can be passed while

	      initialising the resources.

 o custom_cfg/custom_data: this is a custom configuration that can be passed

			   while initialising the resources.

 o bsp_priv: another private poiter.



For MDIO bus The we have:
@@ -180,7 +187,6 @@ Where: 
 o irqs: list of IRQs, one per PHY.

 o probed_phy_irq: if irqs is NULL, use this for probed PHY.





For DMA engine we have the following internal fields that should be

tuned according to the HW capabilities.

MAINTAINERS

+38 −21
Original line number Diff line number Diff line
@@ -1646,11 +1646,11 @@ S: Maintained 
F:	drivers/gpio/gpio-bt8xx.c



BTRFS FILE SYSTEM

M:	Chris Mason <chris.mason@oracle.com>

M:	Chris Mason <chris.mason@fusionio.com>

L:	linux-btrfs@vger.kernel.org

W:	http://btrfs.wiki.kernel.org/

Q:	http://patchwork.kernel.org/project/linux-btrfs/list/

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs.git

S:	Maintained

F:	Documentation/filesystems/btrfs.txt

F:	fs/btrfs/
@@ -1800,6 +1800,9 @@ F: include/linux/cfag12864b.h 
CFG80211 and NL80211

M:	Johannes Berg <johannes@sipsolutions.net>

L:	linux-wireless@vger.kernel.org

W:	http://wireless.kernel.org/

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git

S:	Maintained

F:	include/linux/nl80211.h

F:	include/net/cfg80211.h
@@ -2270,7 +2273,7 @@ F: include/linux/device-mapper.h 
F:	include/linux/dm-*.h



DIOLAN U2C-12 I2C DRIVER

M:	Guenter Roeck <guenter.roeck@ericsson.com>

M:	Guenter Roeck <linux@roeck-us.net>

L:	linux-i2c@vger.kernel.org

S:	Maintained

F:	drivers/i2c/busses/i2c-diolan-u2c.c
@@ -3145,7 +3148,7 @@ F: drivers/tty/hvc/ 


HARDWARE MONITORING

M:	Jean Delvare <khali@linux-fr.org>

M:	Guenter Roeck <guenter.roeck@ericsson.com>

M:	Guenter Roeck <linux@roeck-us.net>

L:	lm-sensors@lm-sensors.org

W:	http://www.lm-sensors.org/

T:	quilt kernel.org/pub/linux/kernel/people/jdelvare/linux-2.6/jdelvare-hwmon/
@@ -4103,6 +4106,8 @@ F: drivers/scsi/53c700* 
LED SUBSYSTEM

M:	Bryan Wu <bryan.wu@canonical.com>

M:	Richard Purdie <rpurdie@rpsys.net>

L:	linux-leds@vger.kernel.org

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds.git

S:	Maintained

F:	drivers/leds/

F:	include/linux/leds.h
@@ -4347,7 +4352,8 @@ MAC80211 
M:	Johannes Berg <johannes@sipsolutions.net>

L:	linux-wireless@vger.kernel.org

W:	http://linuxwireless.org/

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git

S:	Maintained

F:	Documentation/networking/mac80211-injection.txt

F:	include/net/mac80211.h
@@ -4358,7 +4364,8 @@ M: Stefano Brivio <stefano.brivio@polimi.it> 
M:	Mattias Nissler <mattias.nissler@gmx.de>

L:	linux-wireless@vger.kernel.org

W:	http://linuxwireless.org/en/developers/Documentation/mac80211/RateControl/PID

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git

S:	Maintained

F:	net/mac80211/rc80211_pid*
@@ -4418,6 +4425,13 @@ S: Orphan 
F:	drivers/video/matrox/matroxfb_*

F:	include/linux/matroxfb.h



MAX16065 HARDWARE MONITOR DRIVER

M:	Guenter Roeck <linux@roeck-us.net>

L:	lm-sensors@lm-sensors.org

S:	Maintained

F:	Documentation/hwmon/max16065

F:	drivers/hwmon/max16065.c



MAX6650 HARDWARE MONITOR AND FAN CONTROLLER DRIVER

M:	"Hans J. Koch" <hjk@hansjkoch.de>

L:	lm-sensors@lm-sensors.org
@@ -5156,7 +5170,7 @@ F: drivers/leds/leds-pca9532.c 
F:	include/linux/leds-pca9532.h



PCA9541 I2C BUS MASTER SELECTOR DRIVER

M:	Guenter Roeck <guenter.roeck@ericsson.com>

M:	Guenter Roeck <linux@roeck-us.net>

L:	linux-i2c@vger.kernel.org

S:	Maintained

F:	drivers/i2c/muxes/i2c-mux-pca9541.c
@@ -5306,7 +5320,7 @@ F: drivers/video/fb-puv3.c 
F:	drivers/rtc/rtc-puv3.c



PMBUS HARDWARE MONITORING DRIVERS

M:	Guenter Roeck <guenter.roeck@ericsson.com>

M:	Guenter Roeck <linux@roeck-us.net>

L:	lm-sensors@lm-sensors.org

W:	http://www.lm-sensors.org/

W:	http://www.roeck-us.net/linux/drivers/
@@ -5702,6 +5716,9 @@ F: include/linux/remoteproc.h 
RFKILL

M:	Johannes Berg <johannes@sipsolutions.net>

L:	linux-wireless@vger.kernel.org

W:	http://wireless.kernel.org/

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git

S:	Maintained

F:	Documentation/rfkill.txt

F:	net/rfkill/
@@ -7298,11 +7315,11 @@ F: Documentation/DocBook/uio-howto.tmpl 
F:	drivers/uio/

F:	include/linux/uio*.h



UTIL-LINUX-NG PACKAGE

UTIL-LINUX PACKAGE

M:	Karel Zak <kzak@redhat.com>

L:	util-linux-ng@vger.kernel.org

W:	http://kernel.org/~kzak/util-linux-ng/

T:	git git://git.kernel.org/pub/scm/utils/util-linux-ng/util-linux-ng.git

L:	util-linux@vger.kernel.org

W:	http://en.wikipedia.org/wiki/Util-linux

T:	git git://git.kernel.org/pub/scm/utils/util-linux/util-linux.git

S:	Maintained



UVESAFB DRIVER

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 3

PATCHLEVEL = 5

SUBLEVEL = 0

EXTRAVERSION = -rc1

EXTRAVERSION = -rc3

NAME = Saber-toothed Squirrel



# *DOCUMENTATION*

arch/arm/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@ config ARM 
	select HAVE_IDE if PCI || ISA || PCMCIA

	select HAVE_DMA_ATTRS

	select HAVE_DMA_CONTIGUOUS if (CPU_V6 || CPU_V6K || CPU_V7)

	select CMA if (CPU_V6 || CPU_V6K || CPU_V7)

	select HAVE_MEMBLOCK

	select RTC_LIB

	select SYS_SUPPORTS_APM_EMULATION