Received: by 2002:a05:6a10:f347:0:0:0:0 with SMTP id d7csp5467600pxu; Tue, 22 Dec 2020 19:02:58 -0800 (PST) X-Google-Smtp-Source: ABdhPJwK3wIeQHaZIAuTwKXILZdn2M+uASdfETjVmINy7kiw7p7u+cgoxBnM5PyNpRGQP47fwoFE X-Received: by 2002:aa7:d2d3:: with SMTP id k19mr8716246edr.28.1608692578399; Tue, 22 Dec 2020 19:02:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1608692578; cv=none; d=google.com; s=arc-20160816; b=NnT24PJDvfxyau9pqRRFN+buuBvYhFObixojteHnXlFXD7WM47Bh+Qg3Xbj5LMjK2i YlcZg33ktPcyWPitWrfZa8R5lt/wO9FflSAF9UQ42YPIaeXiXQ4MNpYH37LcBTgFogeI ZVy8jUcrnRxRHHn07QvJZuMT2q9WeXwsigdV08SwVAOMIO9sOxMCp0CkymJXkQ1Zhvea j7NakDcL5XejjDoc/XXMHFt3kzGe+Yo0eajR61F5q1w11U4PuX12CuuDD2Fu/pntMeuJ 54bo52sTzLO7rW5xCW4XANswNIs27VcxiXQ1s39dQxsgBBckmt2qXtn4m9MOPRj9ZCBu RKiw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=tamNoY9wN6azNLQhcuQSrvLgn8MA6z+S3R6pxLwp23Y=; b=E03470mncmacDlWzMq2Cx5qwF9jd/wsOmvA3eV0pI61j+p0zVtsECVOpwd99+1xuU4 T98PoxAw8YkuY8haxWf4NP9i3RjHEiWHePgvI/3uO+lqtOjmk4n0g4accXWOMuOY1hp8 DcSoMwlWxd4+MUvGYeacY1RV8Jzb4KWnnQysEL2//CWQUI7cm44CWT1zlsOlqXQjItGb B2lAj2vWSwJgJECeQBUErMxMfAqjuwXPXDZMQpn1U+MTD0fpHvuL4rio2+NXVkk5uPiF TjZguXrnOtdlKQCx29ggdblHNP6s1dXQ51lJuIZTGte2FA3lKDe8ABhenFZxhlgR5uVd 8AwA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=EWfurFNy; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id 38si13261649edq.246.2020.12.22.19.02.36; Tue, 22 Dec 2020 19:02:58 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-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=@kernel.org header.s=k20201202 header.b=EWfurFNy; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731304AbgLWDAs (ORCPT + 99 others); Tue, 22 Dec 2020 22:00:48 -0500 Received: from mail.kernel.org ([198.145.29.99]:46424 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728816AbgLWCT4 (ORCPT ); Tue, 22 Dec 2020 21:19:56 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 5FB89206EC; Wed, 23 Dec 2020 02:19:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1608689976; bh=zRH9S+A7nqD/PgK6wNXM/NUjpJqcyUYTYVa3oHScwtU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=EWfurFNyJjLG0nPT/70DT+X2kg25kkoAqNZMzP5mblmNMq+Dhg20iZDbHexUyOLJI 7xT+017OOaiOcQLHnb08RUQG4gHtebCNqdFKhNmvzcTWouduGjwIR1xXjMXjpK539D AcVo4kFRNEJAh7TiAonPZAfBXWKZtSdStVIsPR1S/hpMM1sSsCX3PSU1Inohf4VqT8 szwi3BHIyJjUZ2JmcJNB67/8FkSF1mBewk5j9iF5y7yoUPZo8MzBH0mQUKSfEWPIdd XtH5Oa4cIfBV/y9Fo3RGz8Ev2mNCtAaJm7rb9lbdqQe4MVCYJgWJw0WMwG9pUkl4lK 3yiqNedVUvW7g== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Zhen Lei , Wei Xu , Sasha Levin , linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org Subject: [PATCH AUTOSEL 5.4 064/130] ARM: dts: hisilicon: fix errors detected by simple-bus.yaml Date: Tue, 22 Dec 2020 21:17:07 -0500 Message-Id: <20201223021813.2791612-64-sashal@kernel.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201223021813.2791612-1-sashal@kernel.org> References: <20201223021813.2791612-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Zhen Lei [ Upstream commit 8e9e8dd7ce093344a89792deaeb6caedde636dcf ] Change bus node name from "amba" to "amba-bus" to match '^([a-z][a-z0-9\\-]+-bus|bus|soc|axi|ahb|apb)(@[0-9a-f]+)?$' Signed-off-by: Zhen Lei Signed-off-by: Wei Xu Signed-off-by: Sasha Levin --- arch/arm/boot/dts/hi3620-hi4511.dts | 2 +- arch/arm/boot/dts/hi3620.dtsi | 2 +- arch/arm/boot/dts/hip01.dtsi | 2 +- arch/arm/boot/dts/hisi-x5hd2.dtsi | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm/boot/dts/hi3620-hi4511.dts b/arch/arm/boot/dts/hi3620-hi4511.dts index 1c62bdcca647a..29eedc7fef986 100644 --- a/arch/arm/boot/dts/hi3620-hi4511.dts +++ b/arch/arm/boot/dts/hi3620-hi4511.dts @@ -22,7 +22,7 @@ memory { reg = <0x40000000 0x20000000>; }; - amba { + amba-bus { dual_timer0: dual_timer@800000 { status = "ok"; }; diff --git a/arch/arm/boot/dts/hi3620.dtsi b/arch/arm/boot/dts/hi3620.dtsi index cb7e932e094f6..fa3a287c50b5a 100644 --- a/arch/arm/boot/dts/hi3620.dtsi +++ b/arch/arm/boot/dts/hi3620.dtsi @@ -63,7 +63,7 @@ cpu@3 { }; }; - amba { + amba-bus { #address-cells = <1>; #size-cells = <1>; diff --git a/arch/arm/boot/dts/hip01.dtsi b/arch/arm/boot/dts/hip01.dtsi index fd09e6d9309c7..2a79636053900 100644 --- a/arch/arm/boot/dts/hip01.dtsi +++ b/arch/arm/boot/dts/hip01.dtsi @@ -35,7 +35,7 @@ soc { interrupt-parent = <&gic>; ranges = <0 0x10000000 0x20000000>; - amba { + amba-bus { #address-cells = <1>; #size-cells = <1>; compatible = "simple-bus"; diff --git a/arch/arm/boot/dts/hisi-x5hd2.dtsi b/arch/arm/boot/dts/hisi-x5hd2.dtsi index da42b9400759b..f9daee9392506 100644 --- a/arch/arm/boot/dts/hisi-x5hd2.dtsi +++ b/arch/arm/boot/dts/hisi-x5hd2.dtsi @@ -30,7 +30,7 @@ soc { interrupt-parent = <&gic>; ranges = <0 0xf8000000 0x8000000>; - amba { + amba-bus { #address-cells = <1>; #size-cells = <1>; compatible = "simple-bus"; -- 2.27.0