Received: by 2002:a05:6a10:17d3:0:0:0:0 with SMTP id hz19csp2673983pxb; Mon, 19 Apr 2021 10:57:46 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxKHZiax1Xhcm5g96h8zkY1bYAKc8N9OJWVMtH6BRwJaaS+AlaZvufyW7VER1JupqZipepZ X-Received: by 2002:a05:6a00:d4a:b029:262:3d64:3cf1 with SMTP id n10-20020a056a000d4ab02902623d643cf1mr2311995pfv.14.1618855066606; Mon, 19 Apr 2021 10:57:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618855066; cv=none; d=google.com; s=arc-20160816; b=xfb7Njkyjl3Pe5vev2gMerXpA/iT+spT3rU8xSVyh+Yq0Q8sQP/fOI6uz0tm62iYQC WWskR7dh9cAZ4DxHsl0Y4uMxC6/Lnc2bs0CQVBsPzWqlyAk2odlp8PTy1+iMPW73eGS7 xcH4giFbCIq7xtdMyvhDjqXRO0gAnOe/slZd4KIu/Iz2t3aOuhjsj/D5X21re06E87zO wTUlpZf7MgV23uo9/XviHBOhqeMdBYl+Lf/sqxHk1gpKEIayTfkw1ayrqcAE4dLj1kbM H7cpyHq7v4RoAKLnkxZKgqLSzQpaeOvOpMyc2NF5sOKIoMU6J4Gzn1uaTMiTIzovJBCZ PphQ== 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=ShZJufDpavO7cE+v1pF4ZJXMLz8vyhqguRxyYrW6Lgw=; b=sS9O415vzyV40WklelkbTaS3Nk1C80vtPtd47QzUrPGPiRiBHkP66b8H4KTeF82q8K I61z9FMoj6KjgcDd4Gi8QvcSfds8kogXqiVgUiI3QkdJgVsn2ZNyx71pwm0rNddSfqDv HGX9l+Ug3yqoI1AHZnspZnPltYTrU+nMDbqcsku/JjJb2oRA89bPHvRCN3tenH/mQA27 I6gzokbsey5aP7cNvQAowOs57xdbd9PPOn4sToIVrEe0v8uvqYL4eGMd1SF/XHZUkkKs 6bTsrxC4/gsIBQLAi4ClFO+20hYWwLD+2oFmPo4GPC0MMPJvgVlUmjEwM823RsUtAwqp aVGw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=KidRq2Ze; 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 144si18745815pfc.264.2021.04.19.10.57.34; Mon, 19 Apr 2021 10:57:46 -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=KidRq2Ze; 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 S241553AbhDSNcS (ORCPT + 99 others); Mon, 19 Apr 2021 09:32:18 -0400 Received: from mail.kernel.org ([198.145.29.99]:56988 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240142AbhDSNW7 (ORCPT ); Mon, 19 Apr 2021 09:22:59 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 96B8F613B8; Mon, 19 Apr 2021 13:18:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1618838308; bh=Y4wP7bAL5Qh49YvrIy0xzTrGJgHMQMtsz1KDcLeU7N0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KidRq2ZemDnzJWPtMiLCdv6gHjew0HHF03re9yp62lyhYQLF1UT3lLY51xsH4mjm/ waVVQ8i3JjZfJoRyGdV8OVjlaqVECim4zJRuO5I5Wz2zVu6VjjAM8idG0/PblYc2Y3 RyZHlHwTa9baCfgOMfatDLiqvqu4AKs7C0d5eZYU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Tony Lindgren , Sasha Levin Subject: [PATCH 5.4 14/73] ARM: dts: Fix moving mmc devices with aliases for omap4 & 5 Date: Mon, 19 Apr 2021 15:06:05 +0200 Message-Id: <20210419130524.284538189@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210419130523.802169214@linuxfoundation.org> References: <20210419130523.802169214@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: Tony Lindgren [ Upstream commit 77335a040178a0456d4eabc8bf17a7ca3ee4a327 ] Fix moving mmc devices with dts aliases as discussed on the lists. Without this we now have internal eMMC mmc1 show up as mmc2 compared to the earlier order of devices. Signed-off-by: Tony Lindgren Signed-off-by: Sasha Levin --- arch/arm/boot/dts/omap4.dtsi | 5 +++++ arch/arm/boot/dts/omap5.dtsi | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/arch/arm/boot/dts/omap4.dtsi b/arch/arm/boot/dts/omap4.dtsi index 904852006b9b..0a36b8fe3fa9 100644 --- a/arch/arm/boot/dts/omap4.dtsi +++ b/arch/arm/boot/dts/omap4.dtsi @@ -22,6 +22,11 @@ i2c1 = &i2c2; i2c2 = &i2c3; i2c3 = &i2c4; + mmc0 = &mmc1; + mmc1 = &mmc2; + mmc2 = &mmc3; + mmc3 = &mmc4; + mmc4 = &mmc5; serial0 = &uart1; serial1 = &uart2; serial2 = &uart3; diff --git a/arch/arm/boot/dts/omap5.dtsi b/arch/arm/boot/dts/omap5.dtsi index 041646fabb2d..3b56e993326d 100644 --- a/arch/arm/boot/dts/omap5.dtsi +++ b/arch/arm/boot/dts/omap5.dtsi @@ -25,6 +25,11 @@ i2c2 = &i2c3; i2c3 = &i2c4; i2c4 = &i2c5; + mmc0 = &mmc1; + mmc1 = &mmc2; + mmc2 = &mmc3; + mmc3 = &mmc4; + mmc4 = &mmc5; serial0 = &uart1; serial1 = &uart2; serial2 = &uart3; -- 2.30.2