Received: by 2002:a05:6a10:f347:0:0:0:0 with SMTP id d7csp5457953pxu; Tue, 22 Dec 2020 18:39:52 -0800 (PST) X-Google-Smtp-Source: ABdhPJwjX7yLhJWn98KdO8IYOzQacNGJAWeMwnRGOiJ9+mGf2tt+IgObz84Wn3048apVwvTdOuGl X-Received: by 2002:a17:906:a857:: with SMTP id dx23mr22423401ejb.189.1608691192755; Tue, 22 Dec 2020 18:39:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1608691192; cv=none; d=google.com; s=arc-20160816; b=D0jeiMqkctT5886IP1yEXEL/cxM/URpEYnWxR2u7FV0iW2zaVUh7dOyC4vSi7QOUWm 0VfdhR/6QgzWIjOAJitYT8QuQVA1GMTAWKbBeh4kVaixhfUDeZ4Jcagk65KpXOzFjTTR swqqmNmSUJG5DhqDLmzpaM1NaIP8v14WXORSPBD0H9yWQVS3n2Ehb/nstUyv1TI/x2e8 iOtKcuN/5mRNklLkoDxqjUXUgEcYOY/UTWevrRjuMU8hORUYJYt+VmOKWkefhTZJLWUz nVygCLpw3ahwTdvpwgW13b1xODnOLEiMQLxYLtJGYkfK9V/qzPX5o9fho/Bl18+CmfoB n5dg== 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=Iqx+22QpyNCoYwzHcYJnBNo1D9eRixkLSJWLyCZ32n8=; b=GUqTy9lOgYm0z/PIG6ZsmHtb+cLzrUkk4Q7oDjv7Ic+XOluboUsSrb55SPJvG2Opd5 3X0W2HCUXcyzuvxDptPDVQigp8s/ZPGm2jjMdktBWy8G0vToy7uP+alN6Z3whQGYTEDQ 64RiqB8ACiD8GRlFbn+Bo8vfpifIpTq2J5iavvzJBiTG3Rm7tD22vEbq4OTjAMe1EJoI LexNKKnUf3WvzvwItEO+HcATEQcg2eCf5SvJBcMEjlQ0LFCPHy6XySY3PUD5gM0l9W2X qg2YkB+QuHaBHUqIxNj2W7cpygah15VOp9cYBHETTnMH7rhQ+0RjFCVs0OwBPXXMghQX uTHw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=eOfERPkW; 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 j7si10688117ejf.125.2020.12.22.18.39.30; Tue, 22 Dec 2020 18:39:52 -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=eOfERPkW; 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 S1730733AbgLWCjW (ORCPT + 99 others); Tue, 22 Dec 2020 21:39:22 -0500 Received: from mail.kernel.org ([198.145.29.99]:50890 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730080AbgLWCXx (ORCPT ); Tue, 22 Dec 2020 21:23:53 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id A34A122525; Wed, 23 Dec 2020 02:23:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1608690218; bh=GrdGkYHq16gFPHfVyShWYyUmnLGNIegsrkfPIMt4/3k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=eOfERPkWVIidh9ABcp5tWJ4eIUcAKeUYvnygXSd/0yjRdybJDtgKA87hJS2l8enkl GR7KFE9plsYvIfMr/JvCQG5VuVt+C/e0NynpiMt/ZxQ/5q8A6UkHSQ3zTSwnn4+AQn YpQGg3qiKWAL5QJcdzSE9xVWBDKNP9ioiIkKJ2UGbDIZJP573R0J9exGkcTAkUDffK 3OVo53yyBsJYt9B2rPOSycU5M/x6I3F907LmopWPOlxvnwSLw0hiHJ7OdM1+MWJq7U Zqnm1+sGIZ2iOlOVY+C6exvH3omXQWL5fvHFAxvPGICVhH9i9wjwjhAlWykDIMOTlt t6pEYG/G1lz6w== 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 4.14 36/66] ARM: dts: hisilicon: fix errors detected by simple-bus.yaml Date: Tue, 22 Dec 2020 21:22:22 -0500 Message-Id: <20201223022253.2793452-36-sashal@kernel.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201223022253.2793452-1-sashal@kernel.org> References: <20201223022253.2793452-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 a579fbf13b5f5..a672c4e4babbd 100644 --- a/arch/arm/boot/dts/hi3620-hi4511.dts +++ b/arch/arm/boot/dts/hi3620-hi4511.dts @@ -25,7 +25,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 541d700945444..dbce3d6dad191 100644 --- a/arch/arm/boot/dts/hi3620.dtsi +++ b/arch/arm/boot/dts/hi3620.dtsi @@ -66,7 +66,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 98667ca26c037..8823481789331 100644 --- a/arch/arm/boot/dts/hip01.dtsi +++ b/arch/arm/boot/dts/hip01.dtsi @@ -38,7 +38,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 6bbe560742c6a..2a9ef32e92f86 100644 --- a/arch/arm/boot/dts/hisi-x5hd2.dtsi +++ b/arch/arm/boot/dts/hisi-x5hd2.dtsi @@ -33,7 +33,7 @@ soc { interrupt-parent = <&gic>; ranges = <0 0xf8000000 0x8000000>; - amba { + amba-bus { #address-cells = <1>; #size-cells = <1>; compatible = "simple-bus"; -- 2.27.0