From nobody Mon May 11 04:52:39 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D2549C433F5 for ; Thu, 14 Apr 2022 08:51:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241167AbiDNIyP (ORCPT ); Thu, 14 Apr 2022 04:54:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56924 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234846AbiDNIyG (ORCPT ); Thu, 14 Apr 2022 04:54:06 -0400 Received: from mout.perfora.net (mout.perfora.net [74.208.4.196]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 159E23EA94; Thu, 14 Apr 2022 01:51:41 -0700 (PDT) Received: from toolbox.toradex.int ([31.10.206.124]) by mrelay.perfora.net (mreueus004 [74.208.5.2]) with ESMTPSA (Nemesis) id 1N7AIq-1o1oFJ2LiG-017Xqa; Thu, 14 Apr 2022 10:51:22 +0200 From: Marcel Ziswiler To: linux-arm-kernel@lists.infradead.org Cc: Philippe Schenker , Denys Drozdov , Marcel Ziswiler , Fabio Estevam , Frank Rowand , Krzysztof Kozlowski , NXP Linux Team , Pengutronix Kernel Team , Rob Herring , Russell King , Sascha Hauer , Shawn Guo , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v1 01/14] ARM: dts: imx6ull-colibri: use pull-down for adc pins Date: Thu, 14 Apr 2022 10:50:53 +0200 Message-Id: <20220414085106.18621-2-marcel@ziswiler.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220414085106.18621-1-marcel@ziswiler.com> References: <20220414085106.18621-1-marcel@ziswiler.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:BhzF50BZrqTaFPK0TpbYgRjwA8MPxd+Lqnmvn5FVujauxewFtUF HIYR6EiL014ufeAi6FnMd7jSE3ANCnQRdmnGKq+uinhcoF7f8toXm3a7Yl5MBXVrmCRqbC4 qGjoImiiAZdwibOei2tdiE8by+QASeY5nBpZluVd4hvudr7KT5JpDLI6s7nAOXJtWLIxmGX F4eA+tZ/McnYoxpO7rY/A== X-UI-Out-Filterresults: notjunk:1;V03:K0:h4t6I8We6k4=:4GFKaWyaB/ahbiT3gHFgFZ Qnd0pkV+bN2I9uH2u4P3PmOKo6HPLP31ToGdVSUnLT0LKUoR6SqF9y6V5OpCaqQzngg7uVk92 oOZiEswCcIhS8XeN3mQsdOdx8Kym/Jw8HyrsN31x0AEFSEHYnZ6DTU3oR2BwU7hafDwJZEnmU g+riishafP+AVs3mkD6SkT2IFmknINJZVmN8Txysi7qVPH0N53WmVdC7FAl0CzMnwargWAG6X EID03O3P5LtUuVBn0yKsQPE10kQExCW9CnccsfCG/rP+BeLLxLxGubwv75skpLID+TGWoXhut Q3wmKOhDgIrzCS8QhsCP1dUR6KBWVSBCy65zK97SCgCev3kmqozmsjv4s94qq3lgYp1Cckaut Z5TYFzHRw8Y8EhKmjCauLHHvGZPru5ZPDvQCYHXdlDw7+pcKvRQOj+uyBlU5yKS/xfRWz7OGw NaO5w0R2RCRWAUh5tDt2pqr3FOWbwxhX1No/OSXPLiJOyVUDVRetNQ8O492AhwH/eCAR732Kn knHYMKuxiVE7SgBQdFw3XnLvvcJD2aD/lyt6pG0b9lx6n64qx2GUxcWlPkCFM1v9b/aQG0lmx +8Ffw02RIR3FEzN5oS7OKqmk6e4XCVUHaEQuevWUo8E779969kR423hzY+fu531fmhOwElLkO AE1QZJvD44qxTgdc/fhbD+JFJOwF2yCOG0uZ6WhqJ/iTc7gF/hsS7Iz1bmY1Sc5S85W4= Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Philippe Schenker Disable the keeper and enable a 100k pull-down on the ADC pins as per the following note in section 13.2 of the i.MX 6ULL Application Processor Reference Manual, Rev. 1, 11/2017 [1]: The keeper causes an undesired jump behavior in ADC. To avoid the problem, disable keeper before starting ADC. [1] https://www.nxp.com/webapp/Download?colCode=3DIMX6ULLRM Signed-off-by: Philippe Schenker Signed-off-by: Denys Drozdov Signed-off-by: Marcel Ziswiler --- arch/arm/boot/dts/imx6ull-colibri.dtsi | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/arch/arm/boot/dts/imx6ull-colibri.dtsi b/arch/arm/boot/dts/imx= 6ull-colibri.dtsi index 7f35a06dff95..84bb7574d211 100644 --- a/arch/arm/boot/dts/imx6ull-colibri.dtsi +++ b/arch/arm/boot/dts/imx6ull-colibri.dtsi @@ -52,6 +52,8 @@ reg_sd1_vmmc: regulator-sd1-vmmc { &adc1 { num-channels =3D <10>; vref-supply =3D <®_module_3v3_avdd>; + pinctrl-names =3D "default"; + pinctrl-0 =3D <&pinctrl_adc1>; }; =20 &can1 { @@ -214,6 +216,16 @@ &wdog1 { }; =20 &iomuxc { + + pinctrl_adc1: adc1grp { + fsl,pins =3D < + MX6UL_PAD_GPIO1_IO00__GPIO1_IO00 0x3000 /* SODIMM 8 */ + MX6UL_PAD_GPIO1_IO01__GPIO1_IO01 0x3000 /* SODIMM 6 */ + MX6UL_PAD_GPIO1_IO08__GPIO1_IO08 0x3000 /* SODIMM 4 */ + MX6UL_PAD_GPIO1_IO09__GPIO1_IO09 0x3000 /* SODIMM 2 */ + >; + }; + pinctrl_can_int: canint-grp { fsl,pins =3D < MX6UL_PAD_ENET1_TX_DATA1__GPIO2_IO04 0x13010 /* SODIMM 73 */ --=20 2.35.1 From nobody Mon May 11 04:52:39 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 85E55C433EF for ; Thu, 14 Apr 2022 08:51:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241162AbiDNIyM (ORCPT ); Thu, 14 Apr 2022 04:54:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56932 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238425AbiDNIyG (ORCPT ); Thu, 14 Apr 2022 04:54:06 -0400 Received: from mout.perfora.net (mout.perfora.net [74.208.4.197]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E60B353E2D; Thu, 14 Apr 2022 01:51:42 -0700 (PDT) Received: from toolbox.toradex.int ([31.10.206.124]) by mrelay.perfora.net (mreueus004 [74.208.5.2]) with ESMTPSA (Nemesis) id 1MtwtU-1nxQW10pX2-00uKRE; Thu, 14 Apr 2022 10:51:25 +0200 From: Marcel Ziswiler To: linux-arm-kernel@lists.infradead.org Cc: Max Krummenacher , Denys Drozdov , Marcel Ziswiler , Fabio Estevam , Frank Rowand , Krzysztof Kozlowski , NXP Linux Team , Pengutronix Kernel Team , Rob Herring , Russell King , Sascha Hauer , Shawn Guo , Stefan Agner , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v1 02/14] ARM: dts: imx6ull-colibri: fix vqmmc regulator Date: Thu, 14 Apr 2022 10:50:54 +0200 Message-Id: <20220414085106.18621-3-marcel@ziswiler.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220414085106.18621-1-marcel@ziswiler.com> References: <20220414085106.18621-1-marcel@ziswiler.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:9g+6LZTA59EY2u8QJDsvNnL4DnkE6vAD6PPNCALvJFoS/aw78RS SS8WD64lr2iA748OroF/hnkzpJU/fWrHK+1VG0OhrTHYh3AZ4Ul9F73pW1CSvcRI+y7I8i+ 7IL5iSCgSTeAhFYT/Stx3GvXvRnWdfoFs4RAbj+yfLkQ+5d+u+hQTsavyo71IBD35RspRnH tAHwummRfJppyZ6VW/4KQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:PWRvpDk5y2M=:cwmC9SOSmrzvfyar94IA7u A3xiE47abBORsnl7t8FdsP8NJoeRjJh9OplbY0L0VKIFZ9FGKb1/CeYbCbtZWFeZSDd3TVlao m67lobgCy1CcxynCObAawL0rvoYcPyk24s1d6Z1uM688M266k4HvUnLNKXJdZxVQA7x/C/WPM rE0CjM0j6Yq2i54RnfOddqjgAqe4XPJki6d92ZqRDtyjTLGk2mJ0DoAdl9qRnCHY2HRMURTr+ VESwwKkFHfAhdyL84cjVdINkNoNztCKlyeTdQ1oSz+GQaPRK0rmjYjiwAHT51J2cHj1Q9VldA b31q+Y0990Z7QMmQ/xwBVVJ+aQjJhA201vRwP6y6GzJJH2B5fuaKh3upqKekyai4QAMswEHES MhM9gMJZpduDIQ/CioVvdAZlcOYp4iZCHYi5L+RZf+UZlMm2EPYPhdObtuYFNf9fZd637dBq8 KE6hQ2oB6TC+YM65tL3nPc9dyhqoppvpUSD+9jPw6j0GiIzCobJUKsLNR//HXiDlYotKkAoa0 B/c/8hHAdbItrFkFp909JVQiHba6mW8/RIuCpyczaM3emjRJ1WyYhfrT8YRROGvTj3mvrK4r4 zxNAXtfSUEY2sT8ZXcU6Bn6F10h2vCpOtawCN8edJXsUunP+jOGUXjjYQUG/QR3wcsPxGg7Kq ocZgDtzSTSY14Nma6WISJomHz3gzlTSXY+dYg7b+yc22U8SLMgwWldWlSeoxG6nHjmqk= Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Max Krummenacher The correct spelling for the property is gpios. Otherwise, the regulator will neither reserve nor control any GPIOs. Thus, any SD/MMC card which can use UHS-I modes will fail. Fixes: c2e4987e ("ARM: dts: imx6ull: add Toradex Colibri iMX6ULL support") Signed-off-by: Max Krummenacher Signed-off-by: Denys Drozdov Signed-off-by: Marcel Ziswiler --- arch/arm/boot/dts/imx6ull-colibri.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/imx6ull-colibri.dtsi b/arch/arm/boot/dts/imx= 6ull-colibri.dtsi index 84bb7574d211..eb13ed60d2e4 100644 --- a/arch/arm/boot/dts/imx6ull-colibri.dtsi +++ b/arch/arm/boot/dts/imx6ull-colibri.dtsi @@ -37,7 +37,7 @@ reg_module_3v3_avdd: regulator-module-3v3-avdd { =20 reg_sd1_vmmc: regulator-sd1-vmmc { compatible =3D "regulator-gpio"; - gpio =3D <&gpio5 9 GPIO_ACTIVE_HIGH>; + gpios =3D <&gpio5 9 GPIO_ACTIVE_HIGH>; pinctrl-names =3D "default"; pinctrl-0 =3D <&pinctrl_snvs_reg_sd>; regulator-always-on; --=20 2.35.1 From nobody Mon May 11 04:52:39 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 79D80C43217 for ; Thu, 14 Apr 2022 08:51:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241150AbiDNIyJ (ORCPT ); Thu, 14 Apr 2022 04:54:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56942 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240271AbiDNIyH (ORCPT ); Thu, 14 Apr 2022 04:54:07 -0400 Received: from mout.perfora.net (mout.perfora.net [74.208.4.196]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 103BF5A0A0; Thu, 14 Apr 2022 01:51:42 -0700 (PDT) Received: from toolbox.toradex.int ([31.10.206.124]) by mrelay.perfora.net (mreueus004 [74.208.5.2]) with ESMTPSA (Nemesis) id 1M2Ohe-1nfUEQ2XEs-003sXi; Thu, 14 Apr 2022 10:51:29 +0200 From: Marcel Ziswiler To: linux-arm-kernel@lists.infradead.org Cc: Max Krummenacher , Denys Drozdov , Marcel Ziswiler , Fabio Estevam , Frank Rowand , Krzysztof Kozlowski , NXP Linux Team , Pengutronix Kernel Team , Rob Herring , Russell King , Sascha Hauer , Shawn Guo , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v1 03/14] ARM: dts: imx6ull-colibri: change touch i2c parameters Date: Thu, 14 Apr 2022 10:50:55 +0200 Message-Id: <20220414085106.18621-4-marcel@ziswiler.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220414085106.18621-1-marcel@ziswiler.com> References: <20220414085106.18621-1-marcel@ziswiler.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:PrUdRr7lJNylNQs5YAAtcSHGAf2AuFsk+QjxxQZnL4oYz5aYOLt MZw9gTowkY7xk4JAjeKBP6H6CTRvujCq7XExmd+mfHeakqXeVvB+VHt88r3Bxy4zV+qSH7v lBH5jcHNVSqOoFYfN/2rrETdBJOEOzs3qL6qjTGr6K426OiKgWr0EuLU4uiPc+fsrOJ++o8 Jmiw07EyrwlLznwJ7Ufeg== X-UI-Out-Filterresults: notjunk:1;V03:K0:VxVvqScpZWE=:UpENukvdF5ohWHmHhlqcdk fEHKd1197hG+IBTjH3QfG5rQY1rvYhL6a4ERrwANwh9sufmhFtyRvFoKlKgzgYadiFA2Pwl44 9PfDuhetHnBXzYldhUHl6CyUZoyg+00toAIrp2l+J7CSShAQDY1uLPfVexQobhDI2g4hrRgbA guOm2vQfk1LwPnCTsQhEzuWzI81GBXc8FhMXmNg1J+5JUrgmSsVZoNwdTyi5cLlQHQA7tkn+M VEULd/Eb9jvaLcuKA2eBf/PnIRqNFmG5cH05HHV8noHsqalhaHxGzE1wNI3/uO7k+1jzGPcua cKF+i5TlRgs222mZyqOms5vBVQK9P3UL+pUlpt/OwmqJwPV+bwOB50dsoGqWAF34PokjchrBp 92ao28asbYBE2pd7qJ12Hg0F73pRmY7kMYGJk9eYcuiD3Deua4lId8XAPk/paYTesi02KiGbO /i5efA+n8Gk7pyA1yT6Wfhf4IMDn7SYXiOOdSbpgAQckOEGESP8RJvds9EBI7ho2lETRmPmPu 7vxbYFVYfGm1NQO98OH7AUmbteLeY6lv3pNNpWr/F59cTcr7F8Kt7ksDYx23rK0ZA5KLOUsnQ RKnc3W2cyx/z7AJrCLjvs60d+lsvm3wddripzcJ+wVCX+RlLiibw2CQND+1Aixz9uTQtTDiHr AsYvjf3z0ag4/19UjgdwHDBU5DJRJtxxIPGc/Q8KMl2wIBwH/mpjUUMELEQ1kFR8FjCo= Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Max Krummenacher Switch on 22 kOhm pull-ups and lower the I2C frequency to around 40 kHz to get more reliable communication. Signed-off-by: Max Krummenacher Signed-off-by: Denys Drozdov Signed-off-by: Marcel Ziswiler --- arch/arm/boot/dts/imx6ull-colibri.dtsi | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/arch/arm/boot/dts/imx6ull-colibri.dtsi b/arch/arm/boot/dts/imx= 6ull-colibri.dtsi index eb13ed60d2e4..bea00cfaa820 100644 --- a/arch/arm/boot/dts/imx6ull-colibri.dtsi +++ b/arch/arm/boot/dts/imx6ull-colibri.dtsi @@ -114,6 +114,8 @@ &i2c1 { }; =20 &i2c2 { + /* Use low frequency to compensate for the high pull-up values. */ + clock-frequency =3D <40000>; pinctrl-names =3D "default", "gpio"; pinctrl-0 =3D <&pinctrl_i2c2>; pinctrl-1 =3D <&pinctrl_i2c2_gpio>; @@ -405,15 +407,15 @@ MX6UL_PAD_UART4_RX_DATA__GPIO1_IO29 0x4001b8b0 /* SOD= IMM 194 */ =20 pinctrl_i2c2: i2c2-grp { fsl,pins =3D < - MX6UL_PAD_UART5_TX_DATA__I2C2_SCL 0x4001b8b0 - MX6UL_PAD_UART5_RX_DATA__I2C2_SDA 0x4001b8b0 + MX6UL_PAD_UART5_TX_DATA__I2C2_SCL 0x4001f8b0 + MX6UL_PAD_UART5_RX_DATA__I2C2_SDA 0x4001f8b0 >; }; =20 pinctrl_i2c2_gpio: i2c2-gpio-grp { fsl,pins =3D < - MX6UL_PAD_UART5_TX_DATA__GPIO1_IO30 0x4001b8b0 - MX6UL_PAD_UART5_RX_DATA__GPIO1_IO31 0x4001b8b0 + MX6UL_PAD_UART5_TX_DATA__GPIO1_IO30 0x4001f8b0 + MX6UL_PAD_UART5_RX_DATA__GPIO1_IO31 0x4001f8b0 >; }; =20 --=20 2.35.1 From nobody Mon May 11 04:52:39 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6CEA5C433EF for ; Thu, 14 Apr 2022 08:52:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241170AbiDNIy1 (ORCPT ); Thu, 14 Apr 2022 04:54:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57088 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241165AbiDNIyO (ORCPT ); Thu, 14 Apr 2022 04:54:14 -0400 Received: from mout.perfora.net (mout.perfora.net [74.208.4.194]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CAD2165425; Thu, 14 Apr 2022 01:51:48 -0700 (PDT) Received: from toolbox.toradex.int ([31.10.206.124]) by mrelay.perfora.net (mreueus004 [74.208.5.2]) with ESMTPSA (Nemesis) id 1N5mzf-1o25E042rz-017H8J; Thu, 14 Apr 2022 10:51:32 +0200 From: Marcel Ziswiler To: linux-arm-kernel@lists.infradead.org Cc: Philippe Schenker , Denys Drozdov , Marcel Ziswiler , Fabio Estevam , Frank Rowand , Krzysztof Kozlowski , NXP Linux Team , Pengutronix Kernel Team , Rob Herring , Russell King , Sascha Hauer , Shawn Guo , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v1 04/14] ARM: dts: imx6ull-colibri: add phy-supply to fec Date: Thu, 14 Apr 2022 10:50:56 +0200 Message-Id: <20220414085106.18621-5-marcel@ziswiler.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220414085106.18621-1-marcel@ziswiler.com> References: <20220414085106.18621-1-marcel@ziswiler.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:PbT02YFtJ+vwl/W84GYuhBhNFhO4lR6ScQtLgXPSJRN9ofOjaHK Aor4kPAGhl7vSNTOzEtDrmVoVT0ldq5rw9p0Wjc/ZWZjuqJ43k8l5cxZbRo4D8pa9EWgi2/ 0hE4hrXK+/Twk/lcjyexf4r+EnxZ78AQZmsQ4TPa/8jex5Gnb4EatzmOz+MomasXFN3QqCA mW/JAmYrWH1W38ZFhBrcA== X-UI-Out-Filterresults: notjunk:1;V03:K0:xLiVqhQHKoA=:HZXUik53/ueD6KZs9UZy/f FheHxh02hd1ZxfjLNQVjfnZQYrlOlGbRjtBI3SYPluZNu1Gaq6QplGVYiAoIySxvj1lHfM58V IfS9tT2Hw9gYqiUi9Xqvrf4uFZ2Xtya2HbLCYvSZFAhGr6AEICepCo+JfV+QhxRgc6hovH5HZ 0QuRiabIIh0Y4/hR92TvZUXvDUh0OmzHvNRLBHiUe8vnujqomw9TBmIwXaW0SjUbAfY1qpskv WuEsRFzLUZGyaKcVBcp99hr8jp+WcHuTkfmmKQMe7Cb67Jo3apprhgkMYQLGY+KMVVhNckPsX uHFi67B1nFFC7RUMscuamSNMgUZHwIQqkbJxvwgIZ7CCLnpSQ6oiFQ9MK7OsUKt7fGL/U10vC m0jvSEAu6eP4Z2Iscse1TBtvEQ3RQWqjVDe3ZaZ/M2fMbYAq4BGFQjtNjfFVZTxBgaogoFJly 4HrvAwR6ydMmwFPt8sxkb83QGVuiKfhOhB8XnoVEeTRJkHZt/cKt+lwPZP/m+8mSpBF1gBUKL PtuwOMu51qAQgAkZAA+W+H88p5oq3KN3UvHmf61Lnzb45kEGPiKmSbgijejjrHn9kIDMEjtfk y3p0GbzGEFZeqf9osLljPl36IhwAbYQMC2zRwdllws0BryhUUGyi5Xe6uu/UZ4MUQc6TBeXKC H/GFOnb3WjPC3XUzxY0yPN1+27YEI1edB+fOelQ35wsgQro7bvT3P4y1BzDlfP0ggBOM= Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Philippe Schenker This adds the proper phy-supply to the FEC. This supply is actually switched by a clock that is now properly stated. This has the advantage to add a delay for that particular regulator which is needed. Signed-off-by: Philippe Schenker Signed-off-by: Denys Drozdov Signed-off-by: Marcel Ziswiler --- arch/arm/boot/dts/imx6ull-colibri.dtsi | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/arch/arm/boot/dts/imx6ull-colibri.dtsi b/arch/arm/boot/dts/imx= 6ull-colibri.dtsi index bea00cfaa820..e619da3b00b3 100644 --- a/arch/arm/boot/dts/imx6ull-colibri.dtsi +++ b/arch/arm/boot/dts/imx6ull-colibri.dtsi @@ -47,6 +47,18 @@ reg_sd1_vmmc: regulator-sd1-vmmc { states =3D <1800000 0x1 3300000 0x0>; vin-supply =3D <®_module_3v3>; }; + + reg_eth_phy: regulator-eth-phy { + compatible =3D "regulator-fixed-clock"; + regulator-boot-on; + regulator-min-microvolt =3D <3300000>; + regulator-max-microvolt =3D <3300000>; + regulator-name =3D "+V3.3_ETH"; + regulator-type =3D "voltage"; + vin-supply =3D <®_module_3v3>; + clocks =3D <&clks IMX6UL_CLK_ENET2_REF_125M>; + startup-delay-us =3D <150000>; + }; }; =20 &adc1 { @@ -81,6 +93,7 @@ &fec2 { pinctrl-1 =3D <&pinctrl_enet2_sleep>; phy-mode =3D "rmii"; phy-handle =3D <ðphy1>; + phy-supply =3D <®_eth_phy>; status =3D "okay"; =20 mdio { --=20 2.35.1 From nobody Mon May 11 04:52:39 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 11A0AC433F5 for ; Thu, 14 Apr 2022 08:52:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241184AbiDNIyW (ORCPT ); Thu, 14 Apr 2022 04:54:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57090 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241154AbiDNIyO (ORCPT ); Thu, 14 Apr 2022 04:54:14 -0400 Received: from mout.perfora.net (mout.perfora.net [74.208.4.194]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 406EB65798; Thu, 14 Apr 2022 01:51:49 -0700 (PDT) Received: from toolbox.toradex.int ([31.10.206.124]) by mrelay.perfora.net (mreueus004 [74.208.5.2]) with ESMTPSA (Nemesis) id 1MXHWM-1nSCZl0ZCA-00YlKM; Thu, 14 Apr 2022 10:51:35 +0200 From: Marcel Ziswiler To: linux-arm-kernel@lists.infradead.org Cc: Denys Drozdov , Marcel Ziswiler , Fabio Estevam , Frank Rowand , Krzysztof Kozlowski , NXP Linux Team , Pengutronix Kernel Team , Rob Herring , Russell King , Sascha Hauer , Shawn Guo , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v1 05/14] ARM: dts: imx6ull-colibri: add touchscreen device nodes Date: Thu, 14 Apr 2022 10:50:57 +0200 Message-Id: <20220414085106.18621-6-marcel@ziswiler.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220414085106.18621-1-marcel@ziswiler.com> References: <20220414085106.18621-1-marcel@ziswiler.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:AzmStBKEEMT8nYa1ZTBmzScuYh2UziRpF/eJmtbuREyQxrNZ6mR q70hyNaB9Pm7r7TnNmmmfVc+hRmb1QpCbKYl+5jFlUJQVB+5oo3LEy8hJDFGU3f8vD2QsYl p4k2cbwUSztVaigw7edX9iftQ2LA28/+A+R9clv2IIbU3uxm9+qsRCvPQOEpsRJ93hGtg4U 9jnBOJiVZbDse4lIbsSBw== X-UI-Out-Filterresults: notjunk:1;V03:K0:jcTR2j4yPIM=:Bx83FwfHBmTwzhvCo4b7l6 +SAHnIfuhee802teUFXRZGyGJaHo4WfcaqC7HgLke4VrbeS0yfKMkjQIcXkrv66vINpzm1/ib lbE7FEEP0X0ZbBjjSu27kExmH+LGTYTA1pwuU4KOPw3mb9IjY0A/JK00uyFEeucFY+AVUQZyW Knh5ps0S0aaRu5qne2ZfhPFiR7dUCK7n8hNCkF0xWk4Pgyth3EVcNwJtpcCKJV0KbQKjCDW+c qNBTOniKQGBhcFCXs/FSRq1aVAMJo9xx4fD+uByQcJWH1zX3JpqxUA6A6iorw9Y7Km8fwbNSg OgA37OmPiGSGVHvC48CT6TbtAeoQIq53Ky6WCVWNSKCW8EbaWHyaJbGobafs3x7WRpelsuTDw X/W0N6N+NiHZsi2qzF1OglMz1mmX/mNMpoGWnhHsZ3vE26l9M7jywNWIhTUBcKJJsMKIob6hg 1Ru++g//t8ocFbQn8jBnvASq99duSjvODTDqOlGW+opwtbt0g7EWoFwVkXgpy1mNc4KF02f/X cA3zyZ/P810rSSZ2jMobIiHo/Fh6Gugm0CthyfHri1bg77Qebn6zsAGjoP3pFn4hgryW9Wi7L Assag8dg7b4JwTJQIOXpHzh6n4GCVDgn7uJQjjAloKrGjrORwO/MjpqB3BPN9pOJtPpTaZnLs 6+7w54xKdo9UXVk6xAbEfiLO8iyBnriVMAehRaiP/3S/ivrIKHpy7fktC2JO1BDUabO0= Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Denys Drozdov Move all Atmel nodes from the board-level into the main module-level device tree and prepare the device trees for use with Atmel MXT device tree overlays. Also, add required pinmux groups. The common scheme for pin groups in touch screen overlays is as follows: - pinctrl_atmel_conn - SODIMM 106/107 pins for INT/RST signals (default) - pinctrl_atmel_adap - SODIMM 28/30 pins for INT/RST signals. Signed-off-by: Denys Drozdov Signed-off-by: Marcel Ziswiler --- .../arm/boot/dts/imx6ull-colibri-nonwifi.dtsi | 4 +- arch/arm/boot/dts/imx6ull-colibri-wifi.dtsi | 4 +- arch/arm/boot/dts/imx6ull-colibri.dtsi | 39 +++++++++++++------ 3 files changed, 31 insertions(+), 16 deletions(-) diff --git a/arch/arm/boot/dts/imx6ull-colibri-nonwifi.dtsi b/arch/arm/boot= /dts/imx6ull-colibri-nonwifi.dtsi index 95a11b8bcbdb..5e55a6c820bc 100644 --- a/arch/arm/boot/dts/imx6ull-colibri-nonwifi.dtsi +++ b/arch/arm/boot/dts/imx6ull-colibri-nonwifi.dtsi @@ -15,10 +15,10 @@ memory@80000000 { &iomuxc { pinctrl-names =3D "default"; pinctrl-0 =3D <&pinctrl_gpio1 &pinctrl_gpio2 &pinctrl_gpio3 - &pinctrl_gpio4 &pinctrl_gpio5 &pinctrl_gpio6 &pinctrl_gpio7>; + &pinctrl_gpio4 &pinctrl_gpio6 &pinctrl_gpio7>; }; =20 &iomuxc_snvs { pinctrl-names =3D "default"; - pinctrl-0 =3D <&pinctrl_snvs_gpio1 &pinctrl_snvs_gpio2 &pinctrl_snvs_gpio= 3>; + pinctrl-0 =3D <&pinctrl_snvs_gpio1 &pinctrl_snvs_gpio3>; }; diff --git a/arch/arm/boot/dts/imx6ull-colibri-wifi.dtsi b/arch/arm/boot/dt= s/imx6ull-colibri-wifi.dtsi index 9f1e38282bee..6e8ddb07e11d 100644 --- a/arch/arm/boot/dts/imx6ull-colibri-wifi.dtsi +++ b/arch/arm/boot/dts/imx6ull-colibri-wifi.dtsi @@ -26,13 +26,13 @@ &cpu0 { &iomuxc { pinctrl-names =3D "default"; pinctrl-0 =3D <&pinctrl_gpio1 &pinctrl_gpio2 &pinctrl_gpio3 - &pinctrl_gpio4 &pinctrl_gpio5 &pinctrl_gpio7>; + &pinctrl_gpio4 &pinctrl_gpio7>; =20 }; =20 &iomuxc_snvs { pinctrl-names =3D "default"; - pinctrl-0 =3D <&pinctrl_snvs_gpio1 &pinctrl_snvs_gpio2>; + pinctrl-0 =3D <&pinctrl_snvs_gpio1>; }; =20 &usdhc2 { diff --git a/arch/arm/boot/dts/imx6ull-colibri.dtsi b/arch/arm/boot/dts/imx= 6ull-colibri.dtsi index e619da3b00b3..b2345a5573f4 100644 --- a/arch/arm/boot/dts/imx6ull-colibri.dtsi +++ b/arch/arm/boot/dts/imx6ull-colibri.dtsi @@ -124,6 +124,19 @@ &i2c1 { pinctrl-1 =3D <&pinctrl_i2c1_gpio>; sda-gpios =3D <&gpio1 29 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; scl-gpios =3D <&gpio1 28 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; + status =3D "okay"; + + /* Atmel maxtouch controller */ + atmel_mxt_ts: touchscreen@4a { + compatible =3D "atmel,maxtouch"; + pinctrl-names =3D "default"; + pinctrl-0 =3D <&pinctrl_atmel_conn>; + reg =3D <0x4a>; + interrupt-parent =3D <&gpio5>; + interrupts =3D <4 IRQ_TYPE_EDGE_FALLING>; /* SODIMM_107, INT */ + reset-gpios =3D <&gpio1 10 GPIO_ACTIVE_HIGH>; /* SODIMM_106, RST */ + status =3D "disabled"; + }; }; =20 &i2c2 { @@ -241,6 +254,20 @@ MX6UL_PAD_GPIO1_IO09__GPIO1_IO09 0x3000 /* SODI= MM 2 */ >; }; =20 + pinctrl_atmel_adap: atmel_adap_group { + fsl,pins =3D < + MX6UL_PAD_NAND_DQS__GPIO4_IO16 0xb0a0 /* SODIMM 28 */ + MX6UL_PAD_ENET1_TX_EN__GPIO2_IO05 0xb0a0 /* SODIMM 30 */ + >; + }; + + pinctrl_atmel_conn: atmel_conn_group { + fsl,pins =3D < + MX6UL_PAD_JTAG_MOD__GPIO1_IO10 0xb0a0 /* SODIMM 106 */ + MX6ULL_PAD_SNVS_TAMPER4__GPIO5_IO04 0xb0a0 /* SODIMM 107 */ + >; + }; + pinctrl_can_int: canint-grp { fsl,pins =3D < MX6UL_PAD_ENET1_TX_DATA1__GPIO2_IO04 0x13010 /* SODIMM 73 */ @@ -347,12 +374,6 @@ MX6UL_PAD_CSI_DATA07__GPIO4_IO28 0x10b0 /* SODIMM 65 */ >; }; =20 - pinctrl_gpio5: gpio5-grp { /* ATMEL MXT TOUCH */ - fsl,pins =3D < - MX6UL_PAD_JTAG_MOD__GPIO1_IO10 0xb0a0 /* SODIMM 106 */ - >; - }; - pinctrl_gpio6: gpio6-grp { /* Wifi pins */ fsl,pins =3D < MX6UL_PAD_GPIO1_IO03__GPIO1_IO03 0x10b0 /* SODIMM 89 */ @@ -606,12 +627,6 @@ MX6ULL_PAD_SNVS_TAMPER8__GPIO5_IO08 0x110a0 /* SODIMM = 138 */ >; }; =20 - pinctrl_snvs_gpio2: snvs-gpio2-grp { /* ATMEL MXT TOUCH */ - fsl,pins =3D < - MX6ULL_PAD_SNVS_TAMPER4__GPIO5_IO04 0xb0a0 /* SODIMM 107 */ - >; - }; - pinctrl_snvs_gpio3: snvs-gpio3-grp { /* Wifi pins */ fsl,pins =3D < MX6ULL_PAD_BOOT_MODE1__GPIO5_IO11 0x130a0 /* SODIMM 127 */ --=20 2.35.1 From nobody Mon May 11 04:52:39 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8BE80C433EF for ; Thu, 14 Apr 2022 08:52:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241194AbiDNIyd (ORCPT ); Thu, 14 Apr 2022 04:54:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57120 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241157AbiDNIyP (ORCPT ); Thu, 14 Apr 2022 04:54:15 -0400 Received: from mout.perfora.net (mout.perfora.net [74.208.4.197]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E01CC65808; Thu, 14 Apr 2022 01:51:50 -0700 (PDT) Received: from toolbox.toradex.int ([31.10.206.124]) by mrelay.perfora.net (mreueus004 [74.208.5.2]) with ESMTPSA (Nemesis) id 1MI55X-1nhO2v2pIV-00FA0Z; Thu, 14 Apr 2022 10:51:39 +0200 From: Marcel Ziswiler To: linux-arm-kernel@lists.infradead.org Cc: Philippe Schenker , Denys Drozdov , Andrejs Cainikovs , Marcel Ziswiler , Fabio Estevam , Frank Rowand , Krzysztof Kozlowski , NXP Linux Team , Pengutronix Kernel Team , Rob Herring , Russell King , Sascha Hauer , Shawn Guo , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v1 06/14] ARM: dts: imx6ull-colibri: update usdhc1 pixmux and signaling Date: Thu, 14 Apr 2022 10:50:58 +0200 Message-Id: <20220414085106.18621-7-marcel@ziswiler.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220414085106.18621-1-marcel@ziswiler.com> References: <20220414085106.18621-1-marcel@ziswiler.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:rUA5RPDRMKJxl21IfvOhcWoZcUa0Z6ba6d0SceNu3GExfI7tLxJ d598Bgjo8pMLwAsLqRCX2B9JB+BOMR1tjm4TCsaMvY8dLG5pD7tbAgtJbxi1hwcBBhwrGjI 8iqlehS1L8D+xTt6io/wnGuXhOZA9huOncLlH7/0C/A8k8DS1ZDZ2qic03Yixw9/1Mb7QLn ZNEEQsKcoQdRBN5L0UsRQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:A5ZMQpW7OKE=:th3ZyW4YUS67+GKgXLL5It I0j4lHkmb2FwaklTMttHU3JYWl5/NlvjMz/Wtv7smsbqMvLynZn5A7Xp9BDLmAyIP9C84LWL4 /1ISwSi75O/ksckdwaJEV2BA1nUa0fLFFO/vEO8b4hAt1K1ozOQ2VuZyw+yXem1C1qkcpfXpg pLPyu2rjkJTNb2AqgjO0BrwBqQCnc0u4MstBZK0jSr6dCoTLGoNbKQKDkNg87anUcQAGMLqUj K5MzyycnkiVBC1PjVjb0v75/mUSpBe8ijZVPDcryVRBJn13/oN51o5y6mdmSJQX7XzTxoFPkc +L/otRFg0tHceGdtYupYw7pMMbU4hV163RIN6L/VQm+Xd0OsBwjscA18p3+J7b6wcdgNNzCu2 pyBL5U4trLXKnyUheUwDbNvZ0lXlYAmYBvCViSxRrlXZ0q38pOXXvJiKWliYtw3W7A/+6bsGA C/GSOaG3AufesYNFhEaDE56Ar6f4nXaaxmHcFO2Cs91vZO8+GCzYGwRbt6bDNPLFd0uOC+Svt buNh2plOvkRS45Nk/EHlJLrPwLilPrVzgxmSfNLP8MkgowFe+L7IpQbQx9OaIa329XPTOyL1w +FaMgCKUYR0T1XhHom1+YRGXd46aAPcq003IVJNjgnOqrApm7TfsKO8P69ZzOxpkzmq+SeTKK Cb+/o69jeIAl1DrmwCr4mdJedNuqNsEHnZGsp+wwweYNa0YAbIt6ici/FowJLm76wcGwux6cM uGmC1IwngzQLSBzR Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Philippe Schenker Due to many carrier boards pulling the usdhc1 signals up to 3.3 volt we need to disable 1.8 volt signaling. Adding the no-1-8-v property basically disables UHS-I modes by default. Also pull-up the command and data lines to the +V3.3_1.8_SD rail and set them to the 200 MHz speed grade (e.g. pinmux bits 7-6: meaning 11 SPEED_3_max_200MHz). Explicitly specify a bus-width of <4> in the module-level device tree include file and drop the no-1-8-v property from the carrier boards device trees. Signed-off-by: Philippe Schenker Signed-off-by: Denys Drozdov Signed-off-by: Andrejs Cainikovs Signed-off-by: Marcel Ziswiler --- .../arm/boot/dts/imx6ull-colibri-eval-v3.dtsi | 14 -------- arch/arm/boot/dts/imx6ull-colibri.dtsi | 36 ++++++++++++------- 2 files changed, 24 insertions(+), 26 deletions(-) diff --git a/arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi b/arch/arm/boot= /dts/imx6ull-colibri-eval-v3.dtsi index a78849fd2afa..ea086b305d22 100644 --- a/arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi +++ b/arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi @@ -159,20 +159,6 @@ &usbotg2 { }; =20 &usdhc1 { - pinctrl-names =3D "default", "state_100mhz", "state_200mhz", "sleep"; - pinctrl-0 =3D <&pinctrl_usdhc1 &pinctrl_snvs_usdhc1_cd>; - pinctrl-1 =3D <&pinctrl_usdhc1_100mhz &pinctrl_snvs_usdhc1_cd>; - pinctrl-2 =3D <&pinctrl_usdhc1_200mhz &pinctrl_snvs_usdhc1_cd>; - pinctrl-3 =3D <&pinctrl_usdhc1 &pinctrl_snvs_usdhc1_sleep_cd>; - cd-gpios =3D <&gpio5 0 GPIO_ACTIVE_LOW>; - disable-wp; - wakeup-source; - keep-power-in-suspend; vmmc-supply =3D <®_3v3>; - vqmmc-supply =3D <®_sd1_vmmc>; - sd-uhs-sdr12; - sd-uhs-sdr25; - sd-uhs-sdr50; - sd-uhs-sdr104; status =3D "okay"; }; diff --git a/arch/arm/boot/dts/imx6ull-colibri.dtsi b/arch/arm/boot/dts/imx= 6ull-colibri.dtsi index b2345a5573f4..d633288b8ee8 100644 --- a/arch/arm/boot/dts/imx6ull-colibri.dtsi +++ b/arch/arm/boot/dts/imx6ull-colibri.dtsi @@ -35,7 +35,7 @@ reg_module_3v3_avdd: regulator-module-3v3-avdd { regulator-max-microvolt =3D <3300000>; }; =20 - reg_sd1_vmmc: regulator-sd1-vmmc { + reg_sd1_vqmmc: regulator-sd1-vqmmc { compatible =3D "regulator-gpio"; gpios =3D <&gpio5 9 GPIO_ACTIVE_HIGH>; pinctrl-names =3D "default"; @@ -232,9 +232,21 @@ &usbotg2 { }; =20 &usdhc1 { + pinctrl-names =3D "default", "state_100mhz", "state_200mhz", "sleep"; + pinctrl-0 =3D <&pinctrl_usdhc1 &pinctrl_snvs_usdhc1_cd>; + pinctrl-1 =3D <&pinctrl_usdhc1_100mhz &pinctrl_snvs_usdhc1_cd>; + pinctrl-2 =3D <&pinctrl_usdhc1_200mhz &pinctrl_snvs_usdhc1_cd>; + pinctrl-3 =3D <&pinctrl_usdhc1 &pinctrl_snvs_usdhc1_sleep_cd>; assigned-clocks =3D <&clks IMX6UL_CLK_USDHC1_SEL>, <&clks IMX6UL_CLK_USDH= C1>; assigned-clock-parents =3D <&clks IMX6UL_CLK_PLL2_PFD2>; assigned-clock-rates =3D <0>, <198000000>; + bus-width =3D <4>; + cd-gpios =3D <&gpio5 0 GPIO_ACTIVE_LOW>; + disable-wp; + keep-power-in-suspend; + no-1-8-v; + vqmmc-supply =3D <®_sd1_vqmmc>; + wakeup-source; }; =20 &wdog1 { @@ -550,8 +562,8 @@ MX6UL_PAD_GPIO1_IO02__GPIO1_IO02 0x10b0 /* SODIMM 129 */ =20 pinctrl_usdhc1: usdhc1-grp { fsl,pins =3D < - MX6UL_PAD_SD1_CLK__USDHC1_CLK 0x17059 /* SODIMM 47 */ - MX6UL_PAD_SD1_CMD__USDHC1_CMD 0x10059 /* SODIMM 190 */ + MX6UL_PAD_SD1_CLK__USDHC1_CLK 0x10059 /* SODIMM 47 */ + MX6UL_PAD_SD1_CMD__USDHC1_CMD 0x17059 /* SODIMM 190 */ MX6UL_PAD_SD1_DATA0__USDHC1_DATA0 0x17059 /* SODIMM 192 */ MX6UL_PAD_SD1_DATA1__USDHC1_DATA1 0x17059 /* SODIMM 49 */ MX6UL_PAD_SD1_DATA2__USDHC1_DATA2 0x17059 /* SODIMM 51 */ @@ -561,8 +573,8 @@ MX6UL_PAD_SD1_DATA3__USDHC1_DATA3 0x17059 /* SODIMM 53 = */ =20 pinctrl_usdhc1_100mhz: usdhc1-100mhz-grp { fsl,pins =3D < - MX6UL_PAD_SD1_CLK__USDHC1_CLK 0x170b9 - MX6UL_PAD_SD1_CMD__USDHC1_CMD 0x100b9 + MX6UL_PAD_SD1_CLK__USDHC1_CLK 0x100b9 + MX6UL_PAD_SD1_CMD__USDHC1_CMD 0x170b9 MX6UL_PAD_SD1_DATA0__USDHC1_DATA0 0x170b9 MX6UL_PAD_SD1_DATA1__USDHC1_DATA1 0x170b9 MX6UL_PAD_SD1_DATA2__USDHC1_DATA2 0x170b9 @@ -572,12 +584,12 @@ MX6UL_PAD_SD1_DATA3__USDHC1_DATA3 0x170b9 =20 pinctrl_usdhc1_200mhz: usdhc1-200mhz-grp { fsl,pins =3D < - MX6UL_PAD_SD1_CLK__USDHC1_CLK 0x170f9 - MX6UL_PAD_SD1_CMD__USDHC1_CMD 0x100f9 - MX6UL_PAD_SD1_DATA0__USDHC1_DATA0 0x170b9 - MX6UL_PAD_SD1_DATA1__USDHC1_DATA1 0x170b9 - MX6UL_PAD_SD1_DATA2__USDHC1_DATA2 0x170b9 - MX6UL_PAD_SD1_DATA3__USDHC1_DATA3 0x170b9 + MX6UL_PAD_SD1_CLK__USDHC1_CLK 0x100f9 + MX6UL_PAD_SD1_CMD__USDHC1_CMD 0x170f9 + MX6UL_PAD_SD1_DATA0__USDHC1_DATA0 0x170f9 + MX6UL_PAD_SD1_DATA1__USDHC1_DATA1 0x170f9 + MX6UL_PAD_SD1_DATA2__USDHC1_DATA2 0x170f9 + MX6UL_PAD_SD1_DATA3__USDHC1_DATA3 0x170f9 >; }; =20 @@ -588,7 +600,7 @@ MX6UL_PAD_CSI_DATA01__USDHC2_DATA1 0x17069 MX6UL_PAD_CSI_DATA02__USDHC2_DATA2 0x17069 MX6UL_PAD_CSI_DATA03__USDHC2_DATA3 0x17069 MX6UL_PAD_CSI_HSYNC__USDHC2_CMD 0x17069 - MX6UL_PAD_CSI_VSYNC__USDHC2_CLK 0x17069 + MX6UL_PAD_CSI_VSYNC__USDHC2_CLK 0x10069 =20 MX6UL_PAD_GPIO1_IO03__OSC32K_32K_OUT 0x10 >; --=20 2.35.1 From nobody Mon May 11 04:52:39 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B2528C433F5 for ; Thu, 14 Apr 2022 08:52:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241214AbiDNIyq (ORCPT ); Thu, 14 Apr 2022 04:54:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57638 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241207AbiDNIyf (ORCPT ); Thu, 14 Apr 2022 04:54:35 -0400 Received: from mout.perfora.net (mout.perfora.net [74.208.4.194]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C806A65D39; Thu, 14 Apr 2022 01:51:56 -0700 (PDT) Received: from toolbox.toradex.int ([31.10.206.124]) by mrelay.perfora.net (mreueus004 [74.208.5.2]) with ESMTPSA (Nemesis) id 1MTisb-1nWrHE3anN-00U6MD; Thu, 14 Apr 2022 10:51:42 +0200 From: Marcel Ziswiler To: linux-arm-kernel@lists.infradead.org Cc: Denys Drozdov , Marcel Ziswiler , Fabio Estevam , Frank Rowand , Krzysztof Kozlowski , NXP Linux Team , Pengutronix Kernel Team , Rob Herring , Russell King , Sascha Hauer , Shawn Guo , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v1 07/14] ARM: dts: imx6ull-colibri: update device trees to support overlays Date: Thu, 14 Apr 2022 10:50:59 +0200 Message-Id: <20220414085106.18621-8-marcel@ziswiler.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220414085106.18621-1-marcel@ziswiler.com> References: <20220414085106.18621-1-marcel@ziswiler.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:o18EqjaqFqmOiCMZr9tOYKPth0afq3U2xv0bEeiIkxnX1PIGNMR oPvoa/eG2TpS6QE1WRE9QyJvzpSBxg1cDnMbn5rb7qC7k1RMCmihXxZBe9zJVEcidwD4v2W CnKwsfa2K5+KQ5buqJgHbYvsNqA3fRxOdcjRmxv70+508qJDuBKgLBVwGLWNR6N5WIUHGZA eXGrvTuO5W99lG/Zvel/w== X-UI-Out-Filterresults: notjunk:1;V03:K0:gDAZEyIffAg=:AfoY5Ebp5ykv65njsNwENK p2kIJTSin0JcuejtLWxr38qGy4GFc6HPzlsKqvdEITGyZf4E+IogTHpYxsylMy5LjCpsctdGZ HFtOCZ7Qgj9Oo7xdFvA+AJP7K7OJSnR+QsoWAgmvHM6dVCwwWx5D6lRXjolU5r/OP/KCmvcqS TRsYnzrL5ItuxGodOCthsrsk3CPQfsi99FoS1hp7w26RmNRlPkKd4yWads9Fg4fHk3I1rCcSD 61y72gFVrdCYts+jzx7h3Ia3vcgYUQfufxxl+BZynQygJECIs1Q4VCAKfuXVp2RQ2OC2KJ3W7 TFwJZcG8EYufLEPaJIXVfcgivkDS+8v0Wsl6El22jYZF4P0ybg0UdOm1hL2P2HzknRqm8tdzK 4GXtTAi/70I4ZbpjyWX+YQojtj0+3sSbFxdoXjCjHXOoa8HvaP4HJ3+AxB5Ah9z9FYNSGiSQJ gcgIo9lYGVulAS5L9F5v+wy6Dnya9lMA7aXryVITxzyprQNlbHoOHpYILY83oVxdNXdhAD8qL t1mZRBUBlEM6J4BZXy6K1UCQn0kZSvem37eSanYoVWnfsZjG36/TEriRSdXTSSj4OXoMG6XDJ x4ZpMG+owo1/Bzk3WVVZ9m7iekYamux7rJkPkz79BeZourytZtI7AJzAXsHc+1LpD06HuWGQP QV8QunRnd7hPAtvb+t3op0JN2mPWYWMWmpKF8xj21CfPbCjcLR8gYpEpYL/xLAQ04DFMGo3ot afiC5g9GmvSf0huE Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Denys Drozdov Prepare in-tree device trees for out-of-tree device tree overlay support (eMMC SKU only). Relocate panel-dpi default to edt,et057090dhu (RGB 18bit VGA 640x480) to the module-level dtsi and remove it from the carrier board dtsi. Keep backlight, resistive touch and Atmel maxtouch nodes enabled for both eMMC and NAND modules. Signed-off-by: Denys Drozdov Signed-off-by: Marcel Ziswiler --- .../arm/boot/dts/imx6ull-colibri-eval-v3.dtsi | 29 ----------------- arch/arm/boot/dts/imx6ull-colibri.dtsi | 31 ++++++++++++++++--- 2 files changed, 27 insertions(+), 33 deletions(-) diff --git a/arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi b/arch/arm/boot= /dts/imx6ull-colibri-eval-v3.dtsi index ea086b305d22..3c07b4273e80 100644 --- a/arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi +++ b/arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi @@ -29,17 +29,6 @@ clk16m: clk16m { clock-frequency =3D <16000000>; }; =20 - panel: panel { - compatible =3D "edt,et057090dhu"; - backlight =3D <&bl>; - power-supply =3D <®_3v3>; - - port { - panel_in: endpoint { - remote-endpoint =3D <&lcdif_out>; - }; - }; - }; =20 reg_3v3: regulator-3v3 { compatible =3D "regulator-fixed"; @@ -71,14 +60,6 @@ &adc1 { status =3D "okay"; }; =20 -&bl { - brightness-levels =3D <0 4 8 16 32 64 128 255>; - default-brightness-level =3D <6>; - power-supply =3D <®_3v3>; - pwms =3D <&pwm4 0 5000000 1>; - status =3D "okay"; -}; - &ecspi1 { status =3D "okay"; =20 @@ -107,16 +88,6 @@ m41t0m6: rtc@68 { }; }; =20 -&lcdif { - status =3D "okay"; - - port { - lcdif_out: endpoint { - remote-endpoint =3D <&panel_in>; - }; - }; -}; - /* PWM */ &pwm4 { status =3D "okay"; diff --git a/arch/arm/boot/dts/imx6ull-colibri.dtsi b/arch/arm/boot/dts/imx= 6ull-colibri.dtsi index d633288b8ee8..a1e26ac4d1e7 100644 --- a/arch/arm/boot/dts/imx6ull-colibri.dtsi +++ b/arch/arm/boot/dts/imx6ull-colibri.dtsi @@ -11,12 +11,29 @@ aliases { ethernet1 =3D &fec1; }; =20 - bl: backlight { + backlight: backlight { compatible =3D "pwm-backlight"; + brightness-levels =3D <0 4 8 16 32 64 128 255>; + default-brightness-level =3D <6>; + enable-gpios =3D <&gpio1 11 GPIO_ACTIVE_HIGH>; pinctrl-names =3D "default"; pinctrl-0 =3D <&pinctrl_gpio_bl_on>; - enable-gpios =3D <&gpio1 11 GPIO_ACTIVE_HIGH>; - status =3D "disabled"; + power-supply =3D <®_3v3>; + pwms =3D <&pwm4 0 5000000 1>; + status =3D "okay"; + }; + + panel_dpi: panel-dpi { + compatible =3D "edt,et057090dhu"; + backlight =3D <&backlight>; + power-supply =3D <®_3v3>; + status =3D "okay"; + + port { + lcd_panel_in: endpoint { + remote-endpoint =3D <&lcdif_out>; + }; + }; }; =20 reg_module_3v3: regulator-module-3v3 { @@ -149,7 +166,7 @@ &i2c2 { scl-gpios =3D <&gpio1 30 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; status =3D "okay"; =20 - ad7879@2c { + ad7879_ts: touchscreen@2c { compatible =3D "adi,ad7879-1"; pinctrl-names =3D "default"; pinctrl-0 =3D <&pinctrl_snvs_ad7879_int>; @@ -170,6 +187,12 @@ &lcdif { pinctrl-names =3D "default"; pinctrl-0 =3D <&pinctrl_lcdif_dat &pinctrl_lcdif_ctrl>; + + port { + lcdif_out: endpoint { + remote-endpoint =3D <&lcd_panel_in>; + }; + }; }; =20 &pwm4 { --=20 2.35.1 From nobody Mon May 11 04:52:39 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C6212C433FE for ; Thu, 14 Apr 2022 08:52:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238790AbiDNIyn (ORCPT ); Thu, 14 Apr 2022 04:54:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57642 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241208AbiDNIyf (ORCPT ); Thu, 14 Apr 2022 04:54:35 -0400 Received: from mout.perfora.net (mout.perfora.net [74.208.4.197]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 031E06620C; Thu, 14 Apr 2022 01:51:56 -0700 (PDT) Received: from toolbox.toradex.int ([31.10.206.124]) by mrelay.perfora.net (mreueus004 [74.208.5.2]) with ESMTPSA (Nemesis) id 1MV5f0-1nUNMN0tAU-00SAgE; Thu, 14 Apr 2022 10:51:45 +0200 From: Marcel Ziswiler To: linux-arm-kernel@lists.infradead.org Cc: Oleksandr Suvorov , Denys Drozdov , Marcel Ziswiler , Fabio Estevam , Frank Rowand , Krzysztof Kozlowski , NXP Linux Team , Pengutronix Kernel Team , Rob Herring , Russell King , Sascha Hauer , Shawn Guo , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v1 08/14] ARM: dts: imx6ull-colibri: add gpio-line-names Date: Thu, 14 Apr 2022 10:51:00 +0200 Message-Id: <20220414085106.18621-9-marcel@ziswiler.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220414085106.18621-1-marcel@ziswiler.com> References: <20220414085106.18621-1-marcel@ziswiler.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:xVrXa6Dp1jqRjVWs8qnprkpstzzJjMWh/P4Dwr6W0GUGRk5k0GX pVO5CFuEwinRrpwhxf/JasqAbKL4yLCO88z0ylMmZekEAh3z1w6dvbL8FvbxXSX/2FufFUf b+QWIk+WglHlfRPn+FWAj+rL11A55JWR+ksnpw6E85nsmU10lygI+puuFkg8IPtcJbhKZWg uqJP4+jRKjW+t0lTwsdyQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:iJrN1vKwZTE=:si8QqmHWYBEZRn3NR525tz dqNDAA4jsDg0VAnWQgo6ip2jPoZgBEu1S+1oSe0KNJgpGVXYHZXjoZreoVFUUD4Bkh9Rze53r zqNVJp7bDbF7J/4TfF842d9tz45PW5CpJHYk/QoHR8SP8OjG7L5ZcE89e1c/iH6/xsY9xg1sM /5iKESO4MEEtrVLErH4d1i+6NUWeVWcxI+znYywaIC9DymKkthQk+jT2PFn/j+EDvnOf0Cv3F Xq7Kn9dyNhrCRLJ8IObGCewN0/LJIY+85U5m2iyOsijWCrZuvinFeIhJ2IkWHqhjIhMtmpWRb 5znCu5nUzLSbpJO8VCTxS+v2hbm4M0A18SN27Rj8nbjsfXxGks60KCLhzC+pigdv3LmsssGx4 xDkjFeMd3tCr8yE85H0ZdDJwxQnealwnKjUt+FkytsKqTON+TYW3/6+/CSHX1K6tC7H2pDyHS Ndmwxzmj7XoslLnandDHFnqT9WsRx9xBdq8qneXPhA1QYP41JQUxCZr8bNrV7DW8hfJ25r3/Y NNgUZ4edPW6jJL0IqR9DfITyYwdqA2KCuMJfu7QI2jVFqcMn8Cc/P3jgNfXtYL/yFGhTqUEUU wAFnKzR25RFEFj73c18UZdXYWabvB5rXbQ/5LsMGPnlJo9e6ZMKcZT7LL4vTZDSxsBBEMggyV mrqVwbVKkjmE4MCU+81lFdlo8qcn0fAAOvT6/5W02MMo81dJh0aY5OWGkEOWTmfUXso0= Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Oleksandr Suvorov Add GPIO line names on module-level. Those are all GPIOs that a user might use on his custom carrier board. If more meaningful names are available on the carrier board, the user can overwrite the line names in the carrier board-level device tree. Signed-off-by: Oleksandr Suvorov Signed-off-by: Denys Drozdov Signed-off-by: Marcel Ziswiler --- .../arm/boot/dts/imx6ull-colibri-nonwifi.dtsi | 137 ++++++++++++++++++ arch/arm/boot/dts/imx6ull-colibri-wifi.dtsi | 136 +++++++++++++++++ 2 files changed, 273 insertions(+) diff --git a/arch/arm/boot/dts/imx6ull-colibri-nonwifi.dtsi b/arch/arm/boot= /dts/imx6ull-colibri-nonwifi.dtsi index 5e55a6c820bc..60f169227ad9 100644 --- a/arch/arm/boot/dts/imx6ull-colibri-nonwifi.dtsi +++ b/arch/arm/boot/dts/imx6ull-colibri-nonwifi.dtsi @@ -12,6 +12,143 @@ memory@80000000 { }; }; =20 +&gpio1 { + gpio-line-names =3D "SODIMM_8", + "SODIMM_6", + "SODIMM_129", + "SODIMM_89", + "SODIMM_19", + "SODIMM_21", + "UNUSABLE_SODIMM_180", + "UNUSABLE_SODIMM_184", + "SODIMM_4", + "SODIMM_2", + "SODIMM_106", + "SODIMM_71", + "SODIMM_23", + "SODIMM_31", + "SODIMM_99", + "SODIMM_102", + "SODIMM_33", + "SODIMM_35", + "SODIMM_25", + "SODIMM_27", + "SODIMM_36", + "SODIMM_38", + "SODIMM_32", + "SODIMM_34", + "SODIMM_135", + "SODIMM_77", + "SODIMM_100", + "SODIMM_186", + "SODIMM_196", + "SODIMM_194"; +}; + +&gpio2 { + gpio-line-names =3D "SODIMM_55", + "SODIMM_63", + "SODIMM_178", + "SODIMM_188", + "SODIMM_73", + "SODIMM_30", + "SODIMM_67", + "SODIMM_104", + "", + "", + "", + "", + "", + "", + "", + "", + "SODIMM_190", + "SODIMM_47", + "SODIMM_192", + "SODIMM_49", + "SODIMM_51", + "SODIMM_53"; +}; + +&gpio3 { + gpio-line-names =3D "SODIMM_56", + "SODIMM_44", + "SODIMM_68", + "SODIMM_82", + "", + "SODIMM_76", + "SODIMM_70", + "SODIMM_60", + "SODIMM_58", + "SODIMM_78", + "SODIMM_72", + "SODIMM_80", + "SODIMM_46", + "SODIMM_62", + "SODIMM_48", + "SODIMM_74", + "SODIMM_50", + "SODIMM_52", + "SODIMM_54", + "SODIMM_66", + "SODIMM_64", + "SODIMM_57", + "SODIMM_61", + "SODIMM_29", + "SODIMM_37", + "SODIMM_88", + "SODIMM_86", + "SODIMM_92", + "SODIMM_90"; +}; + +&gpio4 { + gpio-line-names =3D "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "SODIMM_59", + "", + "", + "SODIMM_133", + "", + "SODIMM_28", + "SODIMM_75", + "SODIMM_96", + "SODIMM_81", + "SODIMM_94", + "SODIMM_101", + "SODIMM_103", + "SODIMM_79", + "SODIMM_97", + "SODIMM_69", + "SODIMM_98", + "SODIMM_85", + "SODIMM_65"; +}; + +&gpio5 { + gpio-line-names =3D "SODIMM_43", + "SODIMM_45", + "SODIMM_137", + "SODIMM_95", + "SODIMM_107", + "SODIMM_131", + "SODIMM_93", + "", + "SODIMM_138", + "", + "SODIMM_105", + "SODIMM_127"; +}; + &iomuxc { pinctrl-names =3D "default"; pinctrl-0 =3D <&pinctrl_gpio1 &pinctrl_gpio2 &pinctrl_gpio3 diff --git a/arch/arm/boot/dts/imx6ull-colibri-wifi.dtsi b/arch/arm/boot/dt= s/imx6ull-colibri-wifi.dtsi index 6e8ddb07e11d..3c47cfa7afa5 100644 --- a/arch/arm/boot/dts/imx6ull-colibri-wifi.dtsi +++ b/arch/arm/boot/dts/imx6ull-colibri-wifi.dtsi @@ -23,6 +23,142 @@ &cpu0 { clock-frequency =3D <792000000>; }; =20 +&gpio1 { + gpio-line-names =3D "SODIMM_8", + "SODIMM_6", + "SODIMM_129", + "", + "SODIMM_19", + "SODIMM_21", + "UNUSABLE_SODIMM_180", + "UNUSABLE_SODIMM_184", + "SODIMM_4", + "SODIMM_2", + "SODIMM_106", + "SODIMM_71", + "SODIMM_23", + "SODIMM_31", + "SODIMM_99", + "SODIMM_102", + "SODIMM_33", + "SODIMM_35", + "SODIMM_25", + "SODIMM_27", + "SODIMM_36", + "SODIMM_38", + "SODIMM_32", + "SODIMM_34", + "SODIMM_135", + "SODIMM_77", + "SODIMM_100", + "SODIMM_186", + "SODIMM_196", + "SODIMM_194"; +}; + +&gpio2 { + gpio-line-names =3D "SODIMM_55", + "SODIMM_63", + "SODIMM_178", + "SODIMM_188", + "SODIMM_73", + "SODIMM_30", + "SODIMM_67", + "SODIMM_104", + "", + "", + "", + "", + "", + "", + "", + "", + "SODIMM_190", + "SODIMM_47", + "SODIMM_192", + "SODIMM_49", + "SODIMM_51", + "SODIMM_53"; +}; + +&gpio3 { + gpio-line-names =3D "SODIMM_56", + "SODIMM_44", + "SODIMM_68", + "SODIMM_82", + "", + "SODIMM_76", + "SODIMM_70", + "SODIMM_60", + "SODIMM_58", + "SODIMM_78", + "SODIMM_72", + "SODIMM_80", + "SODIMM_46", + "SODIMM_62", + "SODIMM_48", + "SODIMM_74", + "SODIMM_50", + "SODIMM_52", + "SODIMM_54", + "SODIMM_66", + "SODIMM_64", + "SODIMM_57", + "SODIMM_61", + "SODIMM_29", + "SODIMM_37", + "SODIMM_88", + "SODIMM_86", + "SODIMM_92", + "SODIMM_90"; +}; + +&gpio4 { + gpio-line-names =3D "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "SODIMM_59", + "", + "", + "SODIMM_133", + "", + "SODIMM_28", + "SODIMM_75", + "SODIMM_96", + "", + "", + "", + "", + "", + "", + "SODIMM_69", + "SODIMM_98", + "SODIMM_85", + "SODIMM_65"; +}; + +&gpio5 { + gpio-line-names =3D "SODIMM_43", + "SODIMM_45", + "SODIMM_137", + "SODIMM_95", + "SODIMM_107", + "SODIMM_131", + "", + "", + "", + "", + "SODIMM_105"; +}; + &iomuxc { pinctrl-names =3D "default"; pinctrl-0 =3D <&pinctrl_gpio1 &pinctrl_gpio2 &pinctrl_gpio3 --=20 2.35.1 From nobody Mon May 11 04:52:39 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B1D09C433F5 for ; Thu, 14 Apr 2022 08:52:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241242AbiDNIy5 (ORCPT ); Thu, 14 Apr 2022 04:54:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57366 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241173AbiDNIyn (ORCPT ); Thu, 14 Apr 2022 04:54:43 -0400 Received: from mout.perfora.net (mout.perfora.net [74.208.4.194]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 53597674E1; Thu, 14 Apr 2022 01:52:07 -0700 (PDT) Received: from toolbox.toradex.int ([31.10.206.124]) by mrelay.perfora.net (mreueus004 [74.208.5.2]) with ESMTPSA (Nemesis) id 1MORpi-1nJR990LCY-00Pvdi; Thu, 14 Apr 2022 10:51:49 +0200 From: Marcel Ziswiler To: linux-arm-kernel@lists.infradead.org Cc: Denys Drozdov , Marcel Ziswiler , Alexander Stein , Fabio Estevam , Frank Rowand , Krzysztof Kozlowski , Li Yang , Lucas Stach , Matthias Schiffer , Oleksij Rempel , Rob Herring , Russell King , Sascha Hauer , Shawn Guo , Tim Harvey , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v1 09/14] dt-bindings: arm: fsl: add toradex,colibri-imx6ull Date: Thu, 14 Apr 2022 10:51:01 +0200 Message-Id: <20220414085106.18621-10-marcel@ziswiler.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220414085106.18621-1-marcel@ziswiler.com> References: <20220414085106.18621-1-marcel@ziswiler.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:3cQQN0m2Y0acZm4QyHI5m9L3yBmuPxyJkdOaFPRqvlCZ6FG+ify cfraR6MPigvPEhSys5XF25FFmS9DsZHFu1l9JqpzSY7SHxJSMiCAaFCdgWXbJOmRvVd664S yAcIbq6rcRDSXHk18vMvqknTIINq4gYkTU+is7tfIs9GkaHdjWlzQaossb81xibvAMkdXy0 TOJ5r1EnJa/aQyeQME0Sg== X-UI-Out-Filterresults: notjunk:1;V03:K0:styuX4ejQJ8=:C3fw+7tUZ6SRrQ52eFNohC /QwRT9PKnq2DVBnFVL3mEtwSDHocg4tjustQ75FVZBRMIFOZPagvSpUz75GwCPrdpKgzfXMFA LwmUGBIQdC2a1OdVVgX5Ulj9zlyPwwGsWERbCY2UD/MjG6E/1LjKKf/lxe5mPS4xB7XeDgIQj ygsFDZw8nwaD7Nf0DYR8q1+dtwEJX0igLSsroThBiYK/Vp3nSgGx8mmlOLZxy5o/+1onjBpIO ovPCLMuzmr96c9zLbM2y3ZazARLlm2eMj0uOc/4h4kLoCpynNK7L8GHFVgaXKKdyRdEZino1l sSeVz4gBPlAcREaRF2amlQwBbwKm+FtUWPe/Dw88Ko0fzIRG/uqo5sSXr6YcxHd8W5N51rzfw cNUt/dIpPqYaBPLhfDFWXkz9/U2nIuyFQlzf35k5odUaISbneFlH0kF+G/JeNYTkeS2eBIKzB alKhMZXUFwWjGGFZkxnZY1bVjyvmOTgg4dg8H51inhyYic7NUDyyrgSCo6TmDr25eVEU5PEq1 KCu+vZDHfl/y3V7e0ltIZlO+z9GmefU45uiYIiePqTvfuwYEUJ2ltk6/Pv1JTgiU3zGNGZK4G ow8diV52dpqtSNAWa0DN6D7ycgF331QllIhO8k+xz2ejj4kimH+Y3fsBdTxycyC6+SRbMd0gj NnwLDsaHGOoa3PUeUwx1cwqoqjTrWgFqKfGb5HA0aLVmDXtFOQ8ilOymWIXUnBySBjYcRdaEY r+NiE8q8g8bk+I2X Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Denys Drozdov Add toradex,colibri-imx6ull for carrier board dts, including aster, iris and iris-v2 device tree, wifi and nonwifi variants for NAND and eMMC modules. Signed-off-by: Denys Drozdov Signed-off-by: Marcel Ziswiler --- .../devicetree/bindings/arm/fsl.yaml | 23 +++++++++++++------ 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/Documentation/devicetree/bindings/arm/fsl.yaml b/Documentation= /devicetree/bindings/arm/fsl.yaml index b6cc34115362..7baa854946e6 100644 --- a/Documentation/devicetree/bindings/arm/fsl.yaml +++ b/Documentation/devicetree/bindings/arm/fsl.yaml @@ -674,23 +674,32 @@ properties: - description: i.MX6ULL Boards with Toradex Colibri iMX6ULL Modules items: - enum: + - toradex,colibri-imx6ull-aster # Colibri iMX6ULL Module= on Aster Carrier Board - toradex,colibri-imx6ull-eval # Colibri iMX6ULL Module= on Colibri Evaluation Board + - toradex,colibri-imx6ull-iris # Colibri iMX6ULL Module= on Iris Carrier Board + - toradex,colibri-imx6ull-iris-v2 # Colibri iMX6ULL Module= on Iris V2 Carrier Board - const: toradex,colibri-imx6ull # Colibri iMX6ULL Module - - const: fsl,imx6dl + - const: fsl,imx6ull =20 - description: i.MX6ULL Boards with Toradex Colibri iMX6ULL 1GB (eMM= C) Module items: - enum: - - toradex,colibri-imx6ull-emmc-eval # Colibri iMX6ULL 1GB (e= MMC) M. on Colibri Evaluation Board - - const: toradex,colibri-imx6ull-emmc # Colibri iMX6ULL 1GB (e= MMC) Module - - const: fsl,imx6dl + - toradex,colibri-imx6ull-emmc-aster # Colibri iMX6ULL 1= G (eMMC) on Aster Carrier Board + - toradex,colibri-imx6ull-emmc-eval # Colibri iMX6ULL 1= G (eMMC) on Colibri Evaluation Board + - toradex,colibri-imx6ull-emmc-iris # Colibri iMX6ULL 1= G (eMMC) on Iris Carrier Board + - toradex,colibri-imx6ull-emmc-iris-v2 # Colibri iMX6ULL 1= G (eMMC) on Iris V2 Carrier Board + - const: toradex,colibri-imx6ull-emmc # Colibri iMX6ULL 1= GB (eMMC) Module + - const: fsl,imx6ull =20 - description: i.MX6ULL Boards with Toradex Colibri iMX6ULL Wi-Fi / = BT Modules items: - enum: - - toradex,colibri-imx6ull-wifi-eval # Colibri iMX6ULL Wi-Fi = / BT M. on Colibri Evaluation Board - - const: toradex,colibri-imx6ull-wifi # Colibri iMX6ULL Wi-Fi = / BT Module - - const: fsl,imx6dl + - toradex,colibri-imx6ull-wifi-eval # Colibri iMX6ULL Wi= -Fi / BT M. on Colibri Evaluation Board + - toradex,colibri-imx6ull-wifi-aster # Colibri iMX6ULL Wi= -Fi / BT M. on Aster Carrier Board + - toradex,colibri-imx6ull-wifi-iris # Colibri iMX6ULL Wi= -Fi / BT M. on Iris Carrier Board + - toradex,colibri-imx6ull-wifi-iris-v2 # Colibri iMX6ULL Wi= -Fi / BT M. on Iris V2 Carrier Board + - const: toradex,colibri-imx6ull-wifi # Colibri iMX6ULL Wi= -Fi / BT Module + - const: fsl,imx6ull =20 - description: Kontron N6411 S Board items: --=20 2.35.1 From nobody Mon May 11 04:52:39 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B78E5C433EF for ; Thu, 14 Apr 2022 08:53:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241207AbiDNIzX (ORCPT ); Thu, 14 Apr 2022 04:55:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58418 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241263AbiDNIyx (ORCPT ); Thu, 14 Apr 2022 04:54:53 -0400 Received: from mout.perfora.net (mout.perfora.net [74.208.4.194]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DEA84692B6; Thu, 14 Apr 2022 01:52:15 -0700 (PDT) Received: from toolbox.toradex.int ([31.10.206.124]) by mrelay.perfora.net (mreueus004 [74.208.5.2]) with ESMTPSA (Nemesis) id 1N8Won-1o0QGG03aj-014VyX; Thu, 14 Apr 2022 10:51:53 +0200 From: Marcel Ziswiler To: linux-arm-kernel@lists.infradead.org Cc: Denys Drozdov , Marcel Ziswiler , Arnd Bergmann , Fabio Estevam , Frank Rowand , Krzysztof Kozlowski , NXP Linux Team , Olof Johansson , Pengutronix Kernel Team , Rob Herring , Russell King , Sascha Hauer , Shawn Guo , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, soc@kernel.org Subject: [PATCH v1 10/14] ARM: dts: imx6ull-colibri: add support for toradex iris carrier boards Date: Thu, 14 Apr 2022 10:51:02 +0200 Message-Id: <20220414085106.18621-11-marcel@ziswiler.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220414085106.18621-1-marcel@ziswiler.com> References: <20220414085106.18621-1-marcel@ziswiler.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:lGb6SsltbKX+oAQD5fN56Ds9TW1ox27OGFvrpqDyoNSIbNGQ+hf BrbjxKXOzUD+41S6U0Wct9WLLc56qjBZ5GRS1o82mQBK64rhHaLWcROPf/AUGimumTML+LA Si8XTVe39miYIX+ugwH/THf4nEHdrOqKFX3xoNu9KIm83JuhddBFhMya6j91wuC1ElIrTqY CIvkYhg0v/wGwXuiYTf+g== X-UI-Out-Filterresults: notjunk:1;V03:K0:DQyjwTc4JTA=:KfPPxn8GhVb0iCFj5bAGf7 R6TldyMPhZC56Hiao5RGldtIf+8pS+lsSqoc8vx8aJwVE2z3oQjbChUwZ72CF8emS7VyP2+tq u3zAYYEASJRMOChdqqP0CtqJDypthGt6Yis+T/DtFqi1oX/bZNzh1LDFgPozG+S91Uz97jdyv aAvmQ/714K4PxwocRQmh3+xlJtiB63RFN3Y0d0G5rgbZpfRETFUEzaJ4ecva5SVoZzxtLr6lx TMff/TuZDtFb1C20OpM6KWOyGGxlJh4zM0KE+W2ZLG1cenYK196KcYGJhhq1YZlcDgA5d/5WW 0kHHl/aHhn2ygW/RECHQpEFw/n9O/AWzgN5qryp/TmVPt66LoskhzItQ8tqeG7YwGqBgL0Bmu z1lHDkTAQwoR8DbSL2vR+JaPvH3Q0d3bTyl/1zqcS5N5O+JG/AZ4jbKuqD9hp2Dg9Cm1AuY65 1l+6FGd0y/oZmcdzaeoUbWRLHR9nwkaXLhDPL51/+J7h+bLeVmWWxTZrpUeHINnswkZVc1Y2C O3BL/H2Pd3Xf7W1mlOIVJFaIZhUOrKBIWoYfZ3rBiHKzLHNbDBkeT37fQWkd6bRKnnIRazBTy kGzTABXrf4AISVz2a6eulvnks/KSMSsaZaiuimWrnmFgpszWnhpY4V4gaHk8f0nKIiw4PCgKg AZsoaUyNBea0gWjI+Dewk29gQmgbgJTk1nM+bVe/okjMnZj0JZojOQrCYNzx78p5lNGT/b2v7 tuqC9LYSJ726cBg2 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Denys Drozdov Add support for Toradex Iris, small form-factor Pico-ITX Colibri Arm Computer Module family carrier boards. Iris Device Trees: - imx6ull-colibri-iris.dtb - imx6ull-colibri-emmc-iris.dtb - imx6ull-colibri-wifi-iris.dtb Iris-V2 Device Trees: - imx6ull-colibri-iris-v2.dtb - imx6ull-colibri-emmc-iris-v2.dtb - imx6ull-colibri-wifi-iris-v2.dtb Signed-off-by: Denys Drozdov Signed-off-by: Marcel Ziswiler --- arch/arm/boot/dts/Makefile | 6 + .../boot/dts/imx6ull-colibri-emmc-iris-v2.dts | 17 +++ .../boot/dts/imx6ull-colibri-emmc-iris.dts | 17 +++ .../dts/imx6ull-colibri-emmc-nonwifi.dtsi | 4 +- arch/arm/boot/dts/imx6ull-colibri-eval-v3.dts | 6 +- .../arm/boot/dts/imx6ull-colibri-eval-v3.dtsi | 5 +- arch/arm/boot/dts/imx6ull-colibri-iris-v2.dts | 28 ++++ .../arm/boot/dts/imx6ull-colibri-iris-v2.dtsi | 27 ++++ arch/arm/boot/dts/imx6ull-colibri-iris.dts | 20 +++ arch/arm/boot/dts/imx6ull-colibri-iris.dtsi | 132 ++++++++++++++++++ .../arm/boot/dts/imx6ull-colibri-nonwifi.dtsi | 4 +- .../boot/dts/imx6ull-colibri-wifi-eval-v3.dts | 4 +- .../boot/dts/imx6ull-colibri-wifi-iris-v2.dts | 28 ++++ .../boot/dts/imx6ull-colibri-wifi-iris.dts | 20 +++ arch/arm/boot/dts/imx6ull-colibri-wifi.dtsi | 4 +- arch/arm/boot/dts/imx6ull-colibri.dtsi | 4 +- 16 files changed, 311 insertions(+), 15 deletions(-) create mode 100644 arch/arm/boot/dts/imx6ull-colibri-emmc-iris-v2.dts create mode 100644 arch/arm/boot/dts/imx6ull-colibri-emmc-iris.dts create mode 100644 arch/arm/boot/dts/imx6ull-colibri-iris-v2.dts create mode 100644 arch/arm/boot/dts/imx6ull-colibri-iris-v2.dtsi create mode 100644 arch/arm/boot/dts/imx6ull-colibri-iris.dts create mode 100644 arch/arm/boot/dts/imx6ull-colibri-iris.dtsi create mode 100644 arch/arm/boot/dts/imx6ull-colibri-wifi-iris-v2.dts create mode 100644 arch/arm/boot/dts/imx6ull-colibri-wifi-iris.dts diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 252353fb4e3b..53b41ef092d9 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -705,8 +705,14 @@ dtb-$(CONFIG_SOC_IMX6UL) +=3D \ imx6ul-tx6ul-mainboard.dtb \ imx6ull-14x14-evk.dtb \ imx6ull-colibri-emmc-eval-v3.dtb \ + imx6ull-colibri-emmc-iris.dtb \ + imx6ull-colibri-emmc-iris-v2.dtb \ imx6ull-colibri-eval-v3.dtb \ + imx6ull-colibri-iris.dtb \ + imx6ull-colibri-iris-v2.dtb \ imx6ull-colibri-wifi-eval-v3.dtb \ + imx6ull-colibri-wifi-iris.dtb \ + imx6ull-colibri-wifi-iris-v2.dtb \ imx6ull-jozacp.dtb \ imx6ull-myir-mys-6ulx-eval.dtb \ imx6ull-opos6uldev.dtb \ diff --git a/arch/arm/boot/dts/imx6ull-colibri-emmc-iris-v2.dts b/arch/arm/= boot/dts/imx6ull-colibri-emmc-iris-v2.dts new file mode 100644 index 000000000000..b9060c2f7977 --- /dev/null +++ b/arch/arm/boot/dts/imx6ull-colibri-emmc-iris-v2.dts @@ -0,0 +1,17 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT +/* + * Copyright 2022 Toradex + */ + +/dts-v1/; + +#include "imx6ull-colibri-emmc-nonwifi.dtsi" +#include "imx6ull-colibri-iris-v2.dtsi" + +/ { + model =3D "Toradex Colibri iMX6ULL 1G (eMMC) on Colibri Iris V2"; + compatible =3D "toradex,colibri-imx6ull-iris-v2", + "toradex,colibri-imx6ull-emmc", + "toradex,colibri-imx6ull", + "fsl,imx6ull"; +}; diff --git a/arch/arm/boot/dts/imx6ull-colibri-emmc-iris.dts b/arch/arm/boo= t/dts/imx6ull-colibri-emmc-iris.dts new file mode 100644 index 000000000000..0ab71f2f5daa --- /dev/null +++ b/arch/arm/boot/dts/imx6ull-colibri-emmc-iris.dts @@ -0,0 +1,17 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT +/* + * Copyright 2022 Toradex + */ + +/dts-v1/; + +#include "imx6ull-colibri-emmc-nonwifi.dtsi" +#include "imx6ull-colibri-iris.dtsi" + +/ { + model =3D "Toradex Colibri iMX6ULL 1GB (eMMC) on Colibri Iris"; + compatible =3D "toradex,colibri-imx6ull-emmc-iris", + "toradex,colibri-imx6ull-emmc", + "toradex,colibri-imx6ull", + "fsl,imx6ull"; +}; diff --git a/arch/arm/boot/dts/imx6ull-colibri-emmc-nonwifi.dtsi b/arch/arm= /boot/dts/imx6ull-colibri-emmc-nonwifi.dtsi index a099abfdfa27..1d75bc671f75 100644 --- a/arch/arm/boot/dts/imx6ull-colibri-emmc-nonwifi.dtsi +++ b/arch/arm/boot/dts/imx6ull-colibri-emmc-nonwifi.dtsi @@ -1,6 +1,6 @@ -// SPDX-License-Identifier: GPL-2.0+ OR MIT +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT /* - * Copyright 2021 Toradex + * Copyright 2022 Toradex */ =20 #include "imx6ull-colibri.dtsi" diff --git a/arch/arm/boot/dts/imx6ull-colibri-eval-v3.dts b/arch/arm/boot/= dts/imx6ull-colibri-eval-v3.dts index 08669a18349e..9bf7111d7b00 100644 --- a/arch/arm/boot/dts/imx6ull-colibri-eval-v3.dts +++ b/arch/arm/boot/dts/imx6ull-colibri-eval-v3.dts @@ -1,6 +1,6 @@ -// SPDX-License-Identifier: (GPL-2.0 OR MIT) +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT /* - * Copyright 2018 Toradex AG + * Copyright 2018-2022 Toradex */ =20 /dts-v1/; @@ -9,6 +9,6 @@ #include "imx6ull-colibri-eval-v3.dtsi" =20 / { - model =3D "Toradex Colibri iMX6ULL 256MB on Colibri Evaluation Board V3"; + model =3D "Toradex Colibri iMX6ULL 256/512MB on Colibri Evaluation Board = V3"; compatible =3D "toradex,colibri-imx6ull-eval", "fsl,imx6ull"; }; diff --git a/arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi b/arch/arm/boot= /dts/imx6ull-colibri-eval-v3.dtsi index 3c07b4273e80..08197c66af12 100644 --- a/arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi +++ b/arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi @@ -1,6 +1,6 @@ -// SPDX-License-Identifier: (GPL-2.0 OR MIT) +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT /* - * Copyright 2017 Toradex AG + * Copyright 2017-2022 Toradex */ =20 / { @@ -121,6 +121,7 @@ &uart5 { }; =20 &usbotg1 { + vbus-supply =3D <®_usbh_vbus>; status =3D "okay"; }; =20 diff --git a/arch/arm/boot/dts/imx6ull-colibri-iris-v2.dts b/arch/arm/boot/= dts/imx6ull-colibri-iris-v2.dts new file mode 100644 index 000000000000..47940a4ba6e6 --- /dev/null +++ b/arch/arm/boot/dts/imx6ull-colibri-iris-v2.dts @@ -0,0 +1,28 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT +/* + * Copyright 2018-2022 Toradex + */ + +/dts-v1/; + +#include "imx6ull-colibri-nonwifi.dtsi" +#include "imx6ull-colibri-iris-v2.dtsi" + +/ { + model =3D "Toradex Colibri iMX6ULL 256M/512B on Colibri Iris V2"; + compatible =3D "toradex,colibri-imx6ull-iris-v2", + "toradex,colibri-imx6ull", + "fsl,imx6ull"; +}; + +&atmel_mxt_ts { + status =3D "okay"; +}; + +&gpio1 { + lvds_tx_on { + gpio-hog; + gpios =3D <14 GPIO_ACTIVE_HIGH>; + output-high; + }; +}; diff --git a/arch/arm/boot/dts/imx6ull-colibri-iris-v2.dtsi b/arch/arm/boot= /dts/imx6ull-colibri-iris-v2.dtsi new file mode 100644 index 000000000000..93649cad0cc0 --- /dev/null +++ b/arch/arm/boot/dts/imx6ull-colibri-iris-v2.dtsi @@ -0,0 +1,27 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT +/* + * Copyright 2018-2022 Toradex + */ + +#include "imx6ull-colibri-iris.dtsi" + +/ { + reg_3v3_vmmc: regulator-3v3-vmmc { + compatible =3D "regulator-fixed"; + regulator-name =3D "3v3_vmmc"; + regulator-min-microvolt =3D <3300000>; + regulator-max-microvolt =3D <3300000>; + gpio =3D <&gpio1 26 GPIO_ACTIVE_HIGH>; + startup-delay-us =3D <100>; + enable-active-high; + }; +}; + + +&usdhc1 { + cap-power-off-card; + vmmc-supply =3D <®_3v3_vmmc>; + /delete-property/ keep-power-in-suspend; + /delete-property/ no-1-8-v; + status =3D "okay"; +}; diff --git a/arch/arm/boot/dts/imx6ull-colibri-iris.dts b/arch/arm/boot/dts= /imx6ull-colibri-iris.dts new file mode 100644 index 000000000000..4fb97b0fe30b --- /dev/null +++ b/arch/arm/boot/dts/imx6ull-colibri-iris.dts @@ -0,0 +1,20 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT +/* + * Copyright 2018-2022 Toradex + */ + +/dts-v1/; + +#include "imx6ull-colibri-nonwifi.dtsi" +#include "imx6ull-colibri-iris.dtsi" + +/ { + model =3D "Toradex Colibri iMX6ULL 256/512MB on Colibri Iris"; + compatible =3D "toradex,colibri-imx6ull-iris", + "toradex,colibri-imx6ull", + "fsl,imx6ull"; +}; + +&atmel_mxt_ts { + status =3D "okay"; +}; diff --git a/arch/arm/boot/dts/imx6ull-colibri-iris.dtsi b/arch/arm/boot/dt= s/imx6ull-colibri-iris.dtsi new file mode 100644 index 000000000000..eb30353e7fa8 --- /dev/null +++ b/arch/arm/boot/dts/imx6ull-colibri-iris.dtsi @@ -0,0 +1,132 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT +/* + * Copyright 2018-2022 Toradex + */ + +/ { + chosen { + stdout-path =3D "serial0:115200n8"; + }; + + gpio-keys { + compatible =3D "gpio-keys"; + pinctrl-names =3D "default"; + pinctrl-0 =3D <&pinctrl_snvs_gpiokeys>; + + power { + label =3D "Wake-Up"; + gpios =3D <&gpio5 1 GPIO_ACTIVE_HIGH>; + linux,code =3D ; + debounce-interval =3D <10>; + wakeup-source; + }; + }; + + reg_3v3: regulator-3v3 { + compatible =3D "regulator-fixed"; + regulator-name =3D "3.3V"; + regulator-min-microvolt =3D <3300000>; + regulator-max-microvolt =3D <3300000>; + }; + + reg_5v0: regulator-5v0 { + compatible =3D "regulator-fixed"; + regulator-name =3D "5V"; + regulator-min-microvolt =3D <5000000>; + regulator-max-microvolt =3D <5000000>; + }; + + reg_usbh_vbus: regulator-usbh-vbus { + compatible =3D "regulator-fixed"; + pinctrl-names =3D "default"; + pinctrl-0 =3D <&pinctrl_usbh_reg>; + regulator-name =3D "VCC_USB[1-4]"; + regulator-min-microvolt =3D <5000000>; + regulator-max-microvolt =3D <5000000>; + gpio =3D <&gpio1 2 GPIO_ACTIVE_LOW>; + vin-supply =3D <®_5v0>; + }; +}; + +&adc1 { + status =3D "okay"; +}; + +&i2c1 { + status =3D "okay"; + + /* M41T0M6 real time clock on carrier board */ + m41t0m6: rtc@68 { + compatible =3D "st,m41t0"; + reg =3D <0x68>; + }; +}; + +/* PWM */ +&pwm4 { + status =3D "okay"; +}; + +/* PWM */ +&pwm5 { + status =3D "okay"; +}; + +/* PWM */ +&pwm6 { + status =3D "okay"; +}; + +/* PWM */ +&pwm7 { + status =3D "okay"; +}; + +&uart1 { + status =3D "okay"; +}; + +&uart2 { + status =3D "okay"; +}; + +&uart5 { + status =3D "okay"; +}; + +&usbotg1 { + vbus-supply =3D <®_usbh_vbus>; + status =3D "okay"; +}; + +&usbotg2 { + vbus-supply =3D <®_usbh_vbus>; + status =3D "okay"; +}; + +&usdhc1 { + vmmc-supply =3D <®_3v3>; + status =3D "okay"; +}; + +&gpio1 { + /* + * uart25_tx_on turns the UART transceiver on. If one wants to turn the + * transceiver off, that property has to be deleted and the gpio handled + * in userspace. + * The same applies to uart1_tx_on. + */ + uart25_tx_on { + gpio-hog; + gpios =3D <15 0>; + output-high; + }; +}; + +&gpio2 { + uart1_tx_on { + gpio-hog; + gpios =3D <7 0>; + output-high; + }; +}; diff --git a/arch/arm/boot/dts/imx6ull-colibri-nonwifi.dtsi b/arch/arm/boot= /dts/imx6ull-colibri-nonwifi.dtsi index 60f169227ad9..88901db255d6 100644 --- a/arch/arm/boot/dts/imx6ull-colibri-nonwifi.dtsi +++ b/arch/arm/boot/dts/imx6ull-colibri-nonwifi.dtsi @@ -1,6 +1,6 @@ -// SPDX-License-Identifier: (GPL-2.0 OR MIT) +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT /* - * Copyright 2018 Toradex AG + * Copyright 2018-2022 Toradex */ =20 #include "imx6ull-colibri.dtsi" diff --git a/arch/arm/boot/dts/imx6ull-colibri-wifi-eval-v3.dts b/arch/arm/= boot/dts/imx6ull-colibri-wifi-eval-v3.dts index df72ce1ae2cb..1d64d1a5d8a7 100644 --- a/arch/arm/boot/dts/imx6ull-colibri-wifi-eval-v3.dts +++ b/arch/arm/boot/dts/imx6ull-colibri-wifi-eval-v3.dts @@ -1,6 +1,6 @@ -// SPDX-License-Identifier: (GPL-2.0 OR MIT) +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT /* - * Copyright 2018 Toradex AG + * Copyright 2018-2022 Toradex */ =20 /dts-v1/; diff --git a/arch/arm/boot/dts/imx6ull-colibri-wifi-iris-v2.dts b/arch/arm/= boot/dts/imx6ull-colibri-wifi-iris-v2.dts new file mode 100644 index 000000000000..ea610141a8bf --- /dev/null +++ b/arch/arm/boot/dts/imx6ull-colibri-wifi-iris-v2.dts @@ -0,0 +1,28 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT +/* + * Copyright 2018-2022 Toradex + */ + +/dts-v1/; + +#include "imx6ull-colibri-wifi.dtsi" +#include "imx6ull-colibri-iris-v2.dtsi" + +/ { + model =3D "Toradex Colibri iMX6ULL 512MB on Colibri Iris V2"; + compatible =3D "toradex,colibri-imx6ull-wifi-iris-v2", + "toradex,colibri-imx6ull", + "fsl,imx6ull"; +}; + +&atmel_mxt_ts { + status =3D "okay"; +}; + +&gpio1 { + lvds_tx_on { + gpio-hog; + gpios =3D <14 GPIO_ACTIVE_HIGH>; + output-high; + }; +}; diff --git a/arch/arm/boot/dts/imx6ull-colibri-wifi-iris.dts b/arch/arm/boo= t/dts/imx6ull-colibri-wifi-iris.dts new file mode 100644 index 000000000000..5ac1aa298ce7 --- /dev/null +++ b/arch/arm/boot/dts/imx6ull-colibri-wifi-iris.dts @@ -0,0 +1,20 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT +/* + * Copyright 2018-2022 Toradex + */ + +/dts-v1/; + +#include "imx6ull-colibri-wifi.dtsi" +#include "imx6ull-colibri-iris.dtsi" + +/ { + model =3D "Toradex Colibri iMX6ULL 512MB on Colibri Iris"; + compatible =3D "toradex,colibri-imx6ull-wifi-iris", + "toradex,colibri-imx6ull", + "fsl,imx6ull"; +}; + +&atmel_mxt_ts { + status =3D "okay"; +}; diff --git a/arch/arm/boot/dts/imx6ull-colibri-wifi.dtsi b/arch/arm/boot/dt= s/imx6ull-colibri-wifi.dtsi index 3c47cfa7afa5..db59ee6b1c86 100644 --- a/arch/arm/boot/dts/imx6ull-colibri-wifi.dtsi +++ b/arch/arm/boot/dts/imx6ull-colibri-wifi.dtsi @@ -1,6 +1,6 @@ -// SPDX-License-Identifier: (GPL-2.0 OR MIT) +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT /* - * Copyright 2018 Toradex AG + * Copyright 2018-2022 Toradex */ =20 #include "imx6ull-colibri.dtsi" diff --git a/arch/arm/boot/dts/imx6ull-colibri.dtsi b/arch/arm/boot/dts/imx= 6ull-colibri.dtsi index a1e26ac4d1e7..59731ae7d04d 100644 --- a/arch/arm/boot/dts/imx6ull-colibri.dtsi +++ b/arch/arm/boot/dts/imx6ull-colibri.dtsi @@ -1,6 +1,6 @@ -// SPDX-License-Identifier: GPL-2.0+ OR MIT +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT /* - * Copyright 2018-2021 Toradex + * Copyright 2018-2022 Toradex */ =20 #include "imx6ull.dtsi" --=20 2.35.1 From nobody Mon May 11 04:52:39 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 642A2C433F5 for ; Thu, 14 Apr 2022 08:52:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241333AbiDNIzD (ORCPT ); Thu, 14 Apr 2022 04:55:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58396 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241251AbiDNIyw (ORCPT ); Thu, 14 Apr 2022 04:54:52 -0400 Received: from mout.perfora.net (mout.perfora.net [74.208.4.194]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 74EEA66230; Thu, 14 Apr 2022 01:52:14 -0700 (PDT) Received: from toolbox.toradex.int ([31.10.206.124]) by mrelay.perfora.net (mreueus004 [74.208.5.2]) with ESMTPSA (Nemesis) id 1MzQ0y-1nrvoq2wzo-00vPIy; Thu, 14 Apr 2022 10:51:57 +0200 From: Marcel Ziswiler To: linux-arm-kernel@lists.infradead.org Cc: Denys Drozdov , Marcel Ziswiler , Arnd Bergmann , Fabio Estevam , Frank Rowand , Krzysztof Kozlowski , NXP Linux Team , Olof Johansson , Pengutronix Kernel Team , Rob Herring , Russell King , Sascha Hauer , Shawn Guo , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, soc@kernel.org Subject: [PATCH v1 11/14] ARM: dts: imx6ull-colibri: add support for toradex aster carrier boards Date: Thu, 14 Apr 2022 10:51:03 +0200 Message-Id: <20220414085106.18621-12-marcel@ziswiler.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220414085106.18621-1-marcel@ziswiler.com> References: <20220414085106.18621-1-marcel@ziswiler.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:s/d8+OhtDoA+sST0wFuPWRe/6NNBxseHzH//qRM0sEJOyvgS+hI PP52z0tWu0anqQ3zw1x0Ep6L5oultwBUIVmxytoXSm2MACxFADzM9+4kacgG2hurtIgya2C OpBYJblSNtrL/XUdCb5xZLHjQ8aI0tzBkP3LsOm6qTwcl6/lj1RJzb22P1pNKGqVBikm2eA MOKJ5TcHIn0DS0PKRy4dg== X-UI-Out-Filterresults: notjunk:1;V03:K0:loiBPaUrHkM=:5RviezFiq05+y5EgleuH6z /M6EdO4+HBnEPYde0AnLmtajhKWIqvB4kebESo1cyi2K9uxqVp0aOiaDgmbv5u9ueKAwZVjPl igVLkcUrKcDAnHfM59qyZYUefvfZrBHvti/XxDrgjr2J3HiulOPIhrDmGa9fanVeJcOoYHVnO rtgGGM3Jog0DYCPkmDDsUBZcBRKTmT4dJGmIh4CSLdYpervemzsyT3Z6fFIi8wIJ/b58un2+l SNI9KeE8O2o4NzA5sk0Qt5IHPQvCzn2UOTiHxbHQSU1JCMZ4i8M6Y/RztfSIopdokFO9xUK3H wPiI0qaJsFzGz8GD4ygAZm/f7kBj2g1ETphI8mc0vTcw6PiCSqL3chNjqJksqhJXQ1UV8U4ht kwfe5p7FAgVhzYo9BE2z7AnT6BEtWicZfJo4mgFJIv/E2oEySa3UW/bKsQVZK7ByHg+n/bauR dlN8I7uH1ekSkAKt7TGu2i3q38wCsdSWwmtdkEm3v4sEJ84ELvPktppFa0c4hYzkSPBAKbbsM ovD9c1strSMGUXqjI+zl3NheqwOkSiwsMfnm5u3uNPGWkVxNu/j22LKNsc7VFcoikuqDaUuW4 +cgdrcFsilqu5rTJl8xT1g6fSV1oE+OS7xVALx83mmQD0zZ92IBSKeyeU6wEY7tYdgfGgj68g 2RlG/2cwXci589cpfsp9Ip831MZLtF5FpOwGtiUKOTQmZ+EQba7woV1qPNoaYdZjipIENqSC4 +x69qhNUFXsvb6v3 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Denys Drozdov Add support for Toradex Aster, small form-factor Colibri Arm Computer Module family carrier board. Aster Device Trees: - imx6ull-colibri-aster.dtb - imx6ull-colibri-emmc-aster.dtb - imx6ull-colibri-wifi-aster.dtb Signed-off-by: Denys Drozdov Signed-off-by: Marcel Ziswiler --- arch/arm/boot/dts/Makefile | 3 + arch/arm/boot/dts/imx6ull-colibri-aster.dts | 20 +++ arch/arm/boot/dts/imx6ull-colibri-aster.dtsi | 145 ++++++++++++++++++ .../boot/dts/imx6ull-colibri-emmc-aster.dts | 17 ++ .../boot/dts/imx6ull-colibri-wifi-aster.dts | 20 +++ 5 files changed, 205 insertions(+) create mode 100644 arch/arm/boot/dts/imx6ull-colibri-aster.dts create mode 100644 arch/arm/boot/dts/imx6ull-colibri-aster.dtsi create mode 100644 arch/arm/boot/dts/imx6ull-colibri-emmc-aster.dts create mode 100644 arch/arm/boot/dts/imx6ull-colibri-wifi-aster.dts diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 53b41ef092d9..2ba1ce9883c8 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -704,12 +704,15 @@ dtb-$(CONFIG_SOC_IMX6UL) +=3D \ imx6ul-tx6ul-0011.dtb \ imx6ul-tx6ul-mainboard.dtb \ imx6ull-14x14-evk.dtb \ + imx6ull-colibri-aster.dtb \ + imx6ull-colibri-emmc-aster.dtb \ imx6ull-colibri-emmc-eval-v3.dtb \ imx6ull-colibri-emmc-iris.dtb \ imx6ull-colibri-emmc-iris-v2.dtb \ imx6ull-colibri-eval-v3.dtb \ imx6ull-colibri-iris.dtb \ imx6ull-colibri-iris-v2.dtb \ + imx6ull-colibri-wifi-aster.dtb \ imx6ull-colibri-wifi-eval-v3.dtb \ imx6ull-colibri-wifi-iris.dtb \ imx6ull-colibri-wifi-iris-v2.dtb \ diff --git a/arch/arm/boot/dts/imx6ull-colibri-aster.dts b/arch/arm/boot/dt= s/imx6ull-colibri-aster.dts new file mode 100644 index 000000000000..d3f2fb7c6c1e --- /dev/null +++ b/arch/arm/boot/dts/imx6ull-colibri-aster.dts @@ -0,0 +1,20 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT +/* + * Copyright 2017-2022 Toradex + */ + +/dts-v1/; + +#include "imx6ull-colibri-nonwifi.dtsi" +#include "imx6ull-colibri-aster.dtsi" + +/ { + model =3D "Toradex Colibri iMX6ULL 256/512MB on Colibri Aster"; + compatible =3D "toradex,colibri-imx6ull-aster", + "toradex,colibri-imx6ull", + "fsl,imx6ull"; +}; + +&atmel_mxt_ts { + status =3D "okay"; +}; diff --git a/arch/arm/boot/dts/imx6ull-colibri-aster.dtsi b/arch/arm/boot/d= ts/imx6ull-colibri-aster.dtsi new file mode 100644 index 000000000000..c9133ba2d705 --- /dev/null +++ b/arch/arm/boot/dts/imx6ull-colibri-aster.dtsi @@ -0,0 +1,145 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT +/* + * Copyright 2017-2022 Toradex + */ + +/ { + chosen { + stdout-path =3D "serial0:115200n8"; + }; + + gpio-keys { + compatible =3D "gpio-keys"; + pinctrl-names =3D "default"; + pinctrl-0 =3D <&pinctrl_snvs_gpiokeys>; + + power { + label =3D "Wake-Up"; + gpios =3D <&gpio5 1 GPIO_ACTIVE_HIGH>; + linux,code =3D ; + debounce-interval =3D <10>; + wakeup-source; + }; + }; + + reg_3v3: regulator-3v3 { + compatible =3D "regulator-fixed"; + regulator-name =3D "3.3V"; + regulator-min-microvolt =3D <3300000>; + regulator-max-microvolt =3D <3300000>; + }; + + reg_5v0: regulator-5v0 { + compatible =3D "regulator-fixed"; + regulator-name =3D "5V"; + regulator-min-microvolt =3D <5000000>; + regulator-max-microvolt =3D <5000000>; + }; + + reg_usbh_vbus: regulator-usbh-vbus { + compatible =3D "regulator-fixed"; + pinctrl-names =3D "default"; + pinctrl-0 =3D <&pinctrl_usbh_reg>; + regulator-name =3D "VCC_USB[1-4]"; + regulator-min-microvolt =3D <5000000>; + regulator-max-microvolt =3D <5000000>; + gpio =3D <&gpio1 2 GPIO_ACTIVE_LOW>; + vin-supply =3D <®_5v0>; + }; +}; + +&adc1 { + status =3D "okay"; +}; + +&ecspi1 { + status =3D "okay"; + + num-cs =3D <2>; + cs-gpios =3D < + &gpio3 26 GPIO_ACTIVE_HIGH /* SODIMM 86 LCD_DATA21 */ + &gpio4 28 GPIO_ACTIVE_HIGH /* SODIMM 65 CSI_DATA07 */ + >; +}; + +/* + * Following SODIMM Pins should not be accessed as GPIO on Aster board: + * 134 - AIN5_SCL (no connection) + * 127 - Voltage Level Translator OE# signal (IC11 and IC12) + * + * To configure GPIO to LED5, please disable FEC2 and uncomment the follow= ing: + * &iomuxc { + * pinctrl-names =3D "default"; + * pinctrl-0 =3D < + * &pinctrl_gpio1 + * &pinctrl_gpio2 + * &pinctrl_gpio3 + * &pinctrl_gpio4 + * &pinctrl_gpio6 - for non-WiFi modules only + * &pinctrl_gpio7 + * &pinctrl_gpio_aster + * >; + * + * pinctrl_gpio_aster: gpio-aster { + * fsl,pins =3D < + * MX6UL_PAD_GPIO1_IO07__GPIO1_IO07 0x1b0b0 + * >; + * }; + * }; + */ + +&i2c1 { + status =3D "okay"; + + m41t0m6: rtc@68 { + compatible =3D "st,m41t0"; + reg =3D <0x68>; + }; +}; + +/* PWM */ +&pwm4 { + status =3D "okay"; +}; + +/* PWM */ +&pwm5 { + status =3D "okay"; +}; + +/* PWM */ +&pwm6 { + status =3D "okay"; +}; + +/* PWM */ +&pwm7 { + status =3D "okay"; +}; + +&uart1 { + status =3D "okay"; +}; + +&uart2 { + status =3D "okay"; +}; + +&uart5 { + status =3D "okay"; +}; + +&usbotg1 { + vbus-supply =3D <®_usbh_vbus>; + status =3D "okay"; +}; + +&usbotg2 { + vbus-supply =3D <®_usbh_vbus>; + status =3D "okay"; +}; + +&usdhc1 { + vmmc-supply =3D <®_3v3>; + status =3D "okay"; +}; diff --git a/arch/arm/boot/dts/imx6ull-colibri-emmc-aster.dts b/arch/arm/bo= ot/dts/imx6ull-colibri-emmc-aster.dts new file mode 100644 index 000000000000..919c0464d6cb --- /dev/null +++ b/arch/arm/boot/dts/imx6ull-colibri-emmc-aster.dts @@ -0,0 +1,17 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT +/* + * Copyright 2022 Toradex + */ + +/dts-v1/; + +#include "imx6ull-colibri-emmc-nonwifi.dtsi" +#include "imx6ull-colibri-aster.dtsi" + +/ { + model =3D "Toradex Colibri iMX6ULL 1GB (eMMC) on Colibri Aster"; + compatible =3D "toradex,colibri-imx6ull-emmc-aster", + "toradex,colibri-imx6ull-emmc", + "toradex,colibri-imx6ull", + "fsl,imx6ull"; +}; diff --git a/arch/arm/boot/dts/imx6ull-colibri-wifi-aster.dts b/arch/arm/bo= ot/dts/imx6ull-colibri-wifi-aster.dts new file mode 100644 index 000000000000..b4f65e8c5857 --- /dev/null +++ b/arch/arm/boot/dts/imx6ull-colibri-wifi-aster.dts @@ -0,0 +1,20 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT +/* + * Copyright 2017-2022 Toradex + */ + +/dts-v1/; + +#include "imx6ull-colibri-wifi.dtsi" +#include "imx6ull-colibri-aster.dtsi" + +/ { + model =3D "Toradex Colibri iMX6ULL 512MB on Colibri Aster"; + compatible =3D "toradex,colibri-imx6ull-wifi-aster", + "toradex,colibri-imx6ull", + "fsl,imx6ull"; +}; + +&atmel_mxt_ts { + status =3D "okay"; +}; --=20 2.35.1 From nobody Mon May 11 04:52:39 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 03393C433EF for ; Thu, 14 Apr 2022 08:53:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240633AbiDNIzj (ORCPT ); Thu, 14 Apr 2022 04:55:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57746 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241250AbiDNIyw (ORCPT ); Thu, 14 Apr 2022 04:54:52 -0400 Received: from mout.perfora.net (mout.perfora.net [74.208.4.194]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B4F1865798; Thu, 14 Apr 2022 01:52:12 -0700 (PDT) Received: from toolbox.toradex.int ([31.10.206.124]) by mrelay.perfora.net (mreueus004 [74.208.5.2]) with ESMTPSA (Nemesis) id 1MulRf-1nvUaK2uax-00rqnX; Thu, 14 Apr 2022 10:52:00 +0200 From: Marcel Ziswiler To: linux-arm-kernel@lists.infradead.org Cc: Marcel Ziswiler , Fabio Estevam , Frank Rowand , Krzysztof Kozlowski , NXP Linux Team , Pengutronix Kernel Team , Rob Herring , Russell King , Sascha Hauer , Shawn Guo , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v1 12/14] ARM: dts: imx6ull-colibri: fix nand bch geometry Date: Thu, 14 Apr 2022 10:51:04 +0200 Message-Id: <20220414085106.18621-13-marcel@ziswiler.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220414085106.18621-1-marcel@ziswiler.com> References: <20220414085106.18621-1-marcel@ziswiler.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:XxbB439krdV/bwopLiYcp8T6UyVX2isIwVPw/tjKqC3RNfjSuG6 oQXrg7r9YcHyxM0r/1FVzif48de62pBxm37P+qMc8XX+l9jDy+FRsagDFMj+q05LF93AKsx +LiSzMls786etjIM8ftFzfFL+m4O9bMz1AqB0rZgSekqPAhpoKxzXY51ClgoypXdWb9NSif vNfYVd4QEi/ZkQ2jXIOeA== X-UI-Out-Filterresults: notjunk:1;V03:K0:TZyNMa1bln8=:zhWTyQU5mH5VckOx4fdXCo cJWQHyflr3m4S4owI3tpuU6fHhMg3r1AoL3LBokgRH6rbJEtcfKI4y9Qbo+e1d3qWYV3aJVB8 GAGMhp3mzpYrdUjQHsG4YR8URNR2wfimDLEfQlaShEfzPoKEhbSycsEw5GLVa2TCevPO4IQd+ gfGuMcSNWup3Tku8jzAFD47IZ1yi2/dtOjr9+uzLqy498AnvOiAgwM4SbK3rKGv9ieeUhO4bJ S/7XqFO5R+FLImudDjPNu9eDQeE5a50e0FYL9k5Ar+jm0kFYZC2ldNPRhq3nJOVQ2iHRPjIGw B591ecBXUqyuiy9PjQ31Ddk3LYNIketgm581kvPDgaZUsrz1V54nP4V5pJPtV3s82eX+wl5Vz JVBrdT+P0ifmHoLC27KtA/WAVKmwpn3y1dCsHnpqLxhefh5+G49u/qogmWklfrrQ0HxPEogMk 6i+aNuAAwmhi4mCZYCwnf6hZBY0LBkTLRN56VyolH2QUh6pMsogZkJNwsb4D4SzbJE8SrPBiP kHEjufjNQ0DZWWQMqPkrnhm2Am/5bTu0ufQj7l1f+/CWwwNySpfbCoVTRcNKX/NFRxCT9bNGM ggEXQEcK4khNX9p/xYS/OAga0tE0nRMB5uAmGs/wu4rEhDACKL9mVbNtnZvQvy+kOBboUX8Gp f6+xhCurMzCFcVK+TLuVGgj32VZp/ux5rzQFClB9c6aqhmtsfdda8xEwCzsd6xo5w/iSy9KRu 1JFpsRNKvmEVDl0S Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Marcel Ziswiler Fix NAND BCH geometry relevant mainly for U-Boot. Signed-off-by: Marcel Ziswiler --- arch/arm/boot/dts/imx6ull-colibri.dtsi | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm/boot/dts/imx6ull-colibri.dtsi b/arch/arm/boot/dts/imx= 6ull-colibri.dtsi index 59731ae7d04d..04384139b512 100644 --- a/arch/arm/boot/dts/imx6ull-colibri.dtsi +++ b/arch/arm/boot/dts/imx6ull-colibri.dtsi @@ -128,6 +128,7 @@ ethphy1: ethernet-phy@2 { &gpmi { pinctrl-names =3D "default"; pinctrl-0 =3D <&pinctrl_gpmi_nand>; + fsl,use-minimum-ecc; nand-on-flash-bbt; nand-ecc-mode =3D "hw"; nand-ecc-strength =3D <8>; --=20 2.35.1 From nobody Mon May 11 04:52:39 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1268CC433F5 for ; Thu, 14 Apr 2022 08:52:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241306AbiDNIzH (ORCPT ); Thu, 14 Apr 2022 04:55:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58420 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241264AbiDNIyx (ORCPT ); Thu, 14 Apr 2022 04:54:53 -0400 Received: from mout.perfora.net (mout.perfora.net [74.208.4.196]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C5183689B6; Thu, 14 Apr 2022 01:52:15 -0700 (PDT) Received: from toolbox.toradex.int ([31.10.206.124]) by mrelay.perfora.net (mreueus004 [74.208.5.2]) with ESMTPSA (Nemesis) id 1M5fxm-1ncCRk3oIE-007AKs; Thu, 14 Apr 2022 10:52:03 +0200 From: Marcel Ziswiler To: linux-arm-kernel@lists.infradead.org Cc: Marcel Ziswiler , Fabio Estevam , Frank Rowand , Krzysztof Kozlowski , NXP Linux Team , Pengutronix Kernel Team , Rob Herring , Russell King , Sascha Hauer , Shawn Guo , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v1 13/14] ARM: dts: imx6ull-colibri: add/update some comments Date: Thu, 14 Apr 2022 10:51:05 +0200 Message-Id: <20220414085106.18621-14-marcel@ziswiler.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220414085106.18621-1-marcel@ziswiler.com> References: <20220414085106.18621-1-marcel@ziswiler.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:XXaby9JajJQwtpgaJGaHWRcjjJGgCdue1eDCL45J36nEh+BDvWS NBOgIhjU6P/6a4KgcWo0IKaYPQtQ5EgHiGLIes7B20FjMpWOxZOzlkvRYc+b7dx02AdX7IK BQzUc96b2DH5xFj/z8Quzj4fXELwRdPHSHeluoO/Xlq9Gc8Cp5OfgPKTxcr0J2E1Kq8R81e g+coe1FuTzUKeQq8GLwIw== X-UI-Out-Filterresults: notjunk:1;V03:K0:s5eunHGg6mM=:4bX+nnBvWdlNdmGnHke86r NS17S/lvW6ckZBVo6/94q2vfpeIUN+kiAyltwnGm2A1RIHfSifD1SEqcVLYq/HzbXR3UHSm/X nV3RU8KqWto5V55PeQ4omAjLgP7wteSamNQFYPO4kNCNDo+qfJjaijWJD9FubXL7m/SDZ0zGm XEgYl8o3F7pAp98bbHvC4GOrpw1qi+asEE85KjUdzXgLHaE9qVLPNymbRSYTCkr9STDZ+S2Zz 0UHTHe1fD/QsgjXBmUWcaMJrdaePKK1AxmYEQzk3LYJS5PDjzMToz3KTUdA12p4O3c4Mh8Bfq F0FMMumXsReRZnqgqCuQ2kGKtZto050kP54FFiN2F9FoaL7dLp5e7j0iaDPqrDCEoR0qgCUDt 1PvurBWO1OcdguRKstKciDGn70XTn2YGXTE2ObQn8bDfGnkWuYW0uNZlYDcuvqJQbKhtAgOae YeFBBQlNTskxROsAM4g7aYM0p8vv4LUA9AqG9kWsJ6pPhFMt6pDAgeA6+xczSvwOSwGR4lHIs K53hkNbCL4fOVfkdF5WVlNc9ofALgd5qsDWSZLL+cUJkv8hTMiz5igASfajLMRW8ibmOTHGTp smiT19A1+yHyDmmKblSF5aMul3odRiIdHVbA/XYuJv2d3O7HV2Ne574LF5vK3mp0bYqBMv2vK x4hzqUVv8RCln+8P1FX+GyqBz3M43H69F1UIR0AomjtSN8w1sEI4X11dSk3izfAklLrg= Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Marcel Ziswiler Add/update some comments. Signed-off-by: Marcel Ziswiler --- .../dts/imx6ull-colibri-emmc-nonwifi.dtsi | 4 ++- arch/arm/boot/dts/imx6ull-colibri.dtsi | 36 ++++++++++++++----- 2 files changed, 30 insertions(+), 10 deletions(-) diff --git a/arch/arm/boot/dts/imx6ull-colibri-emmc-nonwifi.dtsi b/arch/arm= /boot/dts/imx6ull-colibri-emmc-nonwifi.dtsi index 1d75bc671f75..ea238525d5c0 100644 --- a/arch/arm/boot/dts/imx6ull-colibri-emmc-nonwifi.dtsi +++ b/arch/arm/boot/dts/imx6ull-colibri-emmc-nonwifi.dtsi @@ -8,7 +8,7 @@ / { aliases { mmc0 =3D &usdhc2; /* eMMC */ - mmc1 =3D &usdhc1; /* MMC 4bit slot */ + mmc1 =3D &usdhc1; /* MMC 4-bit slot */ }; =20 memory@80000000 { @@ -154,6 +154,7 @@ &gpio5 { "SODIMM_127"; }; =20 +/* NAND */ &gpmi { status =3D "disabled"; }; @@ -170,6 +171,7 @@ &iomuxc_snvs { pinctrl-0 =3D <&pinctrl_snvs_gpio1 &pinctrl_snvs_gpio3>; }; =20 +/* eMMC */ &usdhc2 { pinctrl-names =3D "default"; pinctrl-0 =3D <&pinctrl_usdhc2emmc>; diff --git a/arch/arm/boot/dts/imx6ull-colibri.dtsi b/arch/arm/boot/dts/imx= 6ull-colibri.dtsi index 04384139b512..f6fbc5c0e1ee 100644 --- a/arch/arm/boot/dts/imx6ull-colibri.dtsi +++ b/arch/arm/boot/dts/imx6ull-colibri.dtsi @@ -6,6 +6,7 @@ #include "imx6ull.dtsi" =20 / { + /* Ethernet aliases to ensure correct MAC addresses */ aliases { ethernet0 =3D &fec2; ethernet1 =3D &fec1; @@ -104,6 +105,7 @@ &ecspi1 { pinctrl-0 =3D <&pinctrl_ecspi1 &pinctrl_ecspi1_cs>; }; =20 +/* Ethernet */ &fec2 { pinctrl-names =3D "default", "sleep"; pinctrl-0 =3D <&pinctrl_enet2>; @@ -125,6 +127,7 @@ ethphy1: ethernet-phy@2 { }; }; =20 +/* NAND */ &gpmi { pinctrl-names =3D "default"; pinctrl-0 =3D <&pinctrl_gpmi_nand>; @@ -136,6 +139,7 @@ &gpmi { status =3D "okay"; }; =20 +/* I2C3_SDA/SCL on SODIMM 194/196 (e.g. RTC on carrier board) */ &i2c1 { pinctrl-names =3D "default", "gpio"; pinctrl-0 =3D <&pinctrl_i2c1>; @@ -157,6 +161,10 @@ atmel_mxt_ts: touchscreen@4a { }; }; =20 +/* + * PWR_I2C: power I2C to audio codec, PMIC, temperature sensor and + * touch screen controller + */ &i2c2 { /* Use low frequency to compensate for the high pull-up values. */ clock-frequency =3D <40000>; @@ -196,21 +204,25 @@ lcdif_out: endpoint { }; }; =20 +/* PWM */ &pwm4 { pinctrl-names =3D "default"; pinctrl-0 =3D <&pinctrl_pwm4>; }; =20 +/* PWM */ &pwm5 { pinctrl-names =3D "default"; pinctrl-0 =3D <&pinctrl_pwm5>; }; =20 +/* PWM */ &pwm6 { pinctrl-names =3D "default"; pinctrl-0 =3D <&pinctrl_pwm6>; }; =20 +/* PWM */ &pwm7 { pinctrl-names =3D "default"; pinctrl-0 =3D <&pinctrl_pwm7>; @@ -224,6 +236,7 @@ &snvs_pwrkey { status =3D "disabled"; }; =20 +/* Colibri UART_A */ &uart1 { pinctrl-names =3D "default"; pinctrl-0 =3D <&pinctrl_uart1 &pinctrl_uart1_ctrl1>; @@ -231,6 +244,7 @@ &uart1 { fsl,dte-mode; }; =20 +/* Colibri UART_B */ &uart2 { pinctrl-names =3D "default"; pinctrl-0 =3D <&pinctrl_uart2>; @@ -238,12 +252,14 @@ &uart2 { fsl,dte-mode; }; =20 +/* Colibri UART_C */ &uart5 { pinctrl-names =3D "default"; pinctrl-0 =3D <&pinctrl_uart5>; fsl,dte-mode; }; =20 +/* Colibri USBC */ &usbotg1 { dr_mode =3D "otg"; srp-disable; @@ -251,10 +267,12 @@ &usbotg1 { adp-disable; }; =20 +/* Colibri USBH */ &usbotg2 { dr_mode =3D "host"; }; =20 +/* Colibri MMC/SD */ &usdhc1 { pinctrl-names =3D "default", "state_100mhz", "state_200mhz", "sleep"; pinctrl-0 =3D <&pinctrl_usdhc1 &pinctrl_snvs_usdhc1_cd>; @@ -265,7 +283,7 @@ &usdhc1 { assigned-clock-parents =3D <&clks IMX6UL_CLK_PLL2_PFD2>; assigned-clock-rates =3D <0>, <198000000>; bus-width =3D <4>; - cd-gpios =3D <&gpio5 0 GPIO_ACTIVE_LOW>; + cd-gpios =3D <&gpio5 0 GPIO_ACTIVE_LOW>; /* MMC_CD */ disable-wp; keep-power-in-suspend; no-1-8-v; @@ -431,7 +449,7 @@ MX6UL_PAD_ENET1_RX_DATA1__GPIO2_IO01 0xb0b0 /* SODIMM 6= 3 */ =20 /* * With an eMMC instead of a raw NAND device the following pins - * are available at SODIMM pins + * are available at SODIMM pins. */ pinctrl_gpmi_gpio: gpmi-gpio-grp { fsl,pins =3D < @@ -556,10 +574,10 @@ MX6UL_PAD_UART1_CTS_B__UART1_DTE_RTS 0x1b0b1 /* SODIM= M 25 */ =20 pinctrl_uart1_ctrl1: uart1-ctrl1-grp { /* Additional DTR, DCD */ fsl,pins =3D < - MX6UL_PAD_JTAG_TDI__GPIO1_IO13 0x70a0 /* SODIMM 31 */ - MX6UL_PAD_LCD_DATA18__GPIO3_IO23 0x10b0 /* SODIMM 29 */ - MX6UL_PAD_JTAG_TDO__GPIO1_IO12 0x90b1 /* SODIMM 23 */ - MX6UL_PAD_LCD_DATA19__GPIO3_IO24 0x10b0 /* SODIMM 37 */ + MX6UL_PAD_JTAG_TDI__GPIO1_IO13 0x70a0 /* SODIMM 31 / DCD */ + MX6UL_PAD_LCD_DATA18__GPIO3_IO23 0x10b0 /* SODIMM 29 / DSR */ + MX6UL_PAD_JTAG_TDO__GPIO1_IO12 0x90b1 /* SODIMM 23 / DTR */ + MX6UL_PAD_LCD_DATA19__GPIO3_IO24 0x10b0 /* SODIMM 37 / RI */ >; }; =20 @@ -580,7 +598,7 @@ MX6UL_PAD_GPIO1_IO05__UART5_DTE_TX 0x1b0b1 /* SODIMM 21= */ =20 pinctrl_usbh_reg: gpio-usbh-reg { fsl,pins =3D < - MX6UL_PAD_GPIO1_IO02__GPIO1_IO02 0x10b0 /* SODIMM 129 */ + MX6UL_PAD_GPIO1_IO02__GPIO1_IO02 0x10b0 /* SODIMM 129 / USBH_PEN */ >; }; =20 @@ -658,7 +676,7 @@ pinctrl_snvs_gpio1: snvs-gpio1-grp { MX6ULL_PAD_SNVS_TAMPER6__GPIO5_IO06 0x110a0 /* SODIMM 93 */ MX6ULL_PAD_SNVS_TAMPER3__GPIO5_IO03 0x110a0 /* SODIMM 95 */ MX6ULL_PAD_BOOT_MODE0__GPIO5_IO10 0x1b0a0 /* SODIMM 105 */ - MX6ULL_PAD_SNVS_TAMPER5__GPIO5_IO05 0x0b0a0 /* SODIMM 131 */ + MX6ULL_PAD_SNVS_TAMPER5__GPIO5_IO05 0x0b0a0 /* SODIMM 131 / USBH_OC */ MX6ULL_PAD_SNVS_TAMPER8__GPIO5_IO08 0x110a0 /* SODIMM 138 */ >; }; @@ -695,7 +713,7 @@ MX6ULL_PAD_SNVS_TAMPER1__GPIO5_IO01 0x130a0 /* SODIMM 4= 5 */ =20 pinctrl_snvs_usdhc1_cd: snvs-usdhc1-cd-grp { fsl,pins =3D < - MX6ULL_PAD_SNVS_TAMPER0__GPIO5_IO00 0x1b0a0 /* SODIMM 43 */ + MX6ULL_PAD_SNVS_TAMPER0__GPIO5_IO00 0x1b0a0 /* SODIMM 43 / MMC_CD */ >; }; =20 --=20 2.35.1 From nobody Mon May 11 04:52:39 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 68309C4332F for ; Thu, 14 Apr 2022 08:52:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241223AbiDNIzR (ORCPT ); Thu, 14 Apr 2022 04:55:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58558 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241282AbiDNIyz (ORCPT ); Thu, 14 Apr 2022 04:54:55 -0400 Received: from mout.perfora.net (mout.perfora.net [74.208.4.197]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 70C036A049; Thu, 14 Apr 2022 01:52:22 -0700 (PDT) Received: from toolbox.toradex.int ([31.10.206.124]) by mrelay.perfora.net (mreueus004 [74.208.5.2]) with ESMTPSA (Nemesis) id 1N8oCQ-1nz3LP3x4g-015t9W; Thu, 14 Apr 2022 10:52:06 +0200 From: Marcel Ziswiler To: linux-arm-kernel@lists.infradead.org Cc: Marcel Ziswiler , Fabio Estevam , Frank Rowand , Krzysztof Kozlowski , NXP Linux Team , Pengutronix Kernel Team , Rob Herring , Russell King , Sascha Hauer , Shawn Guo , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v1 14/14] ARM: dts: imx6ull-colibri: move gpio-keys node to som dtsi Date: Thu, 14 Apr 2022 10:51:06 +0200 Message-Id: <20220414085106.18621-15-marcel@ziswiler.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220414085106.18621-1-marcel@ziswiler.com> References: <20220414085106.18621-1-marcel@ziswiler.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:t4Eu9Yla157sKjIMqXBTLTyk1QFmNGXZN6GQRUh6lSLFewEOTC3 6fESAbwY56Rx70TRW+51iAM3scxk8ubUD/nxQgWlOLMFocN6e+mN1p/uhLmzjvv3et4pbn4 szXY4CRMVIyDY3YISCc6pUnk7NXSuN7XBh2Yg26qvWPIMUt50b4ZoeBcEIr6VdJDXD+9g2u N1S7cjLtKuMq0aFMeIAXA== X-UI-Out-Filterresults: notjunk:1;V03:K0:3O2Al+diOKo=:RQPRgZ8d6Ud+DZpszriMn6 WSHcbCE43LBvtegma1TK9LwjI/I37GN4rgTlstVndzi2oMRYHeEOdBopRece2XQcP3A7uZdui hNeoOWh0C/MX5KyDXLYGAXMhvDJgG6fQBOtacY/l9AfWaFXxUOdmI2JjK9rIRwmv6Lt25dC0h l6aTxTfxXHO6HODWay6z/AS3e78yyC9CJS1B4krkkFav4g1RDn7PQb6U/0zr57cE3IP6YLoGg uyYFGJQpMaJCdoURISLJkHplMo5BX4X4E2Ur6y8iiXhVBQWw4FonqsQBtAWVYt4Y8OYxyuQVB +NlibE9c/ckMrR1e/WVS0PxwjIFZnHGRFtzRMSHH9ymeq1OvStSNR1gEHwocZkZ34Ry6sM91Y sCbO2cr6Nl5mvXOWzEZZ4dHnV5jUHO3AbG3joSHj+Qr2e7+nngNjvY8gX/rHPTi4kuOUFtXAK 7Ty/GYoLU1Tx1gCUjtWKVr3pOkKcVLyOripv+nYyuB1ng0FCzPvJgUu4j8qiRS2C51J0aAXm0 mCD0WBQ4RUfNUQx3PJN3BiL3uekmE/wD32f0efAJYZ1SNJx0Ed1r4Wp9CXDUqkYnvwghjngg1 pDshWNN8gMb4i8LvMIUu232PowVX0eRjN/jE5SdJ9J7xa0XcuZbSZdEUWESgxM9QlnVmjWswd HkAYq1dbfq4QRk+2jZSMCdEmk4NRs3O9BiQ0A5j+xb3pNFmKjNlANDkyiNgApgxJgznz2g4M4 tq26hyzhefwaDftvd6hk75Wt65j+oXnIF9OJrEE8eTZboS2Plsw8zznCGtpaOvb/hviShSqH3 EAnYI7AfT5LLMk/r5W+ALtibUC6Gw== Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Marcel Ziswiler The gpio-keys define module level wake-up pin functionality. Move it from the carrier board dts file to the Som dtsi file. While at it, also re-order the properties in the gpio-keys node alphabetically and rename to sub-node from power to wakeup. Signed-off-by: Marcel Ziswiler --- arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi | 15 --------------- arch/arm/boot/dts/imx6ull-colibri.dtsi | 16 +++++++++++++++- 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi b/arch/arm/boot= /dts/imx6ull-colibri-eval-v3.dtsi index 08197c66af12..e29907428c20 100644 --- a/arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi +++ b/arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi @@ -8,20 +8,6 @@ chosen { stdout-path =3D "serial0:115200n8"; }; =20 - gpio-keys { - compatible =3D "gpio-keys"; - pinctrl-names =3D "default"; - pinctrl-0 =3D <&pinctrl_snvs_gpiokeys>; - - power { - label =3D "Wake-Up"; - gpios =3D <&gpio5 1 GPIO_ACTIVE_HIGH>; - linux,code =3D ; - debounce-interval =3D <10>; - wakeup-source; - }; - }; - /* fixed crystal dedicated to mcp2515 */ clk16m: clk16m { compatible =3D "fixed-clock"; @@ -29,7 +15,6 @@ clk16m: clk16m { clock-frequency =3D <16000000>; }; =20 - reg_3v3: regulator-3v3 { compatible =3D "regulator-fixed"; regulator-name =3D "3.3V"; diff --git a/arch/arm/boot/dts/imx6ull-colibri.dtsi b/arch/arm/boot/dts/imx= 6ull-colibri.dtsi index f6fbc5c0e1ee..300c28db8e7a 100644 --- a/arch/arm/boot/dts/imx6ull-colibri.dtsi +++ b/arch/arm/boot/dts/imx6ull-colibri.dtsi @@ -24,6 +24,20 @@ backlight: backlight { status =3D "okay"; }; =20 + gpio-keys { + compatible =3D "gpio-keys"; + pinctrl-names =3D "default"; + pinctrl-0 =3D <&pinctrl_snvs_gpiokeys>; + + wakeup { + debounce-interval =3D <10>; + gpios =3D <&gpio5 1 GPIO_ACTIVE_HIGH>; /* SODIMM 45 */ + label =3D "Wake-Up"; + linux,code =3D ; + wakeup-source; + }; + }; + panel_dpi: panel-dpi { compatible =3D "edt,et057090dhu"; backlight =3D <&backlight>; @@ -707,7 +721,7 @@ MX6ULL_PAD_SNVS_TAMPER2__GPIO5_IO02 0x130b0 =20 pinctrl_snvs_gpiokeys: snvs-gpiokeys-grp { fsl,pins =3D < - MX6ULL_PAD_SNVS_TAMPER1__GPIO5_IO01 0x130a0 /* SODIMM 45 */ + MX6ULL_PAD_SNVS_TAMPER1__GPIO5_IO01 0x130a0 /* SODIMM 45 / WAKE_UP */ >; }; =20 --=20 2.35.1