From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933018AbcIFKRy (ORCPT ); Tue, 6 Sep 2016 06:17:54 -0400 Received: from mout.kundenserver.de ([217.72.192.74]:64899 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932133AbcIFKRw (ORCPT ); Tue, 6 Sep 2016 06:17:52 -0400 From: Arnd Bergmann To: Russell King - ARM Linux Cc: Stephen Rothwell , Olof Johansson , ARM , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, "David S. Miller" , Linus Walleij Subject: Re: linux-next: manual merge of the arm-soc tree with Linus' tree Date: Tue, 06 Sep 2016 12:17:48 +0200 Message-ID: <7417301.9zVsJPTCb3@wuerfel> User-Agent: KMail/5.1.3 (Linux/4.4.0-34-generic; KDE/5.18.0; x86_64; ; ) In-Reply-To: <20160905182603.GS1041@n2100.armlinux.org.uk> References: <20160905105803.13ed27ff@canb.auug.org.au> <20160905182603.GS1041@n2100.armlinux.org.uk> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" X-Provags-ID: V03:K0:vxA1pZPRsCCTftLunYYixQ5n1ZD/nXCwoO5nN94Kug/1bfGAavJ ygLGquneksgEh5/HKPfZyCKKxWjWxLC9KaEXDJjS5yGIubpsLjvVTJNTViOgQtFG0lpeEfV 0x+E4kY9dfnMjIEbJ/YgKwtkUloUuwlXyHc6TaMBvdvace4M4EjxXlzGFQQG0jkjy0AkMRg HkR03iR6nljWnN0Xm1wEA== X-UI-Out-Filterresults: notjunk:1;V01:K0:zC8foDw/DEg=:iRaBl1Z4y+92XcrdjcO4tJ AoRsl4YaoGg9+q5fwCC1gag1obqQTkId3yeEZlsOoIypdJW8YJCA0ConulhpUgQENK5pIEZxw +7MW5jKFJxsoC+gYUHSeAxot2IW7h/H6n/3js3Nc673Rv0/MIzUr70gVBR9mGxAeoBygvWbXa w56H59vDrFIo6/fm6K0NHWi0Od9LpcEX5IakBKqTbnAyGvjjXrrcvLZQmNktcX4GHMn17RXjX CnlKi2eLDBs5hmyaaRhtYbYc9ILc7DxKm9XtFqzMApef08eyEybeA427kWVSZErlIhXn0UbFf ALjQ/araSeyIKc/pqnJLa5gE5Cpu7fo+3B2Yjvux5ziudl5RUY6rsqMtI1Y7Qh3DK3A1KmOT2 XyWcL60oR5wKvwCG+k6p2Y3l2iR+NYAND8wALAchO7vVTJpwadkGhtfSu4V+QefA+04hIkWYF uNj4XdM6etf3EV/T2rMYpyDkWLz67safKT7GaQTnJvjwy+/BWrRQWN/F4GJ1cUzfMpCXcqywp jBuGZEzCRa3y+m0ACYoD+rRhfAy4G3FksvBKhIOKnLBXhtrttYC+FBKbicwrSvlyVjPAUci+/ 3gaUN3mRFcMezphoAiq3MfZPFeOWjUCLDV34csjoEyDFOknbbeppQ0IRKmo0gr1ki/FU9p/7x c2bndaCToYMMyBCVSCSjC/ksYG9F+q1kxRIDPU6z6d2+u+Dxcg3WOOSqkw080J5MZTgfjC9U3 HBL+/fADFDObjIXc Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Monday, September 5, 2016 7:26:03 PM CEST Russell King - ARM Linux wrote: > On Mon, Sep 05, 2016 at 10:58:03AM +1000, Stephen Rothwell wrote: > > I fixed it up (I deleted the file) and can carry the fix as > > necessary. This is now fixed as far as linux-next is concerned, but any > > non trivial conflicts should be mentioned to your upstream maintainer > > when your tree is submitted for merging. You may also want to consider > > cooperating with the maintainer of the conflicting tree to minimise any > > particularly complex conflicts. > > That's the "simple" way of making the conflict go away, but I'm afraid > it's really not that simple. > > Having just looked at the SMC91x definition for realview, it shows that > the SMC91x binding, like many of the conversions that the patch in my > tree fixes, has been created without a proper understanding of the > hardware. To put it simply, it is broken. > > The binding only allows _one_ register width to be specified, which is > completely incorrect: the binding _must_ allow multiple register widths > to be specified. This is what SMC91x has always expected: to be told > which register access widths it is permitted to make. This is what is documented: Documentation/devicetree/bindings/net/smsc-lan91c111.txt - reg-io-width : Mask of sizes (in bytes) of the IO accesses that are supported on the device. Valid value for SMSC LAN91c111 are 1, 2 or 4. If it's omitted or invalid, the size would be 2 meaning 16-bit access only. and this appears to match what the driver does, although it is a rather unconventional definition (I would have expected an array of widths in bytes). Almost all of the users leave out the property, so they get 16-bit access, nomadik-nhk15 is the only one that actually specifies the width explicitly, and it also requests 16-bit only. I don't think your patch changes anything for these cases. Arnd