Messages in this thread | | | From | Arnd Bergmann <> | Subject | Re: stmmac-socfpga breakage in arm-soc | Date | Fri, 21 Mar 2014 18:51:17 +0100 |
| |
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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |