Commit 8b448365 authored by David S. Miller's avatar David S. Miller
Browse files

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



Two easy cases of overlapping changes.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents c049d56e cd8dead0

Documentation/devicetree/bindings/net/davinci_emac.txt

+2 −0
Original line number Diff line number Diff line
@@ -20,6 +20,8 @@ Required properties: 
Optional properties:

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

              If absent, davinci_emac driver defaults to 100/FULL.

- nvmem-cells: phandle, reference to an nvmem node for the MAC address

- nvmem-cell-names: string, should be "mac-address" if nvmem is to be used

- ti,davinci-rmii-en: 1 byte, 1 means use RMII

- ti,davinci-no-bd-ram: boolean, does EMAC have BD RAM?

Documentation/devicetree/bindings/net/ethernet.txt

+2 −3
Original line number Diff line number Diff line
@@ -10,15 +10,14 @@ Documentation/devicetree/bindings/phy/phy-bindings.txt. 
  the boot program; should be used in cases where the MAC address assigned to

  the device by the boot program is different from the "local-mac-address"

  property;

- nvmem-cells: phandle, reference to an nvmem node for the MAC address;

- nvmem-cell-names: string, should be "mac-address" if nvmem is to be used;

- max-speed: number, specifies maximum speed in Mbit/s supported by the device;

- max-frame-size: number, maximum transfer unit (IEEE defined MTU), rather than

  the maximum frame size (there's contradiction in the Devicetree

  Specification).

- phy-mode: string, operation mode of the PHY interface. This is now a de-facto

  standard property; supported values are:

  * "internal"

  * "internal" (Internal means there is not a standard bus between the MAC and

     the PHY, something proprietary is being used to embed the PHY in the MAC.)

  * "mii"

  * "gmii"

  * "sgmii"

Documentation/devicetree/bindings/net/macb.txt

+4 −0
Original line number Diff line number Diff line
@@ -26,6 +26,10 @@ Required properties: 
	Optional elements: 'tsu_clk'

- clocks: Phandles to input clocks.



Optional properties:

- nvmem-cells: phandle, reference to an nvmem node for the MAC address

- nvmem-cell-names: string, should be "mac-address" if nvmem is to be used



Optional properties for PHY child node:

- reset-gpios : Should specify the gpio for phy reset

- magic-packet : If present, indicates that the hardware supports waking

Documentation/media/uapi/rc/rc-tables.rst

+2 −2
Original line number Diff line number Diff line
@@ -623,7 +623,7 @@ the remote via /dev/input/event devices. 


    -  .. row 78



       -  ``KEY_SCREEN``

       -  ``KEY_ASPECT_RATIO``



       -  Select screen aspect ratio
@@ -631,7 +631,7 @@ the remote via /dev/input/event devices. 


    -  .. row 79



       -  ``KEY_ZOOM``

       -  ``KEY_FULL_SCREEN``



       -  Put device into zoom/full screen mode

Documentation/networking/decnet.txt

+0 −2
Original line number Diff line number Diff line
@@ -22,8 +22,6 @@ you'll need the following options as well... 
    CONFIG_DECNET_ROUTER (to be able to add/delete routes)

    CONFIG_NETFILTER (will be required for the DECnet routing daemon)



    CONFIG_DECNET_ROUTE_FWMARK is optional



Don't turn on SIOCGIFCONF support for DECnet unless you are really sure

that you need it, in general you won't and it can cause ifconfig to

malfunction.