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

Commit 37219955 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Merge remote-tracking branch '4.9/tmp-184ce810' into msm-4.9"

parents 57315556 6c3873f1

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

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ have dual GMAC each represented by a child node.. 
* Ethernet controller node



Required properties:

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

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

- reg: Address and length of the register set for the device

- interrupts: Should contain the three frame engines interrupts in numeric

	order. These are fe_int0, fe_int1 and fe_int2.

Documentation/devicetree/bindings/net/phy.txt

+9 −0
Original line number Diff line number Diff line
@@ -35,6 +35,15 @@ Optional Properties: 
- broken-turn-around: If set, indicates the PHY device does not correctly

  release the turn around line low at the end of a MDIO transaction.



- eee-broken-100tx:

- eee-broken-1000t:

- eee-broken-10gt:

- eee-broken-1000kx:

- eee-broken-10gkx4:

- eee-broken-10gkr:

  Mark the corresponding energy efficient ethernet mode as broken and

  request the ethernet to stop advertising it.



Example:



ethernet-phy@0 {

Documentation/devicetree/bindings/net/ti,dp83867.txt

+4 −2
Original line number Diff line number Diff line
@@ -3,9 +3,11 @@ 
Required properties:

	- reg - The ID number for the phy, usually a small integer

	- ti,rx-internal-delay - RGMII Receive Clock Delay - see dt-bindings/net/ti-dp83867.h

		for applicable values

		for applicable values. Required only if interface type is

		PHY_INTERFACE_MODE_RGMII_ID or PHY_INTERFACE_MODE_RGMII_RXID

	- ti,tx-internal-delay - RGMII Transmit Clock Delay - see dt-bindings/net/ti-dp83867.h

		for applicable values

		for applicable values. Required only if interface type is

		PHY_INTERFACE_MODE_RGMII_ID or PHY_INTERFACE_MODE_RGMII_TXID

	- ti,fifo-depth - Transmitt FIFO depth- see dt-bindings/net/ti-dp83867.h

		for applicable values

Makefile

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

PATCHLEVEL = 9

SUBLEVEL = 35

SUBLEVEL = 36

EXTRAVERSION =

NAME = Roaring Lionus

arch/arm/boot/dts/logicpd-torpedo-som.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ 
&i2c3 {

	clock-frequency = <400000>;

	at24@50 {

		compatible = "at24,24c02";

		compatible = "atmel,24c64";

		readonly;

		reg = <0x50>;

	};