Commit 1e8d6421 authored by David S. Miller's avatar David S. Miller
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 



Conflicts:
	drivers/net/bonding/bond_3ad.h
	drivers/net/bonding/bond_main.c

Two minor conflicts in bonding, both of which were overlapping
changes.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents f7b12606 960dfc4e

Documentation/ABI/testing/sysfs-tty

+2 −1
Original line number Diff line number Diff line
@@ -3,7 +3,8 @@ Date: Nov 2010 
Contact:	Kay Sievers <kay.sievers@vrfy.org>

Description:

		 Shows the list of currently configured

		 console devices, like 'tty1 ttyS0'.

		 tty devices used for the console,

		 like 'tty1 ttyS0'.

		 The last entry in the file is the active

		 device connected to /dev/console.

		 The file supports poll() to detect virtual

Documentation/devicetree/bindings/mmc/atmel-hsmci.txt

+5 −0
Original line number Diff line number Diff line
@@ -13,6 +13,9 @@ Required properties: 
- #address-cells: should be one. The cell is the slot id.

- #size-cells: should be zero.

- at least one slot node

- clock-names: tuple listing input clock names.

	Required elements: "mci_clk"

- clocks: phandles to input clocks.



The node contains child nodes for each slot that the platform uses
@@ -24,6 +27,8 @@ mmc0: mmc@f0008000 { 
	interrupts = <12 4>;

	#address-cells = <1>;

	#size-cells = <0>;

	clock-names = "mci_clk";

	clocks = <&mci0_clk>;



	[ child node definitions...]

};

Documentation/devicetree/bindings/net/sti-dwmac.txt

0 → 100644
+58 −0
Original line number Diff line number Diff line 
STMicroelectronics SoC DWMAC glue layer controller



The device node has following properties.



Required properties:

 - compatible	: Can be "st,stih415-dwmac", "st,stih416-dwmac" or

   "st,stid127-dwmac".

 - reg		: Offset of the glue configuration register map in system

   configuration regmap pointed by st,syscon property and size.



 - reg-names	: Should be "sti-ethconf".



 - st,syscon	: Should be phandle to system configuration node which

   encompases this glue registers.



 - st,tx-retime-src: On STi Parts for Giga bit speeds, 125Mhz clocks can be

   wired up in from different sources. One via TXCLK pin and other via CLK_125

   pin. This wiring is totally board dependent. However the retiming glue

   logic should be configured accordingly. Possible values for this property



	   "txclk" - if 125Mhz clock is wired up via txclk line.

	   "clk_125" - if 125Mhz clock is wired up via clk_125 line.



   This property is only valid for Giga bit setup( GMII, RGMII), and it is

   un-used for non-giga bit (MII and RMII) setups. Also note that internal

   clockgen can not generate stable 125Mhz clock.



 - st,ext-phyclk: This boolean property indicates who is generating the clock

  for tx and rx. This property is only valid for RMII case where the clock can

  be generated from the MAC or PHY.



 - clock-names: should be "sti-ethclk".

 - clocks: Should point to ethernet clockgen which can generate phyclk.





Example:



ethernet0: dwmac@fe810000 {

	device_type 	= "network";

	compatible	= "st,stih416-dwmac", "snps,dwmac", "snps,dwmac-3.710";

	reg 		= <0xfe810000 0x8000>, <0x8bc 0x4>;

	reg-names	= "stmmaceth", "sti-ethconf";

	interrupts	= <0 133 0>, <0 134 0>, <0 135 0>;

	interrupt-names	= "macirq", "eth_wake_irq", "eth_lpi";

	phy-mode	= "mii";



	st,syscon	= <&syscfg_rear>;



	snps,pbl 	= <32>;

	snps,mixed-burst;



	resets		= <&softreset STIH416_ETH0_SOFTRESET>;

	reset-names	= "stmmaceth";

	pinctrl-0	= <&pinctrl_mii0>;

	pinctrl-names 	= "default";

	clocks		= <&CLK_S_GMAC0_PHY>;

	clock-names	= "stmmaceth";

};

Documentation/devicetree/bindings/power/bq2415x.txt

0 → 100644
+47 −0
Original line number Diff line number Diff line 
Binding for TI bq2415x Li-Ion Charger



Required properties:

- compatible: Should contain one of the following:

 * "ti,bq24150"

 * "ti,bq24150"

 * "ti,bq24150a"

 * "ti,bq24151"

 * "ti,bq24151a"

 * "ti,bq24152"

 * "ti,bq24153"

 * "ti,bq24153a"

 * "ti,bq24155"

 * "ti,bq24156"

 * "ti,bq24156a"

 * "ti,bq24158"

- reg:			   integer, i2c address of the device.

- ti,current-limit:	   integer, initial maximum current charger can pull

			   from power supply in mA.

- ti,weak-battery-voltage: integer, weak battery voltage threshold in mV.

			   The chip will use slow precharge if battery voltage

			   is below this value.

- ti,battery-regulation-voltage: integer, maximum charging voltage in mV.

- ti,charge-current:	   integer, maximum charging current in mA.

- ti,termination-current:  integer, charge will be terminated when current in

			   constant-voltage phase drops below this value (in mA).

- ti,resistor-sense:	   integer, value of sensing resistor in milliohm.



Optional properties:

- ti,usb-charger-detection: phandle to usb charger detection device.

			    (required for auto mode)



Example from Nokia N900:



bq24150a {

	compatible = "ti,bq24150a";

	reg = <0x6b>;



	ti,current-limit = <100>;

	ti,weak-battery-voltage = <3400>;

	ti,battery-regulation-voltage = <4200>;

	ti,charge-current = <650>;

	ti,termination-current = <100>;

	ti,resistor-sense = <68>;



	ti,usb-charger-detection = <&isp1704>;

};

Documentation/devicetree/bindings/spi/spi_atmel.txt

+5 −0
Original line number Diff line number Diff line
@@ -5,6 +5,9 @@ Required properties: 
- reg: Address and length of the register set for the device

- interrupts: Should contain spi interrupt

- cs-gpios: chipselects

- clock-names: tuple listing input clock names.

	Required elements: "spi_clk"

- clocks: phandles to input clocks.



Example:
@@ -14,6 +17,8 @@ spi1: spi@fffcc000 { 
	interrupts = <13 4 5>;

	#address-cells = <1>;

	#size-cells = <0>;

	clocks = <&spi1_clk>;

	clock-names = "spi_clk";

	cs-gpios = <&pioB 3 0>;

	status = "okay";