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: 235210 Delivered-To: patch@linaro.org Received: by 2002:a92:d244:0:0:0:0:0 with SMTP id v4csp215671ilg; Fri, 10 Jul 2020 00:44:18 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyzRzEyJqpRVEEPTeofN1rOY6b7Arjj3zUEYyRShowrqJ2j37J+HeQwaHEfRGM6eLkEyBGX X-Received: by 2002:a17:906:1386:: with SMTP id f6mr60726719ejc.66.1594367057994; Fri, 10 Jul 2020 00:44:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1594367057; cv=none; d=google.com; s=arc-20160816; b=AFjLSi8V6UgaQkcrQp489u9skgnK02dqaC8bovQ/eq7ONXrDB97fH7B+uYFVH0RhZe VXeJK77WO6FCZmle+RcOW7EuyQGVburNT99ASkM11Fme2WVQqvDSycc+0hioAflTI6lo d/jt+1kd0rbKT79oLhLrYLSZjP+D+V3YzZhaHK0z3MGfh5ghXsU1z6jT6o4XDi96G/0Y t5ixvaQZL9Qe2nvrL9dq4uO2NxjNg7/axTrkzvsHN/FjFl5eerZ1GfMij+5jXl73C6QK QLXid64lj22l7pw2bxglSCjI1ut866OVIIf2mOAg6l87sDobQF4fd7sq/GrNf3FbQX7O HpYw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature:dkim-filter; bh=XzgmZfHGbIg/7Bx4Qqjl6MK0bxbloahArh6T6eyAMM0=; b=Tg9yskKzAqccvmTN0g/RqXxvZeURIF3z8nSWtx4XqCwDE68ooQoG5dvn9apqD7vie8 THxWuvRDgs/bZzxvI9/8yCtoMKMwKpomWTm33QEYt+WZlM6FaWB53C+JlOzVKMxHfYLY 97G9+0+gQ/Ax2MO10VC6afgPa2kw2qJWCiOUY2KOOUzjIACZzyOAIqzQgX1Gw/lAphLj hvpAMGg6xSF+Kd7vrNqgfg5oCiYSmwnye+fsqsul85144WlxSgoi7WpgWTbhvfrr2Nez ejzDsTzV6kvzVPGEZj1ZYEz9cJK8DUpOpzExe2XIRp1wBIr3uUJfPqg9dswdaT8I/aFa Vbwg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=HK8u7Agj; spf=pass (google.com: domain of devicetree-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id qx16si3608580ejb.9.2020.07.10.00.44.17; Fri, 10 Jul 2020 00:44:17 -0700 (PDT) Received-SPF: pass (google.com: domain of devicetree-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=HK8u7Agj; spf=pass (google.com: domain of devicetree-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727098AbgGJHoR (ORCPT + 6 others); Fri, 10 Jul 2020 03:44:17 -0400 Received: from conuserg-12.nifty.com ([210.131.2.79]:43256 "EHLO conuserg-12.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726369AbgGJHoQ (ORCPT ); Fri, 10 Jul 2020 03:44:16 -0400 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 Cc: Masahiro Yamada , Rob Herring , devicetree@vger.kernel.org, linux-kernel@vger.kernel.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 Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.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(-) -- 2.25.1 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>; }; };