Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S942206AbcJ0Ozi (ORCPT ); Thu, 27 Oct 2016 10:55:38 -0400 Received: from vps0.lunn.ch ([178.209.37.122]:55580 "EHLO vps0.lunn.ch" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S936546AbcJ0Ozd (ORCPT ); Thu, 27 Oct 2016 10:55:33 -0400 Date: Thu, 27 Oct 2016 11:17:57 +0200 From: Andrew Lunn To: Jon Mason Cc: David Miller , Rob Herring , Mark Rutland , Florian Fainelli , devicetree@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, bcm-kernel-feedback-list@broadcom.com, rafal@milecki.pl, linux-arm-kernel@lists.infradead.org Subject: Re: [PATCH 2/5] Documentation: devicetree: net: add NS2 bindings to amac Message-ID: <20161027091757.GC12841@lunn.ch> References: <1477510561-17035-1-git-send-email-jon.mason@broadcom.com> <1477510561-17035-3-git-send-email-jon.mason@broadcom.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1477510561-17035-3-git-send-email-jon.mason@broadcom.com> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1516 Lines: 34 On Wed, Oct 26, 2016 at 03:35:58PM -0400, Jon Mason wrote: > Signed-off-by: Jon Mason > --- > Documentation/devicetree/bindings/net/brcm,amac.txt | 7 +++++-- > 1 file changed, 5 insertions(+), 2 deletions(-) > > diff --git a/Documentation/devicetree/bindings/net/brcm,amac.txt b/Documentation/devicetree/bindings/net/brcm,amac.txt > index ba5ecc1..f92caee 100644 > --- a/Documentation/devicetree/bindings/net/brcm,amac.txt > +++ b/Documentation/devicetree/bindings/net/brcm,amac.txt > @@ -2,15 +2,18 @@ Broadcom AMAC Ethernet Controller Device Tree Bindings > ------------------------------------------------------------- > > Required properties: > - - compatible: "brcm,amac" or "brcm,nsp-amac" > + - compatible: "brcm,amac", "brcm,nsp-amac", or "brcm,ns2-amac" > - reg: Address and length of the GMAC registers, > Address and length of the GMAC IDM registers > + Address and length of the NIC Port Manager registers (optional) > - reg-names: Names of the registers. Must have both "amac_base" and > - "idm_base" > + "idm_base". "nicpm_base" is optional (required for NS2) > - interrupts: Interrupt number > > Optional properties: > - mac-address: See ethernet.txt file in the same directory > +- brcm,enet-phy-lane-swap: > + boolean; Swap the PHY lanes (needed on some SKUs of NS2) Maybe i'm missing something here, but the patch to the PHY swapped the lanes. This seems to be a PHY property, not a MAC property. And it swapped them unconditionally.... Andrew