Commit 1e1430d5 authored by Johannes Berg's avatar Johannes Berg
Browse files

Merge remote-tracking branch 'net-next/master' into mac80211-next 



Resolve the merge conflict between Felix's/my and Toke's patches
coming into the tree through net and mac80211-next respectively.
Most of Felix's changes go away due to Toke's new infrastructure
work, my patch changes to "goto begin" (the label wasn't there
before) instead of returning NULL so flow control towards drivers
is preserved better.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parents bb42f2d1 9a8dd213

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -69,6 +69,7 @@ James Bottomley <jejb@mulgrave.(none)> 
James Bottomley <jejb@titanic.il.steeleye.com>

James E Wilson <wilson@specifix.com>

James Ketrenos <jketreno@io.(none)>

Javi Merino <javi.merino@kernel.org> <javi.merino@arm.com>

<javier@osg.samsung.com> <javier.martinez@collabora.co.uk>

Jean Tourrilhes <jt@hpl.hp.com>

Jeff Garzik <jgarzik@pretzel.yyz.us>

Documentation/devicetree/bindings/input/touchscreen/silead_gsl1680.txt

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ Required properties: 
- touchscreen-size-y	  : See touchscreen.txt



Optional properties:

- firmware-name		  : File basename (string) for board specific firmware

- touchscreen-inverted-x  : See touchscreen.txt

- touchscreen-inverted-y  : See touchscreen.txt

- touchscreen-swapped-x-y : See touchscreen.txt

Documentation/devicetree/bindings/mmc/sdhci-st.txt

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ Required properties: 
			subsystem (mmcss) inside the FlashSS (available in STiH407 SoC

			family).



- clock-names:		Should be "mmc".

- clock-names:		Should be "mmc" and "icn".  (NB: The latter is not compulsory)

			See: Documentation/devicetree/bindings/resource-names.txt

- clocks:		Phandle to the clock.

			See: Documentation/devicetree/bindings/clock/clock-bindings.txt

Documentation/devicetree/bindings/net/ethernet.txt

+2 −2
Original line number Diff line number Diff line
@@ -11,8 +11,8 @@ The following properties are common to the Ethernet controllers: 
  the maximum frame size (there's contradiction in ePAPR).

- phy-mode: string, operation mode of the PHY interface; supported values are

  "mii", "gmii", "sgmii", "qsgmii", "tbi", "rev-mii", "rmii", "rgmii", "rgmii-id",

  "rgmii-rxid", "rgmii-txid", "rtbi", "smii", "xgmii"; this is now a de-facto

  standard property;

  "rgmii-rxid", "rgmii-txid", "rtbi", "smii", "xgmii", "trgmii"; this is now a

  de-facto standard property;

- phy-connection-type: the same as "phy-mode" property but described in ePAPR;

- phy-handle: phandle, specifies a reference to a node representing a PHY

  device; this property is described in ePAPR and so preferred;

Documentation/devicetree/bindings/net/mediatek-net.txt

+6 −2
Original line number Diff line number Diff line
@@ -24,14 +24,17 @@ Required properties: 
Optional properties:

- interrupt-parent: Should be the phandle for the interrupt controller

  that services interrupts for this device



- mediatek,hwlro: the capability if the hardware supports LRO functions



* Ethernet MAC node



Required properties:

- compatible: Should be "mediatek,eth-mac"

- reg: The number of the MAC

- phy-handle: see ethernet.txt file in the same directory.

- phy-handle: see ethernet.txt file in the same directory and

	the phy-mode "trgmii" required being provided when reg

	is equal to 0 and the MAC uses fixed-link to connect

	with internal switch such as MT7530.



Example:
@@ -51,6 +54,7 @@ eth: ethernet@1b100000 { 
	reset-names = "eth";

	mediatek,ethsys = <&ethsys>;

	mediatek,pctl = <&syscfg_pctl_a>;

	mediatek,hwlro;

	#address-cells = <1>;

	#size-cells = <0>;

CRA Git | Maintained and supported by SUSTech CRA and CCSE