From patchwork Fri Jul 10 07:43:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 11655917 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 75C1592A for ; Fri, 10 Jul 2020 07:45:36 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 4D8A0206A5 for ; Fri, 10 Jul 2020 07:45:36 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="OcaeMFoX"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=nifty.com header.i=@nifty.com header.b="HK8u7Agj" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4D8A0206A5 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=socionext.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:To:From: Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender :Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=bg4Xd1yGl0voT28maf5MFaP3iNkUbWPxGB32QUG4Xf0=; b=OcaeMFoXbLWZ9m6zmHShPHD0Td V9FA3Jntg7RijobuyTddT3AShysHl/wdM3N0+zSgRC4c5DTNsWONyKmP3xuBjYxpSTVDxG7YaAC8b HbT1Zel3uR7pdIWZ6GStOhuDLLIWRT16VmYd8Id1LmAV9RwjIoouTGO7xZgVOvQcB+41PK/Vljfyr UlXrGUAThZlWFyS0+F3MZcRvVojqzQxxQGIdTflelp9n0QR+Bpxh0MpVD2zGPsvVcnYEx8DE8Nxls WPJKyqVw4WLALmslyW6AIsE5nPDSBwnsQN/jCJ86Hi2cXKgrKYSfo1jrYFGk7FOg3LSwlKeGhyCI+ FJtqp8kA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jtnhV-0002pj-HK; Fri, 10 Jul 2020 07:44:05 +0000 Received: from conuserg-12.nifty.com ([210.131.2.79]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jtnhS-0002ot-IP for linux-arm-kernel@lists.infradead.org; Fri, 10 Jul 2020 07:44:04 +0000 Received: from oscar.flets-west.jp (softbank126090202047.bbtec.net [126.90.202.47]) (authenticated) by conuserg-12.nifty.com with ESMTP id 06A7hQCU009644; Fri, 10 Jul 2020 16:43:27 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-12.nifty.com 06A7hQCU009644 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1594367007; bh=XzgmZfHGbIg/7Bx4Qqjl6MK0bxbloahArh6T6eyAMM0=; h=From:To:Cc:Subject:Date:From; b=HK8u7AgjGGJCOEBySXc3+AJacIfrRJ34tZvG08tSJYzTeDP9H4JKqolNL5/0c5PsI iFJXBufT7kunBigrBsb0uABb3vqUwClCnbQZ86L6G0E/bRZ8T5sfMthBBhAuzagf35 W1/ei07Lb2tfXI8IBLbIjq15hbHUyIVrsziVkNJd/WIIrInWDnev+jj1HgJu3edfS3 NZLu4Ky3fjGQ8Ib8igASaXOmMqec7DOqJvcEaiqU8u+Xgk5YKwvM/30Rktsezu/bb7 TF6tvR/FzgnwJXYHTFG+kl547I9HUbfbPf2rmEjOTjvRfsSVtArIH5gxBTlTZ1cE/J n2G71W7igpSJg== X-Nifty-SrcIP: [126.90.202.47] From: Masahiro Yamada To: linux-arm-kernel@lists.infradead.org Subject: [PATCH] ARM: uniphier: remove support-card node Date: Fri, 10 Jul 2020 16:43:23 +0900 Message-Id: <20200710074323.296007-1-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200710_034403_065166_49C56D77 X-CRM114-Status: GOOD ( 10.62 ) X-Spam-Score: 1.0 (+) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (1.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [210.131.2.79 listed in list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 1.0 SPF_SOFTFAIL SPF: sender does not match SPF record (softfail) -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Masahiro Yamada , Rob Herring , linux-kernel@vger.kernel.org, devicetree@vger.kernel.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org This device hierarchy is needlessly complex. Remove the support-card node level, and move the ethernet and serial nodes right under the system-bus node. This also fixes the following warning from 'make ARCH=arm dtbs_check': support-card@1,1f00000: $nodename:0: 'support-card@1,1f00000' does not match '^(bus|soc|axi|ahb|apb)(@[0-9a-f]+)?$' Signed-off-by: Masahiro Yamada --- arch/arm/boot/dts/uniphier-support-card.dtsi | 31 ++++++++------------ 1 file changed, 12 insertions(+), 19 deletions(-) diff --git a/arch/arm/boot/dts/uniphier-support-card.dtsi b/arch/arm/boot/dts/uniphier-support-card.dtsi index 11e46e7de7c5..444802fee9fb 100644 --- a/arch/arm/boot/dts/uniphier-support-card.dtsi +++ b/arch/arm/boot/dts/uniphier-support-card.dtsi @@ -8,26 +8,19 @@ &system_bus { status = "okay"; ranges = <1 0x00000000 0x42000000 0x02000000>; + interrupt-parent = <&gpio>; - support_card: support-card@1,1f00000 { - compatible = "simple-bus"; - #address-cells = <1>; - #size-cells = <1>; - ranges = <0x00000000 1 0x01f00000 0x00100000>; - interrupt-parent = <&gpio>; - - ethsc: ethernet@0 { - compatible = "smsc,lan9118", "smsc,lan9115"; - reg = <0x00000000 0x1000>; - phy-mode = "mii"; - reg-io-width = <4>; - }; + ethsc: ethernet@1,1f00000 { + compatible = "smsc,lan9118", "smsc,lan9115"; + reg = <1 0x01f00000 0x1000>; + phy-mode = "mii"; + reg-io-width = <4>; + }; - serialsc: serial@b0000 { - compatible = "ns16550a"; - reg = <0x000b0000 0x20>; - clock-frequency = <12288000>; - reg-shift = <1>; - }; + serialsc: serial@1,1fb0000 { + compatible = "ns16550a"; + reg = <1 0x01fb0000 0x20>; + clock-frequency = <12288000>; + reg-shift = <1>; }; };