From mboxrd@z Thu Jan 1 00:00:00 1970 From: arnd@arndb.de (Arnd Bergmann) Date: Fri, 21 Mar 2014 18:51:17 +0100 Subject: stmmac-socfpga breakage in arm-soc In-Reply-To: <5329CA2A.8030309@elopez.com.ar> References: <201403191333.01095.arnd@arndb.de> <29079107.ja9Hu9mMY0@wuerfel> <5329CA2A.8030309@elopez.com.ar> Message-ID: <201403211851.17955.arnd@arndb.de> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org 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 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750914AbaCURwD (ORCPT ); Fri, 21 Mar 2014 13:52:03 -0400 Received: from moutng.kundenserver.de ([212.227.126.187]:56099 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750733AbaCURv7 (ORCPT ); Fri, 21 Mar 2014 13:51:59 -0400 From: Arnd Bergmann To: Emilio =?iso-8859-1?q?L=F3pez?= Subject: Re: stmmac-socfpga breakage in arm-soc Date: Fri, 21 Mar 2014 18:51:17 +0100 User-Agent: KMail/1.12.2 (Linux/3.8.0-22-generic; KDE/4.3.2; x86_64; ; ) Cc: Dinh Nguyen , Srinivas Kandagatla , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Hans de Goede , arm@kernel.org, linux-arm-kernel@lists.infradead.org, Giuseppe Cavallaro , "David S. Miller" , Dinh Nguyen References: <201403191333.01095.arnd@arndb.de> <29079107.ja9Hu9mMY0@wuerfel> <5329CA2A.8030309@elopez.com.ar> In-Reply-To: <5329CA2A.8030309@elopez.com.ar> MIME-Version: 1.0 Content-Type: Text/Plain; charset="iso-8859-1" Content-Transfer-Encoding: 8bit Message-Id: <201403211851.17955.arnd@arndb.de> X-Provags-ID: V02:K0:S20ZmAnPaCVKQyLJITR524nft7vX2Ksee6xEQEYJ4z9 malE6KUxdIZpgpC67nknnzVHPpfGxZdyLqP8sxHxDJG6iTpmI/ 1Zl7QgCjGVXj3CJsb00CCgtCjx6kAaqceP7EhhWqK5SkB5I4qw 8/zTLHeUz84rJE/RZSlYj3s3ZTmLiZtz5zMELWRNKbSl3B7ftW 4wSyfvh22iJ1w1MGWdX2ztmoTzJSS4popHwbdNvzBnqW4C6kRP ps7G/36ppSovC7rwBtLfqc9KQemFITJfslo5cDfrW1EQm75bcq Boh+OZ9JBpOwGm7SKPmnu8/4OlB3BGbJQOlpXlVaRMh6+l5xxf dAzj9uFOL8fTa7ihnh6N8x9jQ6ihzpOHiWbbQJbe1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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