From patchwork Thu Mar 12 18:51:12 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Opaniuk X-Patchwork-Id: 11435243 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 30330161F for ; Thu, 12 Mar 2020 18:51:31 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0A54720663 for ; Thu, 12 Mar 2020 18:51:31 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="Tm2Y5G/J"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="EEShK/bK" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0A54720663 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Owner; bh=QZaLzNLlSBRjlPjblN7FgzV2njxWhB3046Uc/yeQcwM=; b=Tm2 Y5G/J/lDpwCoPYqQdLrf4omSdmWQ97KNo28SsI3qZz9VnVcoB3YGnulpSLhornnx2KMXkZGthR60M HC6o/GVy/dftXQK26DRyKfOFEMnLsvyUYg2aI8MNPHmXWtiT2y8ioz+ksC9l7DSEhXa5v5ddCLevN B5nxTTHe4bY+F2mZL+QvdDxINO3cUKGArjbJb1lCoZRnEBuyjsOHZ+DkMPGSbhMQqLDXIFVxVImaO MIXCTNMySORyDhtqm8HOdJ25ZMr8zINOFyQ6aMyLuAVHXNGFbohpUXcSDLoNoROji0VI0nbht6bEh QNRwiMiH1uR/EIPltxltXDDpcoyQo/Q==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jCSvY-0001Nj-Bg; Thu, 12 Mar 2020 18:51:28 +0000 Received: from mail-lj1-x244.google.com ([2a00:1450:4864:20::244]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jCSvV-0001Mm-5b for linux-arm-kernel@lists.infradead.org; Thu, 12 Mar 2020 18:51:26 +0000 Received: by mail-lj1-x244.google.com with SMTP id f13so7741979ljp.0 for ; Thu, 12 Mar 2020 11:51:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=Ze2fZQQej6uS2QviuuQ6/4nfx3KKsQROZMmrRSSZ7Mo=; b=EEShK/bKtI55I9LpTF1bBN1AfvV7vWXpcSNMyezqvBtUrUAQbz9+etSPkvA0ll731G MWA8GaJxGpzwU33ajgRj1ABtyI/g2qCYSCco8vioGY9Wzm6wxf0Em0LEQL5AhtlWnpHU chwA/VcJOPyquLt92S/PHV8pkpxUaiiIUS4Bh2WDtCjfWK8/69OXgFeMJhWAUSkoSRMG lbJ51oFFr7eF7SCJU+JmYGetDL/txgNVEaqWy5gzObRlWbjk/KGjJ1pq16FdCuCJTEY6 ol2bn43X0JNpxTwVLyqwhSsjaK+htEzcAqlbpUlRWdYUF2j3fhex/jH8UY5EU9c5RjA6 +QUQ== 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; bh=Ze2fZQQej6uS2QviuuQ6/4nfx3KKsQROZMmrRSSZ7Mo=; b=KQWJEUtgADsSf8dW6vY280/Zda4G51dXB13Bax3x1EwLmN6gbAsNskN5YvtiaC3Q9n sXxE2BB3XYSV1d16ErylW5Jjrli2VWOREk+cu7LulS5qmk0LpgX8vbaPdLEJFivBbI+O TAbGYagETNZ9EqhavNVSybcFJ9AGaZ7zZlQowz/VdA5Lshe+EMU/15ajF/LmiN6f1XWc 4jmEYbK7KP+keXOCW4nqkzAFHctjD12tnOOrPBNMIxrl3m+dhn5nAHE5/ZARe4iEKrTm OQl3Kk4ll62N6hGBB8IEIl5pzouJso733Cxq/Uk2WzHpmvLx14aPYjP/VdJ3PPLxXHcQ uwnA== X-Gm-Message-State: ANhLgQ3EvF/dAcu1sCPVDzXjCLG5msn3A9OsWMTF4bTcxB+WS7RMVT2v lFFOV+b5uru2pvpAxSdufvdsX9S/kJo= X-Google-Smtp-Source: ADFU+vtMh2OSYemJX/GMyXuvSTeqDPtfVEegzoT9okAtinRs2tH/jk/rK7jfGUyqFYMckzNwIBcatw== X-Received: by 2002:a2e:9bc8:: with SMTP id w8mr5794248ljj.227.1584039082702; Thu, 12 Mar 2020 11:51:22 -0700 (PDT) Received: from localhost (host-176-37-176-139.la.net.ua. [176.37.176.139]) by smtp.gmail.com with ESMTPSA id w14sm13143879lfq.69.2020.03.12.11.51.21 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 12 Mar 2020 11:51:21 -0700 (PDT) From: Igor Opaniuk To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v4 1/2] dt-bindings: arm: fsl: add nxp based toradex colibri bindings Date: Thu, 12 Mar 2020 20:51:12 +0200 Message-Id: <20200312185113.2504-1-igor.opaniuk@gmail.com> X-Mailer: git-send-email 2.17.1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200312_115125_208062_0BC32DFC X-CRM114-Status: UNSURE ( 9.47 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.3 on bombadil.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:244 listed in] [list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [igor.opaniuk[at]gmail.com] -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , devicetree@vger.kernel.org, Igor Opaniuk , Robert Jones , Rob Herring , Anson Huang , Marcel Ziswiler , linux-kernel@vger.kernel.org, Stefan Agner , Oleksandr Suvorov , Philippe Schenker , Andreas Kemnade , Max Krummenacher , Manivannan Sadhasivam , Andrey Smirnov , Shawn Guo MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org From: Igor Opaniuk Document Colibri iMX6S/DL V1.1x re-design devicetree binding. Signed-off-by: Igor Opaniuk --- Documentation/devicetree/bindings/arm/fsl.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Documentation/devicetree/bindings/arm/fsl.yaml b/Documentation/devicetree/bindings/arm/fsl.yaml index 0e17e1f6fb80..7342097056c3 100644 --- a/Documentation/devicetree/bindings/arm/fsl.yaml +++ b/Documentation/devicetree/bindings/arm/fsl.yaml @@ -169,7 +169,9 @@ properties: - technologic,imx6dl-ts4900 - technologic,imx6dl-ts7970 - toradex,colibri_imx6dl # Colibri iMX6 Module + - toradex,colibri_imx6dl-v1_1 # Colibri iMX6 Module V1.1 - toradex,colibri_imx6dl-eval-v3 # Colibri iMX6 Module on Colibri Evaluation Board V3 + - toradex,colibri_imx6dl-v1_1-eval-v3 # Colibri iMX6 Module V1.1 on Colibri Evaluation Board V3 - ysoft,imx6dl-yapp4-draco # i.MX6 DualLite Y Soft IOTA Draco board - ysoft,imx6dl-yapp4-hydra # i.MX6 DualLite Y Soft IOTA Hydra board - ysoft,imx6dl-yapp4-ursa # i.MX6 Solo Y Soft IOTA Ursa board From patchwork Thu Mar 12 18:51:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Opaniuk X-Patchwork-Id: 11435245 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 551AB92A for ; Thu, 12 Mar 2020 18:51:42 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 33098206FA for ; Thu, 12 Mar 2020 18:51:42 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="rffxn3xL"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="aJ4LcDQX" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 33098206FA Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=mf/VcLCbv8bIpRdstvW7N55fy3ulM7/gmDOUOwT9mHs=; b=rffxn3xLRQ4lvqw43dLnV4clsP ixZbmjnccSeHiKBpdZ5AaGxB1sj1yeTvcsH3MO787STb8qyWeqvDYPJ3G/mL2e0KnCypFo7pCyq9F SZlxVPxkOsZ7/NKSsXI1TDrLV0SgYjKtPNEVQsiv1b6QiV1yz6JeG84jR1sPHaAP9Aeg0kW46crJ7 8/BLcaOLnSCqUz/6Rddd3dQs4TPc4wE2MKA0qR1clcLhxylpUv+rZrwFwbriZHOHLR+tT96an/8/a HhO6b/ECRef9Eg7u7UkFA0X5drm+e4AM3HUFNyCb8P7u397dLS60UY5rBnnGbkIAKbEv/JnE/3SKF a5FOFqlA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jCSvg-0001Wg-FX; Thu, 12 Mar 2020 18:51:36 +0000 Received: from mail-lj1-x242.google.com ([2a00:1450:4864:20::242]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jCSvW-0001My-9w for linux-arm-kernel@lists.infradead.org; Thu, 12 Mar 2020 18:51:27 +0000 Received: by mail-lj1-x242.google.com with SMTP id e18so7701655ljn.12 for ; Thu, 12 Mar 2020 11:51:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=13R22XMmnPBFa+XmLMhxZD9IQtiRWvB+ZAw8frnViw0=; b=aJ4LcDQXRf5MxDhImbvLsLuy+sb0rdgQyk162IKS9yk4AXXr0WsxVekRzqN5/8tfYv vGaMMMgNlcoYshhJLimAUKBTy+EbL31KxKkM/qYDzwGuhC+75w7NPT+FM398fchnJSqm KCah2EGT57BhFPHWAskt2OlJBayaYwy5zW4pUikp5yzE6j4N70ommkMHvckWWL4NVs0N ACIHuVVhNxeFB93tFiLCGK6DRjYTrqaD/4WurbmcOudsXggvZrFkCEVVliukSHhWFZna r+fqwuw7ubQ3brPRFf+72lAWEG+5Hj98yqT3w8H6vG2Uq8p0OG88P0F7lpKnkPKr9zPS BcKA== 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; bh=13R22XMmnPBFa+XmLMhxZD9IQtiRWvB+ZAw8frnViw0=; b=GOxYzjKzOYlkRhbETsHeDb3vNgutNtFF2iTfYHaCJqYbg4IZ3/819YYBq8J4p2puud NBwLDWjuUmKCpqdbIoMHiEDzPB0sviorBVwyQKM6m77tZsKj/zF27dYNYZL0B0Zu05GL SJTVogl9lL9k1jCTCU944YY0g66Nj7PZJX2lhLJCaB1Tf4Aco0J0d66OZwYq4QGvKUtH gwQKQZ/UGd07S3kV8/vz8VoyztbbHth1jg9jVkvTiV1PqYyIgY2bWHb2GBQoyLYk9CW+ VJJ6Rk8r4QJniAC+rxjKdRqN+aVpMaSzaiSzB5yEro/UzacpcE39ER/rAVd1OMkUD5Ii HYew== X-Gm-Message-State: ANhLgQ3E07rOVt1Omiqi5zjjgXBlqiOhO1h7VExbxLR1jLJVln/MCeZF 8OmWnzyuFEDBBE8ndr7PzWO//Aj7Jzg= X-Google-Smtp-Source: ADFU+vvJDdtdslvLrUQYWZOsOPYcn6i7Mb55d50MfAnEAC8qjdT0/2mBVDsAMNmUYQN7OvDpHCg2QQ== X-Received: by 2002:a05:651c:1bb:: with SMTP id c27mr5813851ljn.5.1584039084278; Thu, 12 Mar 2020 11:51:24 -0700 (PDT) Received: from localhost (host-176-37-176-139.la.net.ua. [176.37.176.139]) by smtp.gmail.com with ESMTPSA id h6sm5281346lji.39.2020.03.12.11.51.23 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 12 Mar 2020 11:51:23 -0700 (PDT) From: Igor Opaniuk To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v4 2/2] ARM: dts: colibri: introduce dts with UHS-I support enabled Date: Thu, 12 Mar 2020 20:51:13 +0200 Message-Id: <20200312185113.2504-2-igor.opaniuk@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200312185113.2504-1-igor.opaniuk@gmail.com> References: <20200312185113.2504-1-igor.opaniuk@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200312_115126_343268_2C3C183D X-CRM114-Status: GOOD ( 17.27 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.3 on bombadil.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:242 listed in] [list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [igor.opaniuk[at]gmail.com] -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , devicetree@vger.kernel.org, Igor Opaniuk , Pengutronix Kernel Team , Marcel Ziswiler , Fabio Estevam , Sascha Hauer , linux-kernel@vger.kernel.org, Stefan Agner , Oleksandr Suvorov , Philippe Schenker , Rob Herring , NXP Linux Team , Max Krummenacher , Shawn Guo MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org From: Igor Opaniuk Introduce DTS for Colibri iMX6S/DL V1.1x re-design, where UHS-I support was added. Provide proper configuration for VGEN3, which allows that rail to be automatically switched to 1.8 volts for proper UHS-I operation mode. Signed-off-by: Igor Opaniuk --- v4: - Document Colibri iMX6S/DL V1.1x re-design devicetree binding [Shawn Guo] - wakeup-source property fix [Shawn Guo] v3: - change hierarchy according to Marco's suggestions [Marco Felsch] - adjust compatible string adding v1.1 [Stefan Agner] v2: - rework hierarchy of dts files, and a separate dtsi for Colibri iMX6S/DL V1.1x re-design, where UHS-I was added [Marcel Ziswiler] - add comments about vgen3 power rail [Marcel Ziswiler] - fix other minor issues, addressing Marcel's comments. [Marcel Ziswiler] arch/arm/boot/dts/Makefile | 1 + .../boot/dts/imx6dl-colibri-v1_1-eval-v3.dts | 59 +++++++++++++++++++ arch/arm/boot/dts/imx6qdl-colibri.dtsi | 11 +++- 3 files changed, 70 insertions(+), 1 deletion(-) create mode 100644 arch/arm/boot/dts/imx6dl-colibri-v1_1-eval-v3.dts diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index d6546d2676b9..97da51be1de6 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -412,6 +412,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \ imx6dl-aristainetos2_4.dtb \ imx6dl-aristainetos2_7.dtb \ imx6dl-colibri-eval-v3.dtb \ + imx6dl-colibri-v1_1-eval-v3.dtb \ imx6dl-cubox-i.dtb \ imx6dl-cubox-i-emmc-som-v15.dtb \ imx6dl-cubox-i-som-v15.dtb \ diff --git a/arch/arm/boot/dts/imx6dl-colibri-v1_1-eval-v3.dts b/arch/arm/boot/dts/imx6dl-colibri-v1_1-eval-v3.dts new file mode 100644 index 000000000000..fced7d99f5d5 --- /dev/null +++ b/arch/arm/boot/dts/imx6dl-colibri-v1_1-eval-v3.dts @@ -0,0 +1,59 @@ +// SPDX-License-Identifier: GPL-2.0 OR X11 +/* + * Copyright 2019 Toradex AG + */ + +/dts-v1/; + +#include "imx6dl-colibri-eval-v3.dts" + +/ { + model = "Toradex Colibri iMX6DL/S V1.1 on Colibri Evaluation Board V3"; + compatible = "toradex,colibri_imx6dl-v1_1-eval-v3", + "toradex,colibri_imx6dl-v1_1", + "toradex,colibri_imx6dl-eval-v3", + "toradex,colibri_imx6dl", + "fsl,imx6dl"; +}; + +&iomuxc { + pinctrl_usdhc1_100mhz: usdhc1grp100mhz { + fsl,pins = < + MX6QDL_PAD_SD1_CMD__SD1_CMD 0x170b1 + MX6QDL_PAD_SD1_CLK__SD1_CLK 0x100b1 + MX6QDL_PAD_SD1_DAT0__SD1_DATA0 0x170b1 + MX6QDL_PAD_SD1_DAT1__SD1_DATA1 0x170b1 + MX6QDL_PAD_SD1_DAT2__SD1_DATA2 0x170b1 + MX6QDL_PAD_SD1_DAT3__SD1_DATA3 0x170b1 + >; + }; + + pinctrl_usdhc1_200mhz: usdhc1grp200mhz { + fsl,pins = < + MX6QDL_PAD_SD1_CMD__SD1_CMD 0x170f1 + MX6QDL_PAD_SD1_CLK__SD1_CLK 0x100f1 + MX6QDL_PAD_SD1_DAT0__SD1_DATA0 0x170f1 + MX6QDL_PAD_SD1_DAT1__SD1_DATA1 0x170f1 + MX6QDL_PAD_SD1_DAT2__SD1_DATA2 0x170f1 + MX6QDL_PAD_SD1_DAT3__SD1_DATA3 0x170f1 + >; + }; +}; + +/* Colibri MMC */ +&usdhc1 { + pinctrl-names = "default", "state_100mhz", "state_200mhz"; + pinctrl-0 = <&pinctrl_usdhc1 &pinctrl_mmc_cd>; + pinctrl-1 = <&pinctrl_usdhc1_100mhz &pinctrl_mmc_cd>; + pinctrl-2 = <&pinctrl_usdhc1_200mhz &pinctrl_mmc_cd>; + vmmc-supply = <®_module_3v3>; + vqmmc-supply = <&vgen3_reg>; + wakeup-source; + keep-power-in-suspend; + sd-uhs-sdr12; + sd-uhs-sdr25; + sd-uhs-sdr50; + sd-uhs-sdr104; + status = "okay"; + /delete-property/no-1-8-v; +}; diff --git a/arch/arm/boot/dts/imx6qdl-colibri.dtsi b/arch/arm/boot/dts/imx6qdl-colibri.dtsi index d03dff23863d..e85a41e84fd4 100644 --- a/arch/arm/boot/dts/imx6qdl-colibri.dtsi +++ b/arch/arm/boot/dts/imx6qdl-colibri.dtsi @@ -229,7 +229,16 @@ regulator-always-on; }; - /* vgen3: unused */ + /* + * +V3.3_1.8_SD1 coming off VGEN3 and supplying + * the i.MX 6 NVCC_SD1. + */ + vgen3_reg: vgen3 { + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <3300000>; + regulator-boot-on; + regulator-always-on; + }; vgen4_reg: vgen4 { regulator-min-microvolt = <1800000>;