* [PATCH] net/macb: bindings doc: Merge cdns-emac to macb
@ 2015-11-30 13:51 Michal Simek
2015-11-30 14:08 ` Nicolas Ferre
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Michal Simek @ 2015-11-30 13:51 UTC (permalink / raw)
To: linux-kernel, monstr
Cc: devicetree, Kumar Gala, Ian Campbell, Rob Herring, Pawel Moll,
Mark Rutland
Merge two bindings for the same driver to together.
Signed-off-by: Michal Simek <michal.simek@xilinx.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@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,[<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
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] net/macb: bindings doc: Merge cdns-emac to macb
2015-11-30 13:51 [PATCH] net/macb: bindings doc: Merge cdns-emac to macb Michal Simek
@ 2015-11-30 14:08 ` Nicolas Ferre
[not found] ` <497a8248e7cf8b7f7f30d6c47c8591583dcc0bce.1448891503.git.michal.simek-gjFFaj9aHVfQT0dZR+AlfA@public.gmane.org>
2015-12-04 18:53 ` Rob Herring
2 siblings, 0 replies; 4+ messages in thread
From: Nicolas Ferre @ 2015-11-30 14:08 UTC (permalink / raw)
To: Michal Simek, linux-kernel, monstr
Cc: devicetree, Kumar Gala, Ian Campbell, Rob Herring, Pawel Moll,
Mark Rutland
Le 30/11/2015 14:51, Michal Simek a écrit :
> Merge two bindings for the same driver to together.
>
> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.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@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,[<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.
>
--
Nicolas Ferre
^ permalink raw reply [flat|nested] 4+ messages in thread[parent not found: <497a8248e7cf8b7f7f30d6c47c8591583dcc0bce.1448891503.git.michal.simek-gjFFaj9aHVfQT0dZR+AlfA@public.gmane.org>]
* Re: [PATCH] net/macb: bindings doc: Merge cdns-emac to macb
[not found] ` <497a8248e7cf8b7f7f30d6c47c8591583dcc0bce.1448891503.git.michal.simek-gjFFaj9aHVfQT0dZR+AlfA@public.gmane.org>
@ 2015-11-30 21:50 ` Moritz Fischer
0 siblings, 0 replies; 4+ messages in thread
From: Moritz Fischer @ 2015-11-30 21:50 UTC (permalink / raw)
To: Michal Simek
Cc: linux-kernel-u79uwXL29TY76Z2rM5mHXA, Michal Simek,
devicetree-u79uwXL29TY76Z2rM5mHXA, Kumar Gala, Ian Campbell,
Rob Herring, Pawel Moll, Mark Rutland
On Mon, Nov 30, 2015 at 5:51 AM, Michal Simek <michal.simek-gjFFaj9aHVfQT0dZR+AlfA@public.gmane.org> wrote:
> Merge two bindings for the same driver to together.
>
> Signed-off-by: Michal Simek <michal.simek-gjFFaj9aHVfQT0dZR+AlfA@public.gmane.org>
> ---
>
> 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@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,[<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-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
Acked-by: Moritz Fischer <moritz.fischer-+aYTwkv1SeIAvxtiuMwx3w@public.gmane.org>
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] net/macb: bindings doc: Merge cdns-emac to macb
2015-11-30 13:51 [PATCH] net/macb: bindings doc: Merge cdns-emac to macb Michal Simek
2015-11-30 14:08 ` Nicolas Ferre
[not found] ` <497a8248e7cf8b7f7f30d6c47c8591583dcc0bce.1448891503.git.michal.simek-gjFFaj9aHVfQT0dZR+AlfA@public.gmane.org>
@ 2015-12-04 18:53 ` Rob Herring
2 siblings, 0 replies; 4+ messages in thread
From: Rob Herring @ 2015-12-04 18:53 UTC (permalink / raw)
To: Michal Simek
Cc: linux-kernel, monstr, devicetree, Kumar Gala, Ian Campbell,
Pawel Moll, Mark Rutland
On Mon, Nov 30, 2015 at 02:51:46PM +0100, Michal Simek wrote:
> Merge two bindings for the same driver to together.
>
> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Applied, thanks.
Rob
Applied, thanks.
Rob
> ---
>
> 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@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,[<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
>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2015-12-04 18:53 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-11-30 13:51 [PATCH] net/macb: bindings doc: Merge cdns-emac to macb Michal Simek
2015-11-30 14:08 ` Nicolas Ferre
[not found] ` <497a8248e7cf8b7f7f30d6c47c8591583dcc0bce.1448891503.git.michal.simek-gjFFaj9aHVfQT0dZR+AlfA@public.gmane.org>
2015-11-30 21:50 ` Moritz Fischer
2015-12-04 18:53 ` Rob Herring
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).