From patchwork Mon Aug 2 13:44:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 490350 Delivered-To: patch@linaro.org Received: by 2002:a05:6638:1185:0:0:0:0 with SMTP id f5csp1940804jas; Mon, 2 Aug 2021 06:48:29 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzDG9u/cCFpDL3q2yOWYl5NS7H7SY2Q+JR0RwR2k6088GdUBgTfj7OZ7gvEez6YoW2cHqHE X-Received: by 2002:a92:505:: with SMTP id q5mr1120859ile.139.1627912109536; Mon, 02 Aug 2021 06:48:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1627912109; cv=none; d=google.com; s=arc-20160816; b=huZ+lPhGVPHIHY8XOCIj5ALQ+9UYWrCRflvLXMR1KnmZymhQHInz511CqkwmoiLo8v zATK4RPgxJLsaPdvBmbUE/oGxl357uk9eEeqLwNYO/5jPHn2vvIuBoyb/pv7rmuogM/0 Bu/UIkEdHc1Lq8snkaozO//LB+nqWteWCZlrruNOEzhneWeAj6YBHT4rbVjlm5XM61La ME9ZZIQDS4kOeE2lR2pqyZuyQ61j639l+n/jP2lTOfx2I7Yu2cGZ7PMzpzhLo4kbU5e4 MjlHcqYgNygdkc3P2jU9TeghHjRSKL7NPTowWu/hDRUdFomKCVImy9XKzFxzeo8DIi6e 5pPw== 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=Bzv10tK2EdQueYhABId19guML+0idsm3/HPffZCrg/w=; b=pDsv7B7l1qf45NaEUdMhtrOvPuaFtC3lEQlZUfCFX6nvAztrDm4OlC22Lhfb0fA6sV cbwWyEAbdII5lBygj6atN+8+/dMan4AYua/CBFs/IX19fHpf5BLT3aD6avo6b6UDwkqS f/PeKdfLC5UhRU7rUfypeEMjtoZPQoRWwejsN2DODYUQYvkFgK2Xdsoh35CHEAfd2JoD 2tJwW+YweEYO4jLoHDgBO5jLSBsDzExgPOAkNgov5jvQnZ9hvNWcVXF7eB2tD1nk0y5S BOyFVpKEt6p29nIQnQlF3GtdBX5aLiDhLR7Lji30eR3Pu2XnGdqphJM89pExJ0TJcS1u G1hg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=po444eYa; 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 n16si1431547jap.23.2021.08.02.06.48.29; Mon, 02 Aug 2021 06:48:29 -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=po444eYa; 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 S234593AbhHBNsh (ORCPT + 12 others); Mon, 2 Aug 2021 09:48:37 -0400 Received: from mail.kernel.org ([198.145.29.99]:57350 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234339AbhHBNsW (ORCPT ); Mon, 2 Aug 2021 09:48:22 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 5B95F610FD; Mon, 2 Aug 2021 13:48:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1627912092; bh=YTPvfpgFAf7NSRIcewhyH260OAH+FPd8xc2h6u6Up2s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=po444eYaHxgyemwGVOiZ6HVVC/ltxIrrJD3DIbuDP07Edk6ZLSZd0tqvDhuahd3Jq Mg9JkDNkNXa4jMAGjM+RqMKVv2OW9XZcyyyeqW7773ofcf/CKV5QMIAnAClAwGfJDH 68s+Q+MkkNE7jv0q1BFUZWETMHosPVxIMHB9dufQ= 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.14 13/38] ARM: dts: versatile: Fix up interrupt controller node names Date: Mon, 2 Aug 2021 15:44:35 +0200 Message-Id: <20210802134335.255401516@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210802134334.835358048@linuxfoundation.org> References: <20210802134334.835358048@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 a9000d22b2c0..873889ddecbe 100644 --- a/arch/arm/boot/dts/versatile-ab.dts +++ b/arch/arm/boot/dts/versatile-ab.dts @@ -155,16 +155,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