From patchwork Fri Feb 27 01:49:30 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Horman X-Patchwork-Id: 5897381 X-Patchwork-Delegate: horms@verge.net.au Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 176969F37F for ; Fri, 27 Feb 2015 01:49:36 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 584D920154 for ; Fri, 27 Feb 2015 01:49:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7759320123 for ; Fri, 27 Feb 2015 01:49:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752583AbbB0Bte (ORCPT ); Thu, 26 Feb 2015 20:49:34 -0500 Received: from kirsty.vergenet.net ([202.4.237.240]:52681 "EHLO kirsty.vergenet.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752001AbbB0Btd (ORCPT ); Thu, 26 Feb 2015 20:49:33 -0500 Received: from ayumi.isobedori.kobe.vergenet.net (p8130-ipbfp1005kobeminato.hyogo.ocn.ne.jp [118.10.149.130]) by kirsty.vergenet.net (Postfix) with ESMTP id 588C225BFC0; Fri, 27 Feb 2015 12:49:32 +1100 (EST) Received: by ayumi.isobedori.kobe.vergenet.net (Postfix, from userid 7100) id 02DE9EDE940; Fri, 27 Feb 2015 10:49:30 +0900 (JST) Date: Fri, 27 Feb 2015 10:49:30 +0900 From: Simon Horman To: Ulrich Hecht Cc: linux-sh@vger.kernel.org, magnus.damm@gmail.com, geert@linux-m68k.org, laurent.pinchart+renesas@ideasonboard.com, kuninori.morimoto.gx@renesas.com, sergei.shtylyov@cogentembedded.com, mturquette@linaro.org Subject: Re: [PATCH v4 9/9] ARM: shmobile: bockw dts: Remove leftover Ethernet node Message-ID: <20150227014930.GH31738@verge.net.au> References: <1424968934-30577-1-git-send-email-ulrich.hecht+renesas@gmail.com> <1424968934-30577-10-git-send-email-ulrich.hecht+renesas@gmail.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1424968934-30577-10-git-send-email-ulrich.hecht+renesas@gmail.com> Organisation: Horms Solutions Ltd. User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On Thu, Feb 26, 2015 at 05:42:14PM +0100, Ulrich Hecht wrote: > The previous commit "ARM: shmobile: bockw dts: Move Ethernet node to BSC" > neglected to remove the old entry. Thanks, I have squashed this change into that one. The result was as as follows: --- a/arch/arm/boot/dts/r8a7778-bockw.dts +++ b/arch/arm/boot/dts/r8a7778-bockw.dts @@ -45,9 +45,11 @@ regulator-boot-on; regulator-always-on; }; +}; +&bsc { ethernet@18300000 { - compatible = "smsc,lan9220", "smsc,lan9115"; + compatible = "smsc,lan89218", "smsc,lan9115"; reg = <0x18300000 0x1000>; phy-mode = "mii"; However, the change of compatible string seems outside the changelog description, so I dropped that portion. Leaving the following. If you do want to update the compat strings please send a follow-up patch. From: Ulrich Hecht [PATCH] ARM: shmobile: bockw dts: Move Ethernet node to BSC Move the Ethernet node to the new BSC node, as its connected to the Bus State Controller. Signed-off-by: Ulrich Hecht Acked-by: Laurent Pinchart Acked-by: Geert Uytterhoeven [horms: dropped compat string changes as they seem out of scope] Signed-off-by: Simon Horman --- arch/arm/boot/dts/r8a7778-bockw.dts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm/boot/dts/r8a7778-bockw.dts b/arch/arm/boot/dts/r8a7778-bockw.dts index 96cfcdc..274a1b6f 100644 --- a/arch/arm/boot/dts/r8a7778-bockw.dts +++ b/arch/arm/boot/dts/r8a7778-bockw.dts @@ -45,7 +45,9 @@ regulator-boot-on; regulator-always-on; }; +}; +&bsc { ethernet@18300000 { compatible = "smsc,lan9220", "smsc,lan9115"; reg = <0x18300000 0x1000>;