lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Mon, 30 Nov 2015 13:50:45 -0800 From: Moritz Fischer <moritz.fischer@...us.com> To: Michal Simek <michal.simek@...inx.com> Cc: linux-kernel@...r.kernel.org, Michal Simek <monstr@...str.eu>, devicetree@...r.kernel.org, Kumar Gala <galak@...eaurora.org>, Ian Campbell <ijc+devicetree@...lion.org.uk>, Rob Herring <robh+dt@...nel.org>, Pawel Moll <pawel.moll@....com>, Mark Rutland <mark.rutland@....com> Subject: Re: [PATCH] net/macb: bindings doc: Merge cdns-emac to macb On Mon, Nov 30, 2015 at 5:51 AM, Michal Simek <michal.simek@...inx.com> wrote: > Merge two bindings for the same driver to together. > > Signed-off-by: Michal Simek <michal.simek@...inx.com> > --- > > Documentation/devicetree/bindings/net/cdns-emac.txt | 20 -------------------- > Documentation/devicetree/bindings/net/macb.txt | 3 +++ > 2 files changed, 3 insertions(+), 20 deletions(-) > delete mode 100644 Documentation/devicetree/bindings/net/cdns-emac.txt > > diff --git a/Documentation/devicetree/bindings/net/cdns-emac.txt b/Documentation/devicetree/bindings/net/cdns-emac.txt > deleted file mode 100644 > index 4451ee973223..000000000000 > --- a/Documentation/devicetree/bindings/net/cdns-emac.txt > +++ /dev/null > @@ -1,20 +0,0 @@ > -* Cadence EMAC Ethernet controller > - > -Required properties: > -- compatible: Should be "cdns,[<chip>-]{emac}" > - Use "cdns,at91rm9200-emac" Atmel at91rm9200 SoC. > - 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. > - > -Examples: > - > - macb0: ethernet@...c4000 { > - compatible = "cdns,at91rm9200-emac"; > - reg = <0xfffc4000 0x4000>; > - interrupts = <21>; > - phy-mode = "rmii"; > - local-mac-address = [3a 0e 03 04 05 06]; > - }; > diff --git a/Documentation/devicetree/bindings/net/macb.txt b/Documentation/devicetree/bindings/net/macb.txt > index b5d79761ac97..1361a6daf63f 100644 > --- a/Documentation/devicetree/bindings/net/macb.txt > +++ b/Documentation/devicetree/bindings/net/macb.txt > @@ -2,6 +2,7 @@ > > Required properties: > - compatible: Should be "cdns,[<chip>-]{macb|gem}" > + Use "cdns,at91rm9200-emac" Atmel at91rm9200 SoC. > Use "cdns,at91sam9260-macb" for Atmel at91sam9 SoCs or the 10/100Mbit IP > available on sama5d3 SoCs. > Use "cdns,at32ap7000-macb" for other 10/100 usage or use the generic form: "cdns,macb". > @@ -10,7 +11,9 @@ Required properties: > Use "atmel,sama5d2-gem" for the GEM IP (10/100) available on Atmel sama5d2 SoCs. > Use "atmel,sama5d3-gem" for the Gigabit IP available on Atmel sama5d3 SoCs. > Use "atmel,sama5d4-gem" for the GEM IP (10/100) available on Atmel sama5d4 SoCs. > + Use "cdns,zynq-gem" Xilinx Zynq-7xxx SoC. > Use "cdns,zynqmp-gem" for Zynq Ultrascale+ MPSoC. > + 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. > -- > 1.9.1 > > -- > To unsubscribe from this list: send the line "unsubscribe devicetree" in > the body of a message to majordomo@...r.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html Acked-by: Moritz Fischer <moritz.fischer@...us.com> -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists