| Message ID | 1432304531-23682-1-git-send-email-nathan.sullivan@ni.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
Le 22/05/2015 16:22, Nathan Sullivan a écrit : > Signed-off-by: Nathan Sullivan <nathan.sullivan@ni.com> Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> > --- > Documentation/devicetree/bindings/net/cdns-emac.txt | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/Documentation/devicetree/bindings/net/cdns-emac.txt b/Documentation/devicetree/bindings/net/cdns-emac.txt > index abd67c1..4451ee9 100644 > --- a/Documentation/devicetree/bindings/net/cdns-emac.txt > +++ b/Documentation/devicetree/bindings/net/cdns-emac.txt > @@ -3,7 +3,8 @@ > Required properties: > - compatible: Should be "cdns,[<chip>-]{emac}" > Use "cdns,at91rm9200-emac" Atmel at91rm9200 SoC. > - or the generic form: "cdns,emac". > + Use "cdns,zynq-gem" Xilinx Zynq-7xxx SoC. > + Or the generic form: "cdns,emac". > - reg: Address and length of the register set for the device > - interrupts: Should contain macb interrupt > - phy-mode: see ethernet.txt file in the same directory. >
From: Nathan Sullivan <nathan.sullivan@ni.com> Date: Fri, 22 May 2015 09:22:09 -0500 > Signed-off-by: Nathan Sullivan <nathan.sullivan@ni.com> Applied. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/Documentation/devicetree/bindings/net/cdns-emac.txt b/Documentation/devicetree/bindings/net/cdns-emac.txt index abd67c1..4451ee9 100644 --- a/Documentation/devicetree/bindings/net/cdns-emac.txt +++ b/Documentation/devicetree/bindings/net/cdns-emac.txt @@ -3,7 +3,8 @@ Required properties: - compatible: Should be "cdns,[<chip>-]{emac}" Use "cdns,at91rm9200-emac" Atmel at91rm9200 SoC. - or the generic form: "cdns,emac". + Use "cdns,zynq-gem" Xilinx Zynq-7xxx SoC. + Or the generic form: "cdns,emac". - reg: Address and length of the register set for the device - interrupts: Should contain macb interrupt - phy-mode: see ethernet.txt file in the same directory.
Signed-off-by: Nathan Sullivan <nathan.sullivan@ni.com> --- Documentation/devicetree/bindings/net/cdns-emac.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)