Received: by 2002:a05:6a10:f3d0:0:0:0:0 with SMTP id a16csp674135pxv; Wed, 14 Jul 2021 12:44:02 -0700 (PDT) X-Google-Smtp-Source: ABdhPJynLCf7PJjkhRjNh8p2VL7jZO70MJIq5rwr83d/Gk3FSVf8cQ2RQ3h1B5vnrDWlXlnQyIZM X-Received: by 2002:a17:906:2bd4:: with SMTP id n20mr14302870ejg.390.1626291842528; Wed, 14 Jul 2021 12:44:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626291842; cv=none; d=google.com; s=arc-20160816; b=AHHmvbPf8bgHq9KGmzYsgFdYcUdd6xzl0CeBb0HrGOkExeOeoXoqfWtPkJEV1I+bO9 f1aFc1fVXPFEmegQr/hRSVyvD+QXvWbUC4GK5nNTQm5pbaUCKUj1GvMNpywi2+REGgpl f07X46vgR04XWvXMNy7vBzFG0cEmBVSyIReEH8puALdbZJmUi2cWgQaq9XB4sS2+BsSz mZnHwwSMYzSNS123eekPTNu8Pj//Rf/KqpppV7f7su9MhDhdNDLm8km5tJjDkJudgukB Y99vb5tTpWNb8nHBtZnwIBfdna07HyAuZEkYFjalqW792agGAdj76JalVeuPbRmGl1mW PFUg== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=hktDO17UvxojM/P7iW1sXlk0TUrb1zAPVpWZ0WsCNWU=; b=jWwnAc6XNUp4Ane/ccauAF5tlha9J4xurowKGG56yO5FQa6I8MzY81NlV1JyTRjfDs zC+8cWCAYXsBlNKOXW2iAXUNUsKf8/bimZ3Rnk1lms+FuWmwFlQHjiJcbrUzPyYUmars orAuTIa0fiSuL+x0YUV0jqsLNtYyMsBK5kizjJDYrz85dUmcssudvZrORFHfNmAMamzT i96z4aQOw9d8oN6blxVU5+REHRCEQT8/z6layneYiSp/qduqzbOH4eT+BG02fD+clEF/ v971GNIit3xhWhVd7+OF2ZsGH+1NvMo/Mepm6w8xQqzQstyD895Z/iCXMK3SVbqD2lpu FJQg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=aHpMlT8l; 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=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id 4si3700010ejr.444.2021.07.14.12.43.38; Wed, 14 Jul 2021 12:44:02 -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=@kernel.org header.s=k20201202 header.b=aHpMlT8l; 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=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234657AbhGNTno (ORCPT + 99 others); Wed, 14 Jul 2021 15:43:44 -0400 Received: from mail.kernel.org ([198.145.29.99]:37832 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234633AbhGNTma (ORCPT ); Wed, 14 Jul 2021 15:42:30 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 32DD9613D4; Wed, 14 Jul 2021 19:39:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1626291578; bh=YRE3zEd5N+F6XJENeX5Caf8U5brSgG1mmTNvYP9jKtI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=aHpMlT8l4/YTTt6XORRgYemNUwZWC3BgvZoxJxeuqhyRoqvZcnVmlrBdqRAJe/w6Q bCKSpunP4cawFkL1WGcE0qUVbT7Xixvw+MBkmRCzMsmeJ/ICEwM79UPb5KzZk9bget g6r552A/E/bdd94S4/FnuHJfwJVeX+kDPrw6kyYbFSpsg84Smc03JoWKq4P1BySkvc 0YhOxcFV+DTtdC1CRLBGlVP3FBhm5NcRBIMhmc0oCTZLYH60Lbo3TrZgoYwfo6KId5 Wmn5bwP2dEruOWhNT8zK/1pAo7DG/Hi7LBfKa+0e818SK8uIfzNqr95QPwwc6DmDLw 7LyrYpFt/Ql9w== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Stefan Wahren , Nicolas Saenz Julienne , Sasha Levin , devicetree@vger.kernel.org, bcm-kernel-feedback-list@broadcom.com, linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH AUTOSEL 5.13 067/108] ARM: dts: bcm283x: Fix up MMC node names Date: Wed, 14 Jul 2021 15:37:19 -0400 Message-Id: <20210714193800.52097-67-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210714193800.52097-1-sashal@kernel.org> References: <20210714193800.52097-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: 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 @@ emmc2bus: emmc2bus { 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 @@ pwm: pwm@7e20c000 { status = "disabled"; }; - sdhci: sdhci@7e300000 { + sdhci: mmc@7e300000 { compatible = "brcm,bcm2835-sdhci"; reg = <0x7e300000 0x100>; interrupts = <2 30>; -- 2.30.2