From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.6 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D806BC47404 for ; Sun, 6 Oct 2019 01:16:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AF4A2222CC for ; Sun, 6 Oct 2019 01:16:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1570324590; bh=w0gsQYTE+55d9vtKjjYnHHUWNASN6/OWINizJtI09iU=; h=Date:From:To:Cc:Subject:References:In-Reply-To:List-ID:From; b=nndeLFLkUzaCZotitRr6RVK88dcHXST+jcy6cAlC9mYBu9CWiyjITkwvse83qEsy7 8Xl9mbbSGzSyPL+jwT0+dm7p5QBMieeVnDwp1IsgCiNPZR4xPSTvQiDNpKEiOgh/4F Xr21BlEYveK/ZZOkPx0ABngBthfmB+I/WbE7yrWE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727033AbfJFBQa (ORCPT ); Sat, 5 Oct 2019 21:16:30 -0400 Received: from mail.kernel.org ([198.145.29.99]:51324 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726956AbfJFBQ3 (ORCPT ); Sat, 5 Oct 2019 21:16:29 -0400 Received: from dragon (li937-157.members.linode.com [45.56.119.157]) (using TLSv1.2 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 0727520830; Sun, 6 Oct 2019 01:16:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1570324588; bh=w0gsQYTE+55d9vtKjjYnHHUWNASN6/OWINizJtI09iU=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=PDkNZQlcXFBb5qvCQBbRFAHYMac8LSF0zGVELXPn6eQxWNsoiTNniFSq9qrMeqXhr hYuO8UNew35VxJNJp4OZX4Q95BNp7e3zXX+vMzCRraAiJ0axeiHQNDM1TvGfzQpLlX keAwA6eTwRe2xMbrHaqXYmUyvcHl+cegBlZWWeNg= Date: Sun, 6 Oct 2019 09:16:11 +0800 From: Shawn Guo To: Igor Opaniuk Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, m.felsch@pengutronix.de, robh+dt@kernel.org, mark.rutland@arm.com, s.hauer@pengutronix.de, kernel@pengutronix.de, festevam@gmail.com, linux-imx@nxp.com, marcel@ziswiler.com, marcel.ziswiler@toradex.com, stefan@agner.ch Subject: Re: [PATCH v3 1/1] ARM: dts: colibri: introduce dts with UHS-I support enabled Message-ID: <20191006011610.GH7150@dragon> References: <20190904110918.25009-1-igor.opaniuk@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20190904110918.25009-1-igor.opaniuk@gmail.com> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Sep 04, 2019 at 02:09:18PM +0300, Igor Opaniuk wrote: > 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 > --- > > 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 9159fa2cea90..87dfc3db4343 100644 > --- a/arch/arm/boot/dts/Makefile > +++ b/arch/arm/boot/dts/Makefile > @@ -401,6 +401,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..92fcf4e62ba2 > --- /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", Please make sure these compatibles are documented. > + "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>; > + enable-sdio-wakeup; Check out Documentation/devicetree/bindings/power/wakeup-source.txt Shawn > + 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 1beac22266ed..27097ab5eaab 100644 > --- a/arch/arm/boot/dts/imx6qdl-colibri.dtsi > +++ b/arch/arm/boot/dts/imx6qdl-colibri.dtsi > @@ -215,7 +215,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>; > -- > 2.17.1 > From mboxrd@z Thu Jan 1 00:00:00 1970 From: Shawn Guo Subject: Re: [PATCH v3 1/1] ARM: dts: colibri: introduce dts with UHS-I support enabled Date: Sun, 6 Oct 2019 09:16:11 +0800 Message-ID: <20191006011610.GH7150@dragon> References: <20190904110918.25009-1-igor.opaniuk@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Content-Disposition: inline In-Reply-To: <20190904110918.25009-1-igor.opaniuk@gmail.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=m.gmane.org@lists.infradead.org To: Igor Opaniuk Cc: mark.rutland@arm.com, devicetree@vger.kernel.org, marcel.ziswiler@toradex.com, s.hauer@pengutronix.de, linux-kernel@vger.kernel.org, stefan@agner.ch, m.felsch@pengutronix.de, robh+dt@kernel.org, linux-imx@nxp.com, kernel@pengutronix.de, festevam@gmail.com, linux-arm-kernel@lists.infradead.org, marcel@ziswiler.com List-Id: devicetree@vger.kernel.org On Wed, Sep 04, 2019 at 02:09:18PM +0300, Igor Opaniuk wrote: > 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 > --- > > 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 9159fa2cea90..87dfc3db4343 100644 > --- a/arch/arm/boot/dts/Makefile > +++ b/arch/arm/boot/dts/Makefile > @@ -401,6 +401,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..92fcf4e62ba2 > --- /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", Please make sure these compatibles are documented. > + "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>; > + enable-sdio-wakeup; Check out Documentation/devicetree/bindings/power/wakeup-source.txt Shawn > + 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 1beac22266ed..27097ab5eaab 100644 > --- a/arch/arm/boot/dts/imx6qdl-colibri.dtsi > +++ b/arch/arm/boot/dts/imx6qdl-colibri.dtsi > @@ -215,7 +215,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>; > -- > 2.17.1 > From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.5 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE, SPF_PASS,USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 985FCC47404 for ; Sun, 6 Oct 2019 01:16:32 +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 6D0CD222C8 for ; Sun, 6 Oct 2019 01:16:32 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="lnBU4e6C"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="PDkNZQlc" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6D0CD222C8 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.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:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=hQX9vZOD6oBYT8riXSU8HidcmRYASMaoUJGNQgmem5U=; b=lnBU4e6ChCEXqo B8HhDqkn2JUzTABgpHdFJFXPQs6I9wBb3r2cWR6KzoaiSLQfFzCpb6lqp27TKrIVecUAY7d6ggSJa X/WMOKa47yCGguXPct9SqS6KmqhEj+HzXNI9jA3cQnV2pR+yMLTJGh0r8FiiqfUjd6V5Ew51IzHfp r28T0GHQ/OFVUj8e964tsPfVGoKYIp/DB42cDJKeF1Jsijq5r5n6hhCO2GyPtR/spfKZGURC4hvL5 Gi1iThsIjBvYi2SsOIF0GTbptEJ+YLz79jWA1HfDLyuSUxul2+TG0T0xIhBJcwzUB5jNFaTqWrhB/ EiwXh++oiZ9pCNd3cFGg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.2 #3 (Red Hat Linux)) id 1iGv9z-0006PL-D3; Sun, 06 Oct 2019 01:16:31 +0000 Received: from mail.kernel.org ([198.145.29.99]) by bombadil.infradead.org with esmtps (Exim 4.92.2 #3 (Red Hat Linux)) id 1iGv9w-0006P2-Mn for linux-arm-kernel@lists.infradead.org; Sun, 06 Oct 2019 01:16:30 +0000 Received: from dragon (li937-157.members.linode.com [45.56.119.157]) (using TLSv1.2 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 0727520830; Sun, 6 Oct 2019 01:16:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1570324588; bh=w0gsQYTE+55d9vtKjjYnHHUWNASN6/OWINizJtI09iU=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=PDkNZQlcXFBb5qvCQBbRFAHYMac8LSF0zGVELXPn6eQxWNsoiTNniFSq9qrMeqXhr hYuO8UNew35VxJNJp4OZX4Q95BNp7e3zXX+vMzCRraAiJ0axeiHQNDM1TvGfzQpLlX keAwA6eTwRe2xMbrHaqXYmUyvcHl+cegBlZWWeNg= Date: Sun, 6 Oct 2019 09:16:11 +0800 From: Shawn Guo To: Igor Opaniuk Subject: Re: [PATCH v3 1/1] ARM: dts: colibri: introduce dts with UHS-I support enabled Message-ID: <20191006011610.GH7150@dragon> References: <20190904110918.25009-1-igor.opaniuk@gmail.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20190904110918.25009-1-igor.opaniuk@gmail.com> User-Agent: Mutt/1.5.21 (2010-09-15) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20191005_181628_788954_34BCDBE1 X-CRM114-Status: GOOD ( 19.06 ) 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@arm.com, devicetree@vger.kernel.org, marcel.ziswiler@toradex.com, s.hauer@pengutronix.de, linux-kernel@vger.kernel.org, stefan@agner.ch, m.felsch@pengutronix.de, robh+dt@kernel.org, linux-imx@nxp.com, kernel@pengutronix.de, festevam@gmail.com, linux-arm-kernel@lists.infradead.org, marcel@ziswiler.com Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Wed, Sep 04, 2019 at 02:09:18PM +0300, Igor Opaniuk wrote: > 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 > --- > > 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 9159fa2cea90..87dfc3db4343 100644 > --- a/arch/arm/boot/dts/Makefile > +++ b/arch/arm/boot/dts/Makefile > @@ -401,6 +401,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..92fcf4e62ba2 > --- /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", Please make sure these compatibles are documented. > + "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>; > + enable-sdio-wakeup; Check out Documentation/devicetree/bindings/power/wakeup-source.txt Shawn > + 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 1beac22266ed..27097ab5eaab 100644 > --- a/arch/arm/boot/dts/imx6qdl-colibri.dtsi > +++ b/arch/arm/boot/dts/imx6qdl-colibri.dtsi > @@ -215,7 +215,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>; > -- > 2.17.1 > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel