From patchwork Fri Jan 18 17:40:11 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: 1027679 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="FZvtAU0P"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 43h7ch22HXz9sDn for ; Sat, 19 Jan 2019 04:44:52 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 02E0BC21C6A; Fri, 18 Jan 2019 17:42:45 +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 D7510C2212F; Fri, 18 Jan 2019 17:40:43 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 1D101C21DCA; Fri, 18 Jan 2019 17:40:27 +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 6B704C2213D for ; Fri, 18 Jan 2019 17:40:24 +0000 (UTC) Received: by mail-ed1-f67.google.com with SMTP id f9so11745540eds.10 for ; Fri, 18 Jan 2019 09:40:24 -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=FZvtAU0P7dk/V5yhIYfjE5Dog3RNhwREpP0nXTWMdZlPLIpgMntJbBRWBowNVrzyLp DXHKn3pXDvCqwtD2s9/ObyCfm+oES6hf1oU6vB5Gc3HyTmH7xVTFS/fE2VwSF+ay7Rbs UritsEb4IrzqIkvFD2yxWsxHXFcPlyKquxaK4= 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=bgMw2I9chGeoXv8269zTogEqL68EvVAXwIL91yPm+5u0OZ50MntXaS7T2JT6i52ct0 PxtcjaBVvQIAqKH2kPyWJHjQCnn7tyil669CgjAceRH6B8JNa6G2Jr/0Bunyl/Wsk0WI MtiIEWrwDffKGQlp/H+kHwPd9jk7/H83QYXerQNXsdDEhWkhTha5nurU6STwwmjnVrhZ Bv39E+RAmbY+CVBZdfO3SwsL1y7yo3SZ8vFAaNvTpA3DUDivYYIpYcI+gc+rBp4JCG2M ZPNQs0e39AYUWhX6aIM9ACzqPeo0w4kK1zMwa5AlowEa3itKQt0XxRdhQuMY6xS62KT2 a+LQ== X-Gm-Message-State: AJcUukfht8N0FJurhDcqAUmAMkJjwSfnD9BFRLE8fpQD2rqIxb9sR7dG yUTAdf5mTCmDAbLKSbWs2XvgyzG5F+c= X-Google-Smtp-Source: ALg8bN4wrSJZ/QPvnFeu9awz2hmmFiykJhJl12UOcUWT1cZZ8P4NDdC6wXMaiQQcw8smpwWpJMiUPw== X-Received: by 2002:a50:ec19:: with SMTP id g25mr16452720edr.38.1547833223694; Fri, 18 Jan 2019 09:40:23 -0800 (PST) Received: from event-horizon.net ([80.111.179.123]) by smtp.gmail.com with ESMTPSA id l20-v6sm4026339eja.18.2019.01.18.09.40.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 18 Jan 2019 09:40:23 -0800 (PST) From: Bryan O'Donoghue To: u-boot@lists.denx.de Date: Fri, 18 Jan 2019 17:40:11 +0000 Message-Id: <20190118174014.17860-6-bryan.odonoghue@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190118174014.17860-1-bryan.odonoghue@linaro.org> References: <20190118174014.17860-1-bryan.odonoghue@linaro.org> MIME-Version: 1.0 Cc: fabio.estevam@nxp.com Subject: [U-Boot] [RESEND] [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>;