| Message ID | 1477510561-17035-3-git-send-email-jon.mason@broadcom.com |
|---|---|
| State | Changes Requested, archived |
| Delegated to: | David Miller |
| Headers | show |
On Wed, Oct 26, 2016 at 03:35:58PM -0400, Jon Mason wrote: > Signed-off-by: Jon Mason <jon.mason@broadcom.com> > --- > 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
On Thu, Oct 27, 2016 at 11:17:57AM +0200, Andrew Lunn wrote: > On Wed, Oct 26, 2016 at 03:35:58PM -0400, Jon Mason wrote: > > Signed-off-by: Jon Mason <jon.mason@broadcom.com> > > --- > > 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.... It swapped them based on (from patch 1/5) if (BRCM_PHY_MODEL(phydev) == PHY_ID_BCM54810 && phydev->dev_flags & PHY_BRCM_EXP_LANE_SWAP) That flag is being set in the driver based on whether the lanes need to be swapped (which depends on the SKU of NS2). The only SKU of NS2 we have upstream right now has it swapped, but one that should be pushed out in the next few weeks will not have this flag present. There is no way to detect it, and having a separate compat string seemed overkill. Thanks, Jon > > Andrew
On 10/27/2016 02:21 PM, Jon Mason wrote: > On Thu, Oct 27, 2016 at 11:17:57AM +0200, Andrew Lunn wrote: >> On Wed, Oct 26, 2016 at 03:35:58PM -0400, Jon Mason wrote: >>> Signed-off-by: Jon Mason <jon.mason@broadcom.com> >>> --- >>> 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.... > > It swapped them based on (from patch 1/5) > if (BRCM_PHY_MODEL(phydev) == PHY_ID_BCM54810 && > phydev->dev_flags & PHY_BRCM_EXP_LANE_SWAP) > > That flag is being set in the driver based on whether the lanes need > to be swapped (which depends on the SKU of NS2). The only SKU of NS2 > we have upstream right now has it swapped, but one that should be > pushed out in the next few weeks will not have this flag present. > There is no way to detect it, and having a separate compat string > seemed overkill. Andrew has a point thought that this is a property that is associated with the PHY, and not with the Ethernet MAC per se, as such, you can put it in the Ethernet PHY node, and look up the proper from drivers/net/phy/broadcom.c, and come up with a Broadcom Ethernet PHY binding document (sorry). There is no need to have a specific compatible string allocated, using the (mostly) generic Ethernet PHY binding, plus this property documented would be good enough.
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) Examples:
Signed-off-by: Jon Mason <jon.mason@broadcom.com> --- Documentation/devicetree/bindings/net/brcm,amac.txt | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)