Received: by 2002:a05:6a10:1287:0:0:0:0 with SMTP id d7csp691430pxv; Thu, 22 Jul 2021 09:49:32 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwjQbPhYF9OcibnMvTijEdJSaLGWkzQALJ2kZZqmN9BHJC7+47S7RnU6+UG+KC+DwAf6VwD X-Received: by 2002:a05:6638:41a7:: with SMTP id az39mr430592jab.52.1626972572338; Thu, 22 Jul 2021 09:49:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626972572; cv=none; d=google.com; s=arc-20160816; b=Jm0/s++op0ZqQbJR8Av7azQsbzp0fzFu/SdSaDIXR4JlOcvKourAnNuNWGq1mjCJGR /ETtaXy/50CsRumPnwLzpwmdHyzN6EFTsHPHMjDqXW9KQKYMkDkIRBxcw3CK2gMg6VHR aZOJ4XzveWVuhemOITkEPOFWKlAMQaWMkayYtFwaKn1uCdDmR+tDOGi/xZ3gVbcQhFNJ t181yYVFXQ/nxjVSr//TCqB3b7/aqW0JwBpw/Rj6Zagp9uYhUKESzZlb7FmI6Xp+GUE/ gZxXkp0+udyEbHu/njoJVoZeFGJRw6ZIxDXM2vZ245NVlgjrDKvrTXF9hb6sGN+oVoW/ ahPQ== 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=2OlIt5tpcuwUZuVX+i4L8W6SoQujjm3YGdDMbGOqAQk=; b=ImHfczmYyj2LzZZm4duD2hKFNE+l4zudx6NRedk1XJ1D/umXPJNIyRZ8cUjoea6Y10 eThNiv5q1/AQBLrQTBCuOkgK0RZtFOGp+j9gBern9IPPmZs6p6zozhfg/Gh0veGehnQe OzDKcBnSvoLhy/XDkYVkliiI3Lb54S6Ni2tD+TciKRuAhK+0zzWRqJfaCPqF1I5Hvpxv PLQ2Ip8LHz3sor6tcwZe1AWAlbBhFmOf78EiRMqu7yyhXuv4Omr/yjhxfqKO110iY9bG zwGVKzC5z4yEdT5sHJXR9gHwS1Ol8IUJXeYzu1DEyZm+ibPltjpSfN7nc9rLVmPxenvc lZ/w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=z31BMH1W; 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=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id j3si26551403ilu.69.2021.07.22.09.49.15; Thu, 22 Jul 2021 09:49:32 -0700 (PDT) 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=@linuxfoundation.org header.s=korg header.b=z31BMH1W; 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=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234639AbhGVQHo (ORCPT + 99 others); Thu, 22 Jul 2021 12:07:44 -0400 Received: from mail.kernel.org ([198.145.29.99]:40488 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234209AbhGVQE2 (ORCPT ); Thu, 22 Jul 2021 12:04:28 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 9182561CBF; Thu, 22 Jul 2021 16:44:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626972297; bh=5GbnxnRz/alVXZRk6E3oCgK2dZ1Z3wbNbQf9Z27cDn0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=z31BMH1W3il/xeQGm69M1+KHQ7Xf0ElnLK1pLhfe3Y3fyovro3ZKvKsFhGnArPvYh hVzcWFMKmE3ErUSa2xiPNqiCxAd2v0i6m24mhXgki1lOc/cJEczOJsa2ou2k4FoV4F tZwcxga2Nz25LQFexvxZgDc75vLXjK3EuifpRTsU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Stefan Wahren , Nicolas Saenz Julienne , Sasha Levin Subject: [PATCH 5.13 060/156] ARM: dts: bcm283x: Fix up MMC node names Date: Thu, 22 Jul 2021 18:30:35 +0200 Message-Id: <20210722155630.346271461@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210722155628.371356843@linuxfoundation.org> References: <20210722155628.371356843@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Stefan Wahren [ Upstream commit f230c32349eb0a43a012a81c08a7f13859b86cbb ] Fix the node names for the MMC/SD card controller to conform to the standard node name mmc@.. Signed-off-by: Stefan Wahren Link: https://lore.kernel.org/r/1622981777-5023-2-git-send-email-stefan.wahren@i2se.com Signed-off-by: Nicolas Saenz Julienne Signed-off-by: Sasha Levin --- arch/arm/boot/dts/bcm2711.dtsi | 2 +- arch/arm/boot/dts/bcm283x.dtsi | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/bcm2711.dtsi b/arch/arm/boot/dts/bcm2711.dtsi index 720beec54d61..d872064db761 100644 --- a/arch/arm/boot/dts/bcm2711.dtsi +++ b/arch/arm/boot/dts/bcm2711.dtsi @@ -413,7 +413,7 @@ ranges = <0x0 0x7e000000 0x0 0xfe000000 0x01800000>; dma-ranges = <0x0 0xc0000000 0x0 0x00000000 0x40000000>; - emmc2: emmc2@7e340000 { + emmc2: mmc@7e340000 { compatible = "brcm,bcm2711-emmc2"; reg = <0x0 0x7e340000 0x100>; interrupts = ; diff --git a/arch/arm/boot/dts/bcm283x.dtsi b/arch/arm/boot/dts/bcm283x.dtsi index b83a864e2e8b..0f3be55201a5 100644 --- a/arch/arm/boot/dts/bcm283x.dtsi +++ b/arch/arm/boot/dts/bcm283x.dtsi @@ -420,7 +420,7 @@ status = "disabled"; }; - sdhci: sdhci@7e300000 { + sdhci: mmc@7e300000 { compatible = "brcm,bcm2835-sdhci"; reg = <0x7e300000 0x100>; interrupts = <2 30>; -- 2.30.2