From patchwork Thu Jul 29 13:54:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 488726 Delivered-To: patch@linaro.org Received: by 2002:a05:6638:1185:0:0:0:0 with SMTP id f5csp2186394jas; Thu, 29 Jul 2021 06:58:07 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwzCkaYqHM+2we36wDaO5aX9FkPhEaTR06C5fHQTxfDZujxlM+qihV4FNGAc5j9u2nOvu+N X-Received: by 2002:a05:6602:1808:: with SMTP id t8mr4313567ioh.165.1627567087638; Thu, 29 Jul 2021 06:58:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1627567087; cv=none; d=google.com; s=arc-20160816; b=uMCOCJZIpPZTC+eElICbKECqsTtrvr6pOtnlxMiNOhBE1x7d6tiMLSuvtbNwHZqd4m GdfLPucc7+Fc09BB3t4QdDYz9WnHRZYtgHYA1P/00S2wgjUBqQL3eVzqOjrg8jmQtQdK pNNDJ8V5p21Dp3i5ESOHbGOK42Npwzc/N1QShxpOxWWdLGW7uRC1P97yfUE/y7ZticxI 4ST5b4vdhGQoDlKQjvxSYx4NP2iecUD5tFFQHVSYZLFFs7wQto9yKnZIVrjjQcWgnaR9 PaWroU9/ND4+e/N1b2eTFBWkAuuDbBc6SFUA+SYDQFvBIOfxPBdHyLLWPGMW3eTEb7BQ wMeg== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=DRCFCLxFcLYDuxoft6RCQc0XJmow/TSIlA5x1aWg2ok=; b=LhMpQYZtZVjq6LISracas49gz5PbaiFr6iL8hJU4NZveGu5Rplt7x5ZViVKV53ZvYj R9JVhCXV86NzHbMkZx8m4RZ2xyXIKni/TIJeRfs0Baaqe86Tj2A1cv9RcIls8vrKigH3 lmRcA5T18BVZ7qEWSzzvxzC8skLy9v3zqR3ZKtUKrhGaHcpKJA5YV8kYRYwoM8fSYAfZ 97UHUAhbfpL5WVgCnOmtRJDeWsx43bj25VnD2gFR0n4TN0+pqdebUOfjPYxHmBiBr2Vs h2iFvXXw78yN4m765m0vrh641ur2UYmpqskHyslgunwrIXdCxhPX9r8a+RWsBMFRpGq9 iMqA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=vj3I4wsR; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id t8si3245907ils.46.2021.07.29.06.58.07; Thu, 29 Jul 2021 06:58:07 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-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=@linuxfoundation.org header.s=korg header.b=vj3I4wsR; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238198AbhG2N6J (ORCPT + 12 others); Thu, 29 Jul 2021 09:58:09 -0400 Received: from mail.kernel.org ([198.145.29.99]:48368 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238183AbhG2N5t (ORCPT ); Thu, 29 Jul 2021 09:57:49 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 2D2F360F5E; Thu, 29 Jul 2021 13:57:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1627567065; bh=S7P0nhfOfRBupSOYqNTo4tFCg++UMUkYFsS9chBOYA0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vj3I4wsR6+sxNNEntW87FykFkRMMsxlhNKUrUX1sl36nbLvXAfanSP5UBPswoq0AU tNnVKharnBNOJ5fHxtSr4lsuLBz3OowulaquriFc14HPYuDOyeGWUEtd2BrRXVtyAF r9pb6p0xIolK5zLCa26Wb5Kheeg3DONkAoKm6TbE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Sudeep Holla , Linus Walleij , Arnd Bergmann , Sasha Levin Subject: [PATCH 5.4 20/21] ARM: dts: versatile: Fix up interrupt controller node names Date: Thu, 29 Jul 2021 15:54:27 +0200 Message-Id: <20210729135143.552064391@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210729135142.920143237@linuxfoundation.org> References: <20210729135142.920143237@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Sudeep Holla [ Upstream commit 82a1c67554dff610d6be4e1982c425717b3c6a23 ] Once the new schema interrupt-controller/arm,vic.yaml is added, we get the below warnings: arch/arm/boot/dts/versatile-ab.dt.yaml: intc@10140000: $nodename:0: 'intc@10140000' does not match '^interrupt-controller(@[0-9a-f,]+)*$' arch/arm/boot/dts/versatile-ab.dt.yaml: intc@10140000: 'clear-mask' does not match any of the regexes Fix the node names for the interrupt controller to conform to the standard node name interrupt-controller@.. Also drop invalid clear-mask property. Signed-off-by: Sudeep Holla Acked-by: Linus Walleij Link: https://lore.kernel.org/r/20210701132118.759454-1-sudeep.holla@arm.com' Signed-off-by: Arnd Bergmann Signed-off-by: Sasha Levin --- arch/arm/boot/dts/versatile-ab.dts | 5 ++--- arch/arm/boot/dts/versatile-pb.dts | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) -- 2.30.2 diff --git a/arch/arm/boot/dts/versatile-ab.dts b/arch/arm/boot/dts/versatile-ab.dts index 37bd41ff8dff..151c0220047d 100644 --- a/arch/arm/boot/dts/versatile-ab.dts +++ b/arch/arm/boot/dts/versatile-ab.dts @@ -195,16 +195,15 @@ #size-cells = <1>; ranges; - vic: intc@10140000 { + vic: interrupt-controller@10140000 { compatible = "arm,versatile-vic"; interrupt-controller; #interrupt-cells = <1>; reg = <0x10140000 0x1000>; - clear-mask = <0xffffffff>; valid-mask = <0xffffffff>; }; - sic: intc@10003000 { + sic: interrupt-controller@10003000 { compatible = "arm,versatile-sic"; interrupt-controller; #interrupt-cells = <1>; diff --git a/arch/arm/boot/dts/versatile-pb.dts b/arch/arm/boot/dts/versatile-pb.dts index 06a0fdf24026..e7e751a858d8 100644 --- a/arch/arm/boot/dts/versatile-pb.dts +++ b/arch/arm/boot/dts/versatile-pb.dts @@ -7,7 +7,7 @@ amba { /* The Versatile PB is using more SIC IRQ lines than the AB */ - sic: intc@10003000 { + sic: interrupt-controller@10003000 { clear-mask = <0xffffffff>; /* * Valid interrupt lines mask according to