From patchwork Thu Jan 3 01:44:40 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: 1020154 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="Cv4I+loG"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 43VW7R64ljz9rxp for ; Thu, 3 Jan 2019 12:49:39 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 60B21C21DD9; Thu, 3 Jan 2019 01:46:55 +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 5523CC21DFD; Thu, 3 Jan 2019 01:45:17 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id CFAA3C21D83; Thu, 3 Jan 2019 01:45:03 +0000 (UTC) Received: from mail-ed1-f67.google.com (mail-ed1-f67.google.com [209.85.208.67]) by lists.denx.de (Postfix) with ESMTPS id 5EDDFC21DDC for ; Thu, 3 Jan 2019 01:44:59 +0000 (UTC) Received: by mail-ed1-f67.google.com with SMTP id f23so27728151edb.3 for ; Wed, 02 Jan 2019 17:44:59 -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=Q6hReD4+xmO+s5j76+aZGyiVF7MH/a2Iax6DZun1aCY=; b=Cv4I+loGGUHlyeM+WTp84clImd1yvOcXQF5PKBuqUVGlOwMMBiS1/WK43y/sfrpekm vV68fmkzzKvGYQiJL9gLkrYHDnUAs6UvYLjXMYaLSaz5mES3JODoh38t0wmGuy3xjQvK Grzt/tIyrBHkSxEhMeKtw0fu8c8U79Og9d6Jg= 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=Q6hReD4+xmO+s5j76+aZGyiVF7MH/a2Iax6DZun1aCY=; b=XbapOWgX2BXNIG04KRBDaevXPAA7kTvl05WxOE4LHzTWUOU2diKUsP1+m9mGvQem/v ykGazsSaci4+RxLALWgZQ3dNW9/YcBgmf44gFZZVXKhSygVptMBW0TIwf+w8P/GfqtVQ 7ldk9/LY2dAH75mKY4wiEtK8G3nh3zcyxTtH4Kz6l2mtF6AJ7uJEe+0MI7ypTaZJ1t1K Ljved96A+uNXZ2uEuomTOJEhJI6x0L0LXs3btKiIEI7MjYPQfwyNI5oduwqhiw+JGMaE 9CLHb3gthozJDCk/Dn+kKjSYjv2dBfDOc9BYyqqbHuWsUC2Xx2F0tjbnbdJMnVmsDH7G SDHA== X-Gm-Message-State: AA+aEWaORO7t1Fdy8Q9Aaee34j7iKw5qn2t93jOQAS0+NzDNTm6JZL4n n88F9bIz98tvGyEM6Ia6qrj/RYzB35Z9BQ== X-Google-Smtp-Source: AFSGD/U/Rd5T+Y6NcZV5YGLIB664OAgUQGx139kDMATaPDd678SrcJaBnKib1DVkx2ibVwSB9cZG4Q== X-Received: by 2002:a50:b32f:: with SMTP id q44mr41087897edd.70.1546479898796; Wed, 02 Jan 2019 17:44:58 -0800 (PST) Received: from localhost.localdomain (D4CCACC7.cm-2.dynamic.ziggo.nl. [212.204.172.199]) by smtp.gmail.com with ESMTPSA id g5-v6sm13036720ejm.15.2019.01.02.17.44.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 02 Jan 2019 17:44:58 -0800 (PST) From: Bryan O'Donoghue To: u-boot@lists.denx.de Date: Thu, 3 Jan 2019 01:44:40 +0000 Message-Id: <20190103014444.11134-5-bryan.odonoghue@linaro.org> X-Mailer: git-send-email 2.20.0 In-Reply-To: <20190103014444.11134-1-bryan.odonoghue@linaro.org> References: <20190103014444.11134-1-bryan.odonoghue@linaro.org> MIME-Version: 1.0 Cc: fabio.estevam@nxp.com Subject: [U-Boot] [PATCH 4/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 615ed7ed80..279f02ecef 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>;