From patchwork Sun Sep 25 16:07:30 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Jarzmik X-Patchwork-Id: 9349817 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id D1E51601C2 for ; Sun, 25 Sep 2016 16:10:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B006428BFF for ; Sun, 25 Sep 2016 16:10:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9223328C04; Sun, 25 Sep 2016 16:10:01 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id E5CFF28BFF for ; Sun, 25 Sep 2016 16:10:00 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1boByG-00050T-51; Sun, 25 Sep 2016 16:08:04 +0000 Received: from smtp05.smtpout.orange.fr ([80.12.242.127] helo=smtp.smtpout.orange.fr) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1boByC-0004yR-DV for linux-arm-kernel@lists.infradead.org; Sun, 25 Sep 2016 16:08:01 +0000 Received: from belgarion ([109.222.115.228]) by mwinf5d61 with ME id ns7W1t0084vkSLV03s7W02; Sun, 25 Sep 2016 18:07:36 +0200 X-ME-Helo: belgarion X-ME-Auth: amFyem1pay5yb2JlcnRAb3JhbmdlLmZy X-ME-Date: Sun, 25 Sep 2016 18:07:36 +0200 X-ME-IP: 109.222.115.228 From: Robert Jarzmik To: Russell King - ARM Linux Subject: Re: linux-next: manual merge of the arm-soc tree with Linus' tree References: <20160905105803.13ed27ff@canb.auug.org.au> <20160905182603.GS1041@n2100.armlinux.org.uk> X-URL: http://belgarath.falguerolles.org/ Date: Sun, 25 Sep 2016 18:07:30 +0200 Message-ID: <871t08c69p.fsf@belgarion.home> User-Agent: Gnus/5.130008 (Ma Gnus v0.8) Emacs/24.4 (gnu/linux) MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160925_090800_790595_06533B20 X-CRM114-Status: GOOD ( 14.99 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Stephen Rothwell , Arnd Bergmann , Linus Walleij , linux-kernel@vger.kernel.org, linux-next@vger.kernel.org, Olof Johansson , "David S. Miller" , ARM Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Russell King - ARM Linux writes: > 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. ...zip... > Since the patch in my tree is fixing a regression caused by the broken > conversions, I'm not mindful to drop it from the merge window - I > actually want to push it into -rc kernels. We _do_ need to fix the > DT regressions, and quickly though, and push those with this patch. > > Since I don't use the SMC91x with DT, that's outside of what I can > test, so consider this a call for help on that subject. Then consider you have one more tester, for a 16-bits access. My lubbock is now DT aware, with a smc91x ethernet card actually working, provided the small patch in [2]. Cheers. diff --git a/drivers/net/ethernet/smsc/smc91x.c b/drivers/net/ethernet/smsc/smc91x.c index 726b80f45906..6d4fdac6c0e0 100644 --- a/drivers/net/ethernet/smsc/smc91x.c +++ b/drivers/net/ethernet/smsc/smc91x.c @@ -2316,6 +2316,9 @@ static int smc_drv_probe(struct platform_device *pdev) } else { lp->cfg.flags |= SMC91X_USE_16BIT; } + if (!device_property_read_u32(&pdev->dev, "reg-io-shift", + &val)) + lp->io_shift = val; } #endif