Received: by 2002:a05:6a10:1287:0:0:0:0 with SMTP id d7csp684060pxv; Thu, 22 Jul 2021 09:40:38 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxlNc9vzDWcI1I/7zrH7Z0CZS60LXlt0SM3VtO1YE4WPEGxgpiM5M8fl/RDgyBO40CZixSH X-Received: by 2002:a05:6638:250b:: with SMTP id v11mr369547jat.105.1626972037609; Thu, 22 Jul 2021 09:40:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626972037; cv=none; d=google.com; s=arc-20160816; b=j+ElwnRUS096jgupCZM5w1EBsy0Ed6w8ZzGesPfcRtk4MlO4+LORSYT3pEBRmQcrCi cxD54mW5hIEjhllubCQWChecwPWjqD0gng6M80AVTOkNfCG1dw+oA0VPh+S9MPMafcOh Zwrzh0gH/9so++gWzdonnatBGox6Us2kJTF2RFBaY0vr89bn9mEKchMBXwgABKemQazD JvRFRgxDSnPkB5HNi6TJM7TOqemvsD90Wx/dpqt/gE2e1zRxh1UVSeCaK2NHIQ32klLP 0zUVkw3x4RshmwgSyu6QQMhmGCDTVef7g+n+qJa4EKU+iLkIa6KqwgT6AaJOte8EwyGT zmOg== 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=iBz+qDISJvFhY12o+Hya1TmvG7k3g+/bboQFXvkpZ9E=; b=uaJXSaY2nwKXDGe4CmPpUJPpga7v7HjewVT7E5YKxIFiNteeh9EukJHXEXa9qSPiUO R8JGNQABViJXpvPoz1X0zRGAvncRuOHAFmO8jCDVLJLq1SS9dKjjavEAwGXsFEQMKd1x YWXMmsy0btPxuFsDdLEdDthThjeNlNppbvdvD56jsfCo3OoXsrpUO+YcrHJZf0dQgqEY fOCzppoQCQe37Hz89ThwRTwFQNgvEKuEcinwMydu2kerpzRpVMoeMTGvSsK7ccI7p0lM 0gY+naJYXEKdi00ue8Ph8Nd7/qAcvtmmRRSXcvJqh+A7jNrN4xWSaCdBHw/yxo2uzAZ6 +Jpw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=DaNljWIF; 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 l2si30413904jak.30.2021.07.22.09.40.25; Thu, 22 Jul 2021 09:40:37 -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=DaNljWIF; 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 S232655AbhGVP61 (ORCPT + 99 others); Thu, 22 Jul 2021 11:58:27 -0400 Received: from mail.kernel.org ([198.145.29.99]:33032 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230344AbhGVP4t (ORCPT ); Thu, 22 Jul 2021 11:56:49 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 370E36135C; Thu, 22 Jul 2021 16:37:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626971843; bh=8eEC6oRc5rM3MU2hXQhAdSyfoUwCWvGrhOP2xdltxO4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DaNljWIFg4EC3rxtqSzt5JhXd9sZ5XkG3KY3KV77W84TEUQ07NzInGEqB7rKif0Ub kcqwhu29qHs06ayYO409SVB7R9ant3pUQhmnpwoeEn3jlan7ml7jzdLl1+qSZ3i/OL dWTd2ZKAChETPF+tLZ/DQMmFI97q6ev/geJK5ITU= 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.10 049/125] ARM: dts: bcm283x: Fix up MMC node names Date: Thu, 22 Jul 2021 18:30:40 +0200 Message-Id: <20210722155626.349278151@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210722155624.672583740@linuxfoundation.org> References: <20210722155624.672583740@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 4847dd305317..3d040f6e2a20 100644 --- a/arch/arm/boot/dts/bcm2711.dtsi +++ b/arch/arm/boot/dts/bcm2711.dtsi @@ -395,7 +395,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