From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 13611C433EF for ; Tue, 9 Nov 2021 22:35:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E3AD86103C for ; Tue, 9 Nov 2021 22:35:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237467AbhKIWhz (ORCPT ); Tue, 9 Nov 2021 17:37:55 -0500 Received: from mail.kernel.org ([198.145.29.99]:56228 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345333AbhKIWfy (ORCPT ); Tue, 9 Nov 2021 17:35:54 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id B616F619E9; Tue, 9 Nov 2021 22:22:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1636496551; bh=waWzpIJdhFhYvusS3tLb5b8eJ4KDgs0tBUtmWZy/vLU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CygzTq5c/ps4U+03fIRdiF61flBeUTMXr9sdWGykdKhVa+TIgthDQ57jNDEBHZCCk ZB0WeDpn0K0cIMfh7P8yYDf4+HtQkQqvMlK4D7QBcoOFcP32sTuHcsiFIHlHEmWDcA H/szIc2Hnr5c63DiO6UYdWZLzaKbPNDekpiMAlYSX2XdwVRJ80l+t8K1cbkIpQS+3o iywxFophCnwVMC1HfSaQl4qLw89r9K/A3jLgVCnvulTULt6wceIvhKzwmTrVUeqlak UIBdpyVa5laSKqH1j3L5t08I+rehAvpypZWMfCQvHQfc0wO777eAhbF/QahkhWZE2V 2WSUXVdozrXNg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Matthew Hagan , Florian Fainelli , Sasha Levin , robh+dt@kernel.org, pawel.moll@arm.com, mark.rutland@arm.com, ijc+devicetree@hellion.org.uk, galak@codeaurora.org, linux@arm.linux.org.uk, rjui@broadcom.com, sbranden@broadcom.com, jonmason@broadcom.com, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, bcm-kernel-feedback-list@broadcom.com Subject: [PATCH AUTOSEL 5.4 03/30] ARM: dts: NSP: Fix mpcore, mmc node names Date: Tue, 9 Nov 2021 17:21:57 -0500 Message-Id: <20211109222224.1235388-3-sashal@kernel.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211109222224.1235388-1-sashal@kernel.org> References: <20211109222224.1235388-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: stable@vger.kernel.org From: Matthew Hagan [ Upstream commit 15a563d008ef9d04df525f0c476cd7d7127bb883 ] Running dtbs_check yielded the issues with bcm-nsp.dtsi. Firstly this patch fixes the following message by appending "-bus" to the mpcore node name: mpcore@19000000: $nodename:0: 'mpcore@19000000' does not match '^([a-z][a-z0-9\\-]+-bus|bus|soc|axi|ahb|apb)(@[0-9a-f]+)?$' Secondly mmc node name. The label name can remain as is. sdhci@21000: $nodename:0: 'sdhci@21000' does not match '^mmc(@.*)?$' Signed-off-by: Matthew Hagan Signed-off-by: Florian Fainelli Signed-off-by: Sasha Levin --- arch/arm/boot/dts/bcm-nsp.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/bcm-nsp.dtsi b/arch/arm/boot/dts/bcm-nsp.dtsi index 43ff85d31dc12..5a1352fd90d16 100644 --- a/arch/arm/boot/dts/bcm-nsp.dtsi +++ b/arch/arm/boot/dts/bcm-nsp.dtsi @@ -77,7 +77,7 @@ interrupt-affinity = <&cpu0>, <&cpu1>; }; - mpcore@19000000 { + mpcore-bus@19000000 { compatible = "simple-bus"; ranges = <0x00000000 0x19000000 0x00023000>; #address-cells = <1>; @@ -217,7 +217,7 @@ #dma-cells = <1>; }; - sdio: sdhci@21000 { + sdio: mmc@21000 { compatible = "brcm,sdhci-iproc-cygnus"; reg = <0x21000 0x100>; interrupts = ; -- 2.33.0