From 013ffd0889c769ed71d04e98d80d789dd53037e2 Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Fri, 10 May 2019 08:43:05 +0200 Subject: dts: update to v5.1-rc7 Signed-off-by: Sascha Hauer --- dts/Bindings/net/davinci_emac.txt | 2 ++ dts/Bindings/net/ethernet.txt | 5 ++--- dts/Bindings/net/macb.txt | 4 ++++ 3 files changed, 8 insertions(+), 3 deletions(-) (limited to 'dts/Bindings/net') diff --git a/dts/Bindings/net/davinci_emac.txt b/dts/Bindings/net/davinci_emac.txt index 24c5cdaba8..ca83dcc84f 100644 --- a/dts/Bindings/net/davinci_emac.txt +++ b/dts/Bindings/net/davinci_emac.txt @@ -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? diff --git a/dts/Bindings/net/ethernet.txt b/dts/Bindings/net/ethernet.txt index cfc376bc97..a686215805 100644 --- a/dts/Bindings/net/ethernet.txt +++ b/dts/Bindings/net/ethernet.txt @@ -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" diff --git a/dts/Bindings/net/macb.txt b/dts/Bindings/net/macb.txt index 174f292d8a..8b80515729 100644 --- a/dts/Bindings/net/macb.txt +++ b/dts/Bindings/net/macb.txt @@ -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 -- cgit v1.2.3