From patchwork Wed Jan 9 16:42:30 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: 1022526 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="QJvxOIlJ"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 43ZZk64Ymdz9sCs for ; Thu, 10 Jan 2019 03:45:18 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 52A16C21FF1; Wed, 9 Jan 2019 16:43:32 +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 739B5C21F84; Wed, 9 Jan 2019 16:42:52 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 9AD95C21FFB; Wed, 9 Jan 2019 16:42:48 +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 82656C21FFD for ; Wed, 9 Jan 2019 16:42:44 +0000 (UTC) Received: by mail-ed1-f66.google.com with SMTP id d39so7807525edb.12 for ; Wed, 09 Jan 2019 08:42:44 -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=QJvxOIlJH9Ec0+VtLX3XkwIRuJyWbWmgG6B4f7hV3DTQxQPCvZyRnMRRbcJfz3TUOO NYFLnVI7G6c7M58XmG2omOo5qGi0NOWi5szI8OjvWx3itXuJV5hGzk7rC7DvnhFjK+TZ tAujVcV7YtIdSTD0gfBqelCO5KM21uPV3BzMU= 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=e1vudhF2KApY1GvHtaDflpdiCwn9XZCW1phpYJRygRg5EfEyUSJLiM215fVycKQyEd eW+T/llWQmsvFXwu+3OuU1/zon81DYVKaDgwPle1ugMSZCfryJ0hJTQO0Y4+QLWxI/94 BPkpd9nYaqkZlJHYJxWeRbNa8ty+oQAniv8fpsZ05N+KsMRj7qZrj+X/i8VkzBdv8KIn 6iNfboAxwX31/5kYno2e0M20D3UvmN24z0ZmV0E2m2sNFiDYPRgS0moxlrdNXyPbkxgz 09VpYjCYv1smcdDQQJgSPrVfcHWK+/C4RCsGWxF5wZRvIvdhi+0uTmH7gARcN1GApPUu axiA== X-Gm-Message-State: AJcUukeVx6vHhZlvbCdyse8LI4TSLvSmbYBj7y1NteKZYFCWEzJgZwpQ mMspO6xsRRqXX1o64NXqdIt5fFH6p0U= X-Google-Smtp-Source: ALg8bN6yIbEnecm4u0mKHQPq2xp2jFfj/43cxhPegKbtZ/agxGuvip271ZEg39z7yfuXvUbHeoSwhQ== X-Received: by 2002:a17:906:4684:: with SMTP id a4-v6mr5916585ejr.24.1547052163887; Wed, 09 Jan 2019 08:42:43 -0800 (PST) Received: from event-horizon.net ([80.111.179.123]) by smtp.gmail.com with ESMTPSA id i24sm1081665edq.0.2019.01.09.08.42.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 09 Jan 2019 08:42:43 -0800 (PST) From: Bryan O'Donoghue To: u-boot@lists.denx.de Date: Wed, 9 Jan 2019 16:42:30 +0000 Message-Id: <20190109164233.22297-5-bryan.odonoghue@linaro.org> X-Mailer: git-send-email 2.20.0 In-Reply-To: <20190109164233.22297-1-bryan.odonoghue@linaro.org> References: <20190109164233.22297-1-bryan.odonoghue@linaro.org> MIME-Version: 1.0 Cc: fabio.estevam@nxp.com Subject: [U-Boot] [PATCH v2 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>;