From mboxrd@z Thu Jan 1 00:00:00 1970 From: Nicolas Ferre Subject: Re: [PATCH] net/macb: bindings doc: Merge cdns-emac to macb Date: Mon, 30 Nov 2015 15:08:53 +0100 Message-ID: <565C5875.10207@atmel.com> References: <497a8248e7cf8b7f7f30d6c47c8591583dcc0bce.1448891503.git.michal.simek@xilinx.com> Mime-Version: 1.0 Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: QUOTED-PRINTABLE Return-path: In-Reply-To: <497a8248e7cf8b7f7f30d6c47c8591583dcc0bce.1448891503.git.michal.simek@xilinx.com> Sender: linux-kernel-owner@vger.kernel.org To: Michal Simek , linux-kernel@vger.kernel.org, monstr@monstr.eu Cc: devicetree@vger.kernel.org, Kumar Gala , Ian Campbell , Rob Herring , Pawel Moll , Mark Rutland List-Id: devicetree@vger.kernel.org Le 30/11/2015 14:51, Michal Simek a =E9crit : > Merge two bindings for the same driver to together. >=20 > Signed-off-by: Michal Simek Acked-by: Nicolas Ferre > --- >=20 > 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.t= xt >=20 > diff --git a/Documentation/devicetree/bindings/net/cdns-emac.txt b/Do= cumentation/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,[-]{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@fffc4000 { > - compatible =3D "cdns,at91rm9200-emac"; > - reg =3D <0xfffc4000 0x4000>; > - interrupts =3D <21>; > - phy-mode =3D "rmii"; > - local-mac-address =3D [3a 0e 03 04 05 06]; > - }; > diff --git a/Documentation/devicetree/bindings/net/macb.txt b/Documen= tation/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 @@ > =20 > Required properties: > - compatible: Should be "cdns,[-]{macb|gem}" > + Use "cdns,at91rm9200-emac" Atmel at91rm9200 SoC. > Use "cdns,at91sam9260-macb" for Atmel at91sam9 SoCs or the 10/100M= bit IP > available on sama5d3 SoCs. > Use "cdns,at32ap7000-macb" for other 10/100 usage or use the gener= ic 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 sama= 5d3 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. >=20 --=20 Nicolas Ferre From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754123AbbK3OIg (ORCPT ); Mon, 30 Nov 2015 09:08:36 -0500 Received: from eusmtp01.atmel.com ([212.144.249.242]:2440 "EHLO eusmtp01.atmel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754040AbbK3OIe (ORCPT ); Mon, 30 Nov 2015 09:08:34 -0500 Subject: Re: [PATCH] net/macb: bindings doc: Merge cdns-emac to macb To: Michal Simek , , References: <497a8248e7cf8b7f7f30d6c47c8591583dcc0bce.1448891503.git.michal.simek@xilinx.com> CC: , Kumar Gala , "Ian Campbell" , Rob Herring , Pawel Moll , Mark Rutland From: Nicolas Ferre Organization: atmel Message-ID: <565C5875.10207@atmel.com> Date: Mon, 30 Nov 2015 15:08:53 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.3.0 MIME-Version: 1.0 In-Reply-To: <497a8248e7cf8b7f7f30d6c47c8591583dcc0bce.1448891503.git.michal.simek@xilinx.com> Content-Type: text/plain; charset="windows-1252" Content-Transfer-Encoding: 8bit X-Originating-IP: [10.161.30.18] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Le 30/11/2015 14:51, Michal Simek a écrit : > Merge two bindings for the same driver to together. > > Signed-off-by: Michal Simek Acked-by: Nicolas Ferre > --- > > 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,[-]{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@fffc4000 { > - 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,[-]{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. > -- Nicolas Ferre