From: Arnd Bergmann <arnd@arndb•de>
To: "Emilio López" <emilio@elopez•com.ar>
Cc: Dinh Nguyen <dinh.linux@gmail•com>,
Srinivas Kandagatla <srinivas.kandagatla@st•com>,
netdev@vger•kernel.org, linux-kernel@vger•kernel.org,
Hans de Goede <hdegoede@redhat•com>,
arm@kernel•org, linux-arm-kernel@lists•infradead.org,
Giuseppe Cavallaro <peppe.cavallaro@st•com>,
"David S. Miller" <davem@davemloft•net>,
Dinh Nguyen <dinguyen@altera•com>
Subject: Re: stmmac-socfpga breakage in arm-soc
Date: Fri, 21 Mar 2014 18:51:17 +0100 [thread overview]
Message-ID: <201403211851.17955.arnd@arndb.de> (raw)
In-Reply-To: <5329CA2A.8030309@elopez.com.ar>
On Wednesday 19 March 2014, Emilio López wrote:
> El 19/03/14 11:58, Arnd Bergmann escribió:
> (snip)
> > diff --git a/Documentation/devicetree/bindings/net/stmmac.txt b/Documentation/devicetree/bindings/net/stmmac.txt
> > index 5748351..19d5648 100644
> > --- a/Documentation/devicetree/bindings/net/stmmac.txt
> > +++ b/Documentation/devicetree/bindings/net/stmmac.txt
> > @@ -31,6 +31,10 @@ Optional properties:
> > - reset-names: Should contain the reset signal name "stmmaceth", if a
> > reset phandle is given
> > - max-frame-size: See ethernet.txt file in the same directory
> > +- clocks: If present, the first clock should be the GMAC main clock,
> > + further clocks may be specified in derived bindings
> > +- clock-names: One name for each entry in the clocks property, the
> > + first one should be "stmmaceth".
> >
> > Examples:
> >
> > @@ -43,4 +47,6 @@ Examples:
> > mac-address = [000000000000]; /* Filled in by U-Boot */
> > max-frame-size = <3800>;
> > phy-mode = "gmii";
> > + clocks = <&clock>;
> > + clock-names = "stmmaceth">
>
> There's a small typo there on the ;
Fixed the typo locally. However, now we have another problem: I tried
to apply the update patch to arm-soc and found that I originally based
it on linux-next, which has a number of conflicting changes that are
not in arm-soc.
It's probably better if I remove the driver entirely from the arm-soc
tree and instead send the modified version to David Miller for him
to put it into the net tree.
Arnd
prev parent reply other threads:[~2014-03-21 17:51 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-19 12:33 stmmac-socfpga breakage in arm-soc Arnd Bergmann
2014-03-19 13:33 ` Dinh Nguyen
2014-03-19 14:05 ` Arnd Bergmann
2014-03-19 14:20 ` Dinh Nguyen
[not found] ` <5329A7A1.20606-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2014-03-19 15:07 ` Arnd Bergmann
2014-03-24 9:15 ` srinivas kandagatla
2014-03-19 14:34 ` Dinh Nguyen
2014-03-19 14:58 ` Arnd Bergmann
2014-03-19 16:47 ` Emilio López
2014-03-21 17:51 ` Arnd Bergmann [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=201403211851.17955.arnd@arndb.de \
--to=arnd@arndb$(echo .)de \
--cc=arm@kernel$(echo .)org \
--cc=davem@davemloft$(echo .)net \
--cc=dinguyen@altera$(echo .)com \
--cc=dinh.linux@gmail$(echo .)com \
--cc=emilio@elopez$(echo .)com.ar \
--cc=hdegoede@redhat$(echo .)com \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=netdev@vger$(echo .)kernel.org \
--cc=peppe.cavallaro@st$(echo .)com \
--cc=srinivas.kandagatla@st$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox