On Tue, Feb 14, 2017 at 04:56:30PM +0800, Greentime Hu wrote:
> Andestech and moxa use the same faraday mac IP, so we use faraday,ftmac.txt
> to describe it.
Please wrap your lines.
> Signed-off-by: Greentime Hu <green...@gmail.com>
> ---
> .../net/{moxa,moxart-mac.txt => faraday,ftmac.txt} | 7 +++++--
> .../devicetree/bindings/vendor-prefixes.txt | 1 +
> 2 files changed, 6 insertions(+), 2 deletions(-)
> rename Documentation/devicetree/bindings/net/{moxa,moxart-mac.txt =>
> faraday,ftmac.txt} (68%)
>
> diff --git a/Documentation/devicetree/bindings/net/moxa,moxart-mac.txt
> b/Documentation/devicetree/bindings/net/faraday,ftmac.txt
> similarity index 68%
> rename from Documentation/devicetree/bindings/net/moxa,moxart-mac.txt
> rename to Documentation/devicetree/bindings/net/faraday,ftmac.txt
> index 583418b..be4f55e 100644
> --- a/Documentation/devicetree/bindings/net/moxa,moxart-mac.txt
> +++ b/Documentation/devicetree/bindings/net/faraday,ftmac.txt
> @@ -1,8 +1,11 @@
> -MOXA ART Ethernet Controller
> +Faraday Ethernet Controller
>
> Required properties:
>
> -- compatible : Must be "moxa,moxart-mac"
> +- compatible : Must contain "faraday,ftmac", as well as one of
> + the SoC specific identifiers:
> + "andestech,atmac100"
> + "moxa,moxart-mac"
> - reg : Should contain register location and length
> - interrupts : Should contain the mac interrupt number
>
> diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt
> b/Documentation/devicetree/bindings/vendor-prefixes.txt
> index 16d3b5e..489c336 100644
> --- a/Documentation/devicetree/bindings/vendor-prefixes.txt
> +++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
> @@ -102,6 +102,7 @@ everest Everest Semiconductor Co. Ltd.
> everspin Everspin Technologies, Inc.
> excito Excito
> ezchip EZchip Semiconductor
> +faraday Faraday Technology Corporation
As Linus mentioned, I did apply the same thing already, so drop this
hunk.
> fcs Fairchild Semiconductor
> firefly Firefly
> focaltech FocalTech Systems Co.,Ltd
> --
> 1.7.9.5
>
