From patchwork Thu Jul 29 13:54:18 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: 488724 Delivered-To: patch@linaro.org Received: by 2002:a05:6638:1185:0:0:0:0 with SMTP id f5csp2185520jas; Thu, 29 Jul 2021 06:56:44 -0700 (PDT) X-Google-Smtp-Source: ABdhPJydRAotvxWrCHxoO8V/+Alz8NN7vrNL3glpYKxhkO1tx8tCEChyShBL6lPPcoMtt/9hNExZ X-Received: by 2002:a02:ccad:: with SMTP id t13mr4574166jap.29.1627567004050; Thu, 29 Jul 2021 06:56:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1627567004; cv=none; d=google.com; s=arc-20160816; b=ImEXHmRKbkeMD5a3FZDwfd7GTWDrO4jj53xeOTA6P1Ouxi5OvqvaegB8kN+DYPusTd eA0n2QTCrriciI++BfrjTn1gtX6k4MSqgZRHnQp/wyjFVObVtCqLH4uahG87Bw24/Rv6 wr15HrtY29yS2irCHosuZ1ZogRsAdw7RUxGsrE0SR2o5I8ld/LnL/3irNcj4b8Pgsy7+ VVwh4TNbNj2m3SH7d8pOZdpwl7p7Nhh8Z5xXNXjaA+YtO2sxEd3RqpIzaNQMqV/G6ewk i1o2wejuyfvt4HtCRENsNGdL0Yb1u7EcNqIzTv94RgU7E+YGTtqEIRYAEQKRpVKceZ3l CNNA== 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=Zj29R3w3JLl2QC0RbjxMLNq3E5AotEr/4ldnrlvFplw=; b=IT2WeqwET/IraXR+9j2o/4YHdvFDpSINBQSys2xzuMFQSHsEiCztQv1Y07VP4XcHF8 FMPBsdL8cFqX9aQsXKnOMNIuV/x62g1ZbPSrmT38S3IxqAOepsMWSaeFVzq12fyxvsHd ezPyBqNNWmdpMFoLWpERoRb8MVzE4ZFn/+8W9Ka3FePukbhMEx4PzrwA9wCF4ga2vq8W 8dgYD0LBSClG9+Ue0D+hDODpV4ZOEHZy77fr268I9UDgzOleEwyvex1iRB7TmnAVYQ3Z SZp3UduXEgkWbAFqMQd7wSB7b5k7RTxQR9wdPwrcmc/HnhBYdnTF5pThg3z4ddGwWR2a 8REA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=xE5yWr6Z; 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 w4si3335616ioa.95.2021.07.29.06.56.43; Thu, 29 Jul 2021 06:56:44 -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=xE5yWr6Z; 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 S237988AbhG2N4o (ORCPT + 12 others); Thu, 29 Jul 2021 09:56:44 -0400 Received: from mail.kernel.org ([198.145.29.99]:46470 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237924AbhG2N4k (ORCPT ); Thu, 29 Jul 2021 09:56:40 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id F3FB560F42; Thu, 29 Jul 2021 13:56:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1627566993; bh=XgbLbzi5wZdAoqd7BTj6HlFDf77mLOGO7053c4OTYnY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=xE5yWr6Zr/YLUMWVUJC5qqzRYCitjeJXVBaJQyabzKoQ0Ey3XmJH597cUBn+dWMgo uU6PCNot4lfaDjtk/drXwhyG7hTvlwozEwKNoIVHSpj1+JhzrEeG/McNV5VRv8/KZD WzBggcIfwtat8BuGo8k9r8iVXmoCJgc+S4PBC4+8= 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 4.19 17/17] ARM: dts: versatile: Fix up interrupt controller node names Date: Thu, 29 Jul 2021 15:54:18 +0200 Message-Id: <20210729135137.798474715@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210729135137.260993951@linuxfoundation.org> References: <20210729135137.260993951@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 6f4f60ba5429..990b7ef1800e 100644 --- a/arch/arm/boot/dts/versatile-ab.dts +++ b/arch/arm/boot/dts/versatile-ab.dts @@ -192,16 +192,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