From patchwork Wed Jan 9 16:47:31 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bryan O'Donoghue X-Patchwork-Id: 155088 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp918078jaa; Wed, 9 Jan 2019 08:51:48 -0800 (PST) X-Google-Smtp-Source: ALg8bN6VWCE+fPIlzh7D1xCFx8Xj6qT/kkO7GzixUB/Lvhvj8aSBDfxI0PUGbQ9bectYOTUEeX5A X-Received: by 2002:a05:6402:121a:: with SMTP id c26mr6466471edw.104.1547052708689; Wed, 09 Jan 2019 08:51:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1547052708; cv=none; d=google.com; s=arc-20160816; b=WhtwWRph/Vqiz/CaHOTREImYJZfgrxIW0VZsP2Wt9u2St6YNDWA+5AMFbBMVYR0P9H MAVojcGCNuhBgul0jYDq0rJpP8Vj9UNYiAcLEyeTEKyYj64eByie2a2xldslQP7Sq52C Ygz3IxNaSlhheab7Y5+e5+TiL4oXuIl/ss8dUoCyDKqpHtg4rbqSsm6RfpKhaX8vvtLS nGW3AxahUyWdFHM3sIUaaxqJZM8HczB9P1MqwIvLK/TpFGucF6N+S3FBvH+JQx/r2dGl MsTI5Db/54F5PMPbc84G5PB6ONx5Q3FF0eGz0ccCLqCeTMHeBEmiJiGgH2NOK+hBOPOE 3z1A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :cc:mime-version:references:in-reply-to:message-id:date:to:from :dkim-signature; bh=WPYX5bXWvai1PH5uLeACPIPpu37Ss/CZh4PVJ1qAieo=; b=hSeSJJLnBfxfcXEty9J9ANh7RGJPA310LUcAuYsnh5ejLm225sNxtxcl/sXKmCkLcQ 7ROaCJIq9E1XlxxQJbaDGIJhQVy65L+VB5Gcttg/JwSp2vKl84W7rRZk9jBp/UZhbzjN S7YIEES4fXS+G8wD0NhMunBiqAJUjqVd0ttBVODIExWuDIfBflYv5UV3Fui7tpY97uGV rgynjm0QWyP7pmSdwNUSuPAyUXkt2gdgxoqtSOS829vZJgRAbb94T9Kjks5zg2bwHgxS VieTKItZS/HyfURGVyO/cRABL/OYDQ/cUO2mjaSN0oVORgkV+Tq/591XsnooMdiTGszj gIMw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=ETrpYLrT; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.denx.de (dione.denx.de. [81.169.180.215]) by mx.google.com with ESMTP id d8-v6si1517657ejp.161.2019.01.09.08.51.48; Wed, 09 Jan 2019 08:51:48 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) client-ip=81.169.180.215; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=ETrpYLrT; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: by lists.denx.de (Postfix, from userid 105) id 344E0C22016; Wed, 9 Jan 2019 16:49:15 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 9F656C22003; Wed, 9 Jan 2019 16:48:07 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id F3621C2200C; Wed, 9 Jan 2019 16:47:52 +0000 (UTC) Received: from mail-ed1-f66.google.com (mail-ed1-f66.google.com [209.85.208.66]) by lists.denx.de (Postfix) with ESMTPS id ECBD1C22009 for ; Wed, 9 Jan 2019 16:47:48 +0000 (UTC) Received: by mail-ed1-f66.google.com with SMTP id b3so7918292ede.1 for ; Wed, 09 Jan 2019 08:47:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=dCRxIInhwBfp2i0pZ4FyA6NyHfcFkbJmBIY0VgiPRQI=; b=ETrpYLrTdJ8MvNTm/YWIrAHa4TqsaFfsm7hajWERneCUaNwN0709BNoAkQb12nJT/c gwDQITBLjjhAGnqoT8XnRtxeeTJZlUBJnr1/iyVpebRxYFZBMiqG+wGSuaHfBNi7lOES skDbrwsi1RsF6pxjjrSc1x8FSny6wcq/4l28U= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=dCRxIInhwBfp2i0pZ4FyA6NyHfcFkbJmBIY0VgiPRQI=; b=ic3K02qSNLjk3k7VxS7n9Bpw8D7ZtmgbbMNAgep66C0j34YzSpMG8Dktgeyiqj2jiw 0pOJwVeOfm8ohCxetWbIyokh0sAXmWjtu3o0Mo7J3jQmRBEGdr3j3NjPRJpLHoYmok1C 93DVsqr7t+1qZvdF3xV/Y5resSoNsNDZa8B5vgzLEhZw0W4hhQohwjmHze98YjdvI6Do JBH2iLhs9NEGJpJr9T6Y2V6tZaJjk9VPDJOWqrnNkReqLRemrlS2TkejfAOvpaPjbCSi VkF0hyqgvKRvS7IPhRPDut5rmOgIVBrGO/wcZ66qdZ3nIv2xz2DXHpgf248TjbFbz/Wt hE1A== X-Gm-Message-State: AJcUukcvyOh3sEa6ZTE5XXzTg5tvcR7IjMd7iaxDOlew8163opMBCKKL 1p7bW2pVewAPCQRYTz2unYCFjRmcp3s= X-Received: by 2002:a17:906:6298:: with SMTP id t24-v6mr6079252ejk.58.1547052468241; Wed, 09 Jan 2019 08:47:48 -0800 (PST) Received: from event-horizon.net ([80.111.179.123]) by smtp.gmail.com with ESMTPSA id b14sm1081499edt.6.2019.01.09.08.47.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 09 Jan 2019 08:47:47 -0800 (PST) From: Bryan O'Donoghue To: u-boot@lists.denx.de Date: Wed, 9 Jan 2019 16:47:31 +0000 Message-Id: <20190109164734.22598-6-bryan.odonoghue@linaro.org> X-Mailer: git-send-email 2.20.0 In-Reply-To: <20190109164734.22598-1-bryan.odonoghue@linaro.org> References: <20190109164734.22598-1-bryan.odonoghue@linaro.org> MIME-Version: 1.0 Cc: fabio.estevam@nxp.com Subject: [U-Boot] [PATCH v3 5/8] arm: dts: imx7s-warp: Create alias for mmc0 to &usdhc3 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" This patch sets up an alias for mmc0 to usdhc3. Before the DM conversion only usdhc3 was enabled and therefore it appeared as MMC 0 to u-boot. After enabling MMC DM though usdhc3 defaults to MMC 2, which left unattended would drive changes to existing warp7 bootscripts and environment variables that rely on mmc 0. Setup the alias of mmc0 and usdhc3 so that existing warp7 boot code will work unmodified. Signed-off-by: Bryan O'Donoghue Cc: Albert Aribaud Cc: Peng Fan Cc: Fabio Estevam Cc: Stefano Babic --- arch/arm/dts/imx7s-warp.dts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/arm/dts/imx7s-warp.dts b/arch/arm/dts/imx7s-warp.dts index f7ba2c0a24..d28b7ec715 100644 --- a/arch/arm/dts/imx7s-warp.dts +++ b/arch/arm/dts/imx7s-warp.dts @@ -17,6 +17,10 @@ reg = <0x80000000 0x20000000>; }; + aliases { + mmc0 = &usdhc3; + }; + gpio-keys { compatible = "gpio-keys"; pinctrl-0 = <&pinctrl_gpio>;