From patchwork Mon Apr 25 16:23:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 12825915 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 7C6D3C433FE for ; Mon, 25 Apr 2022 16:25:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=ObH8BfdjMJnbiRtNmxeAKv6GQx1l4POj6wrb+dYX+OQ=; b=2RLvu8mPNXH+Gf PXVuQYVseBOmoCme34TIlP0ofWcbcBZRrczye9rXFysV8zjJMScJyp6HXXZ11yw8XRL12Yf0z57ZS Mdu53C1yO0ei/h8F4xQoqZmbRm5FVV1bP+h1g+BJy9OFnb+prpRWZMr1YWQU4fTN90AyjJp69DaT+ r4xEyyGoqTOVc7Ni+p3XASGq47Dyl8vNUQCiZ1sdcLoRTO6lSY1XD/XHv68xkblfFCom/ICDvghOt RjXT7L5R5K94ncALlP4hiOwswlFJnZuFEGr5lEry3ei7Kyk+ysNnAY9S064n6UaUZVRwIRJRTqbcX dL4JyJo0mTpoJN753Q0g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nj1Vh-00AKrg-7x; Mon, 25 Apr 2022 16:24:25 +0000 Received: from mout.perfora.net ([74.208.4.197]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nj1Vd-00AKod-Sk for linux-arm-kernel@lists.infradead.org; Mon, 25 Apr 2022 16:24:23 +0000 Received: from toolbox.int.toradex.com ([81.221.85.15]) by mrelay.perfora.net (mreueus002 [74.208.5.2]) with ESMTPSA (Nemesis) id 0MItSh-1nlULQ4Brd-002Xyr; Mon, 25 Apr 2022 18:24:10 +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 v2 01/14] ARM: dts: imx6ull-colibri: use pull-down for adc pins Date: Mon, 25 Apr 2022 18:23:43 +0200 Message-Id: <20220425162356.176665-2-marcel@ziswiler.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220425162356.176665-1-marcel@ziswiler.com> References: <20220425162356.176665-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:ioYDyEmp+YzqCsQRQ3ZsrSpMMbKSFnOrfoMcKlNjRnxQYGxwkBf Nc75AcaqESLP9FCxwUfDkOYhSIeL+nGlew5otZ3PyVcPt41TsMgtTnAQ2qnW4xzp0cWQ244 MciDJtjHxM+TLIN1jx8+XTrm+r9HCC+9vpJaQLcCuO0rBiXeDcFPvK0ATkxZzMi1hh9+XK9 Ad1wL/h6CQ2CI5OsuPOPw== X-UI-Out-Filterresults: notjunk:1;V03:K0:CaMUM9+/O8I=:3xhg8ACPhzRPpUOC2+rR1I IKQFiPACAJqH1hAKRxXo4YzsJx+f5scjdZCjAclwfi9ymhN6Iq4XUd1KFbBQEgoquhdk5p8ms GfRWngkq9iX/5X6wQkP3O7+Kp2lfoxn4kpvljp0A00XJWMwMVDH/m81PnM0Opiwu5x8/8/hio TPStyYDW8anZebKX9etVpa1Oodm0nVS7Ja3EtV43tEhoR1A79J8M/8mSYeAcpIKBDnXLL4ByM uCHmB2xodfdHc+eUmU2S6Mb9zNwDEkShC6FTJTTNj5JTg8WSqsWsCS5H+e3PWHSjFKLTrHNwa 78fm0dvTC+/qbJHZLI2Fx2YbM/XjBp5uoEwSpAqGlbqgQrLifsHCrj4r9yM+tb5FbNKXbXk1q cg9AEd9Lm2auw3Yaoe17F3nert8vqBoUMxaAjqN4TjcLFCn14LyGTD28bKgkQmf8OaDFdlaax +ELCZJJkwKB+jvdKDY7I7Z//a3I7sVx+P4JN5PpRBdMCug498IAt1N+eIGKSb5VGFr5ayZJy5 IaLkLNvwRynrti4NqiO+6GTs1Mp47E3S+hUiA2e1UOTD4EWjuRJZoweop8pzcg5NyX6RtKbSv lONSIv8ARwRUUX2qC8YeXBRJmSndnBlNdAyOV6flODYwa2BpJbu7hBkxy7I4HKDl8N6q//JGm aGCNVNSeNm0ORKtfBDcIJ0oYmqiyfRqKxte5bPGmuqC/o8Gy9LQn6iTxhfTmneFsgOm8= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220425_092422_043552_9440BCF4 X-CRM114-Status: UNSURE ( 8.81 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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=IMX6ULLRM Signed-off-by: Philippe Schenker Signed-off-by: Denys Drozdov Signed-off-by: Marcel Ziswiler --- (no changes since v1) 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/imx6ull-colibri.dtsi index 951a2a6c5a65..eb13ed60d2e4 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 = <10>; vref-supply = <®_module_3v3_avdd>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_adc1>; }; &can1 { @@ -214,6 +216,16 @@ &wdog1 { }; &iomuxc { + + pinctrl_adc1: adc1grp { + fsl,pins = < + 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 = < MX6UL_PAD_ENET1_TX_DATA1__GPIO2_IO04 0x13010 /* SODIMM 73 */ From patchwork Mon Apr 25 16:23:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 12825917 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id F0EF6C433EF for ; Mon, 25 Apr 2022 16:25:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=CnuS9d++enZxOf96smGuIoYcV6DIwz6JmkuguFoEDrk=; b=x9rlPmNNcaB5rr VuMhjb8kxJX1DHAi3/hpddoTJ3ADmnhIoFQa485+ORDeIub0S9dk90ahPMnQmU3dyQanZsxSWXOaz gHuoZejWmjjFcBWiYv8j7WhEVXahcNJlcHWWH51hjkdFUICfszFPPhPPGL4kOP8Un6D1EUkGygDpF ufQtM8B5u7ZvJTAu+Tm0ckpBnlY/1GcJUVYhZi55UryA/7JI4FdeAhIY2eOSgFlqJMg1PHAQmvmpC /s2wrEK5YWMaYJz2CfbGsM40VNGsqy/Gy5wa9FnKI/BDSDhHm0BOVvd3aIa2miqahynzxcfGvt0I1 F274PPyMryoEWW0N1bGQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nj1W2-00AKxo-6K; Mon, 25 Apr 2022 16:24:46 +0000 Received: from mout.perfora.net ([74.208.4.196]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nj1Vg-00AKrR-Oo for linux-arm-kernel@lists.infradead.org; Mon, 25 Apr 2022 16:24:26 +0000 Received: from toolbox.int.toradex.com ([81.221.85.15]) by mrelay.perfora.net (mreueus002 [74.208.5.2]) with ESMTPSA (Nemesis) id 0MOPlT-1nmcPZ3bu9-005rtl; Mon, 25 Apr 2022 18:24:13 +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 v2 02/14] ARM: dts: imx6ull-colibri: change touch i2c parameters Date: Mon, 25 Apr 2022 18:23:44 +0200 Message-Id: <20220425162356.176665-3-marcel@ziswiler.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220425162356.176665-1-marcel@ziswiler.com> References: <20220425162356.176665-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:ADHj/TGDKswkLg5a89IKMUfylJ4N+jPV7Tu6xHT0qRHr/R0TXFx yXx2j7uUeU9/KFV0gw/rpjK+HhW2pOmGnpqLnNnzZ8dM1jQjEhSOrNvQlqBcpUYC7dVz+Lg XBmJ3MCtQphX2Xl0VSu5ecnivlqEFScqIt52yZAUZlJOl5/J5rDCCidWN9sz/CJjiqYYuQx /kZapW8bgFwpgGX6trR1A== X-UI-Out-Filterresults: notjunk:1;V03:K0:BYdktJvC4Zg=:mtLyBkNgwc/nC3nHd9KkWh FtcoQDWnTUQZzvK3zLPlaEM/G+e8ikGFTFVERlJnl6dIwAxrUTRqGQHVYmfM8EMa/r9kB+5/8 kkU1IjcmJtAaTBj0yNsHMraF8E1JSEZpgXx04grgxQA6CfRkFDfRLJaeaVwWfeqQHN2afFeYS vxAyXLK9Nk68jFvENjQQjkQ4JxW0nimcXxJLUa6Sog4W92eTCPcW/qW4RFsTAn9Li74b5ccxR Im82qS51lkvValY3WGzG++U8Mh7Xf7YcVlihFEtTdUfmQtlaJjtIzLxELjoj62jn6wVxoZY1E kxKwS6rPCyvxb6jkFn2Qbo/en/RuThoDIkRdYP+AfM7DAXdNY+wEMn+g+0yN93hBz+eVD5fdJ lkbGCmzHqMMegMpbJHn/PG6EuYt/eJB569tzcbeEWuzRQ+OqT5S0u5Mnl+zOlDwLEwfwsK+Ny 9qiqr3AVHaRZIpKDz963M/rXWdT27rJxeBS4IRWzOS9Jz217+zIEX9XxPXT4EmLcv9UcLgVL8 3Gb8HQtaMKGZP+jN2YXG5DQs1aHwx3RQGbCcNWZ+NY9h3YFsjUF/JkfOiTKoJAWRQpNAlrRQX 8gwIi5PS416hsWXXmdeSv59VYW6Ejw6VjB7Gr209FBfgTGP8tqJYtfuD2SRX9TIy9g3ntGl2G /o1WD0FK/BH7V0Ahu6WJGJmJ3tc4YFTa+egK7Aoens9QzcUFWiW09XIRZsigxsTiiLzQ= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220425_092424_914351_BDEE619A X-CRM114-Status: UNSURE ( 8.59 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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 --- (no changes since v1) 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/imx6ull-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 { }; &i2c2 { + /* Use low frequency to compensate for the high pull-up values. */ + clock-frequency = <40000>; pinctrl-names = "default", "gpio"; pinctrl-0 = <&pinctrl_i2c2>; pinctrl-1 = <&pinctrl_i2c2_gpio>; @@ -405,15 +407,15 @@ MX6UL_PAD_UART4_RX_DATA__GPIO1_IO29 0x4001b8b0 /* SODIMM 194 */ pinctrl_i2c2: i2c2-grp { fsl,pins = < - 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 >; }; pinctrl_i2c2_gpio: i2c2-gpio-grp { fsl,pins = < - 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 >; }; From patchwork Mon Apr 25 16:23:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 12825916 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D6724C4332F for ; Mon, 25 Apr 2022 16:25:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=aoCumNeoYYaSe8G0t/UH8R4iUumOnxnuoASnIVNctLo=; b=3LUNUJ4ej4rEOc 9q4txe+LQ+MU04ltlTdFREOAZX0Z+GOJHSPkJYRLvHpkbjPAj9jMHyAN4JirfQp3GdTfvYlffyB5N WSk0u1yNW9BNZWwvh4XCdmzAh9fOfPeq7wpT7busdBsylhHO+zLxCM7GNOuWGnNUaolxykHRKc6v7 gLPgkMnmZsvXW7C1P6L2kTBH1J5rMGidI26GqXkBaSeKCUOM6sYVuawc+LQI7j7nmWAiK49N0qFFv gQVpviN2eJcrQY69UXY81j9BhpvDYaw82cnsNTl9/2P/ZvKZiGUGIsWYtullwoA7R0/J+hOkbCl2V bGlDSJD3twzlI9tlcHlw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nj1Vs-00AKv9-KI; Mon, 25 Apr 2022 16:24:36 +0000 Received: from mout.perfora.net ([74.208.4.196]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nj1Vg-00AKr5-GI for linux-arm-kernel@lists.infradead.org; Mon, 25 Apr 2022 16:24:25 +0000 Received: from toolbox.int.toradex.com ([81.221.85.15]) by mrelay.perfora.net (mreueus002 [74.208.5.2]) with ESMTPSA (Nemesis) id 0M5dpW-1o71br34iu-00xYXo; Mon, 25 Apr 2022 18:24:16 +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 v2 03/14] ARM: dts: imx6ull-colibri: add phy-supply to fec Date: Mon, 25 Apr 2022 18:23:45 +0200 Message-Id: <20220425162356.176665-4-marcel@ziswiler.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220425162356.176665-1-marcel@ziswiler.com> References: <20220425162356.176665-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:0+FdhGU/ntWSyzpR14rp2dCwoQdc4CNQ9T0hYVYyUUwi3KM+KpG exShnAs/Ds92DrnCQj9hmRrR3CY3VHg5D59Tn0fGbc0do/tbUZP9hScRYNVA9Z0kVD3WNct FiujCO8oh5T04QNabFA86wcpfTXRM58mkzyHAyWcER/2Ats2XSBcUXeb7LX5blokcD3ifmT ashJGylaG1yJzpz7Vdb3w== X-UI-Out-Filterresults: notjunk:1;V03:K0:xYLDPxswUR0=:cWdIX1HrKGoQCP4mL+ejXx IWVgTVNNsKu57P1t4tmxUKqH1T9s5K8kDGLaSjDHqVGgMpulZN5FHSLHtlzB5jsIIcPvXn7JJ QJEmUuPmL1XrjrEcp/8tW3UA9ICLq8mtaxMkcurBQHzRKLMzr4hrEvDtxsnY877/7zwCld7bS WLnysdB3x8YdJn8hyHhjlecNZ2r9mPZX9rYAeoxts5D5Z7S6kyByH5Ihs8tn7r4LDcwse6IRM s7RXd/GoKjBwDJQx/tdSbACL4eyEQbSmQjNS+OtUzjQtHlw7Mn+Oi2hjVLULrEwILDHOG934M UuZRaqXWhJJtgG6r6ksdjXq1LZ4ghrmU0+BbL3flxXbKzZTJqm1u7jPwoMvRvpVgGqRhjfShP 8ZcRfKrDHDWqRojRMofNgPVQUbPLqvmQKip3rg5fAfbWtnYZVGTTrHwtK2tPlJ+YXrYTKE2Yz Bj8Nka4iqFxf37KWxmp3ltRkiPcEpG8MnVs7z86xcSH9DFq5i7rwQsDNK4qYRhHw5Umxu5xaW cVq1urtJmBgnPiw2RKpi2IkWUiOeTCoK11OE1It6AV4vUlc2HYnEjMkEmkuAkPhJ6uHi/MzgI /gVipa6ywOGRjzM8rVVa5N++lJBiApjjGDb0gwHwDPQ+0fZ5ROLVhhSKN6yi+hMpls4l+/ycg YmBloNQv7aDS35YY65VtvDcNVjzZjKVUYz7pT1DoqstkT3toK/9ZM9Nowt/lIO78NSos= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220425_092424_664603_AC19A366 X-CRM114-Status: GOOD ( 10.28 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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 --- (no changes since v1) 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/imx6ull-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 = <1800000 0x1 3300000 0x0>; vin-supply = <®_module_3v3>; }; + + reg_eth_phy: regulator-eth-phy { + compatible = "regulator-fixed-clock"; + regulator-boot-on; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-name = "+V3.3_ETH"; + regulator-type = "voltage"; + vin-supply = <®_module_3v3>; + clocks = <&clks IMX6UL_CLK_ENET2_REF_125M>; + startup-delay-us = <150000>; + }; }; &adc1 { @@ -81,6 +93,7 @@ &fec2 { pinctrl-1 = <&pinctrl_enet2_sleep>; phy-mode = "rmii"; phy-handle = <ðphy1>; + phy-supply = <®_eth_phy>; status = "okay"; mdio { From patchwork Mon Apr 25 16:23:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 12825918 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 63D1AC433EF for ; Mon, 25 Apr 2022 16:26:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=pUXZMA185cUzu2irfht9zAgQbBNmwY6Dc5UOBYL9yFY=; b=Mwy/tu8yo07vKl sVL/U3fj1U2Li1mmoOW4yeMxshNAwj4QjeZuCIEgXMSVP44PidB91WxC1JS+7Rs7KiflU9UHjE07q Ut5/IcVb6H/a7cfIrBKDsfglTndKNxbn3/0W4FdBraGxcT9sqwK/IVZEF297eRrpcEo6/gmQPDuyR xTgGTBSynrxeVSuKkKf8vxZ1a9jIkZ/nmmgodH8eONU6cMVRi0kaW32J2GctIyVNoKdnodLcB8JfP QXTIBRxuzye1Vz8RiTWZ2vFdt+KtK+J/F69elak1xCYor853F0NI4pPilhirZHxZbrrnkjHtJEaCD 7UUh315BoNzuA7bTL4nA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nj1WE-00AL2S-1z; Mon, 25 Apr 2022 16:24:58 +0000 Received: from mout.perfora.net ([74.208.4.197]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nj1Vi-00AKsK-Du for linux-arm-kernel@lists.infradead.org; Mon, 25 Apr 2022 16:24:28 +0000 Received: from toolbox.int.toradex.com ([81.221.85.15]) by mrelay.perfora.net (mreueus002 [74.208.5.2]) with ESMTPSA (Nemesis) id 0LiS78-1oJBD41mWK-00chkK; Mon, 25 Apr 2022 18:24:18 +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 v2 04/14] ARM: dts: imx6ull-colibri: add touchscreen device nodes Date: Mon, 25 Apr 2022 18:23:46 +0200 Message-Id: <20220425162356.176665-5-marcel@ziswiler.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220425162356.176665-1-marcel@ziswiler.com> References: <20220425162356.176665-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:gzDQNJsaCrXEpudjP3OD3AQPAFoq3gVY87QyfXMotZQJskSh0ha gztANYOWJU63l8V0ItUQ0hvFqNeg4qycidYcv1I1DI1o39WGatQaZTO4pBMoAM8ZWPPPMw/ hsOh85kQJTQKS7o2bVrmOVDve3OCmLzbIwV6epiSPTmvbwC9gZ2yBIf8jPNu+wcvvCfIDi+ xx9P2sJiU9GF/5oJxRR4w== X-UI-Out-Filterresults: notjunk:1;V03:K0:NpRMPhujVh4=:Mepb9jV5LXuLBQTjHIqJm/ 9eJo4nfNv9kxUshE2gUlHL9ogNY2s7CStoqFmSNxEp9kazUiMPVnnXR2JA88K8YhHoO2TAhrG gU1JeptdcA3l3IYmw3/gx01NWxJBqLEeBFE2OjnplMxk9nw6eghGXzuz3Y4w0f2CgB/T+OJFn I78qnFmg02r/tdG6KfmgCfW8f1TXuax6WkHz+v2UXClpnF0TeCi/4OyRXVK2pjBiCvRakR57h 4QE7THud/xhQmEV90v5WKJAyKpNi8m51JgiPyX/1kOjwpDzfJFBj9pZOBqnyZT1hIawhL/GIU hNGXvuEsAPmeLS5muft4s9d5F1a8vTzniYiKMPQfMY06naqIbI7cKMukR2DdJj61lh1gz849t omJDt7VUPL6/n07vKHBVErFHeMXoGCZr990+nL2hlkBjHv33M6vkVvyJEjYSA3bAWBR/CKfx/ dm1eweRPWhwVB5VH/k/0NW61O2nZT83l4bSKoobztzfOu+3+taZagyVW3BHlvVNAT4Sr5evmG wB+30HBJY8Hk0GkhnG4Cj35xW0DVEpOQnrYfociM3HwjjxZTOjw/G0AEhiVbI8ncPRs0tV4Zz GUozNYQq5fgadYJ//61bZ0dLyJNrvHqAV9u7wM7f7utI/qgVnv03haxdFnA/4I8tCb/fFhWB5 iLOttBZOIxKq3no/nfMy48oLi8Ob2wfIj3rH1PuCpFzR6j6r+9ClCidVQsrCJEOHkllc= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220425_092426_591985_272853EE X-CRM114-Status: GOOD ( 12.50 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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 --- Changes in v2: - Fixed pinctrl node names as suggested by Shawn. .../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 = "default"; pinctrl-0 = <&pinctrl_gpio1 &pinctrl_gpio2 &pinctrl_gpio3 - &pinctrl_gpio4 &pinctrl_gpio5 &pinctrl_gpio6 &pinctrl_gpio7>; + &pinctrl_gpio4 &pinctrl_gpio6 &pinctrl_gpio7>; }; &iomuxc_snvs { pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_snvs_gpio1 &pinctrl_snvs_gpio2 &pinctrl_snvs_gpio3>; + pinctrl-0 = <&pinctrl_snvs_gpio1 &pinctrl_snvs_gpio3>; }; diff --git a/arch/arm/boot/dts/imx6ull-colibri-wifi.dtsi b/arch/arm/boot/dts/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 = "default"; pinctrl-0 = <&pinctrl_gpio1 &pinctrl_gpio2 &pinctrl_gpio3 - &pinctrl_gpio4 &pinctrl_gpio5 &pinctrl_gpio7>; + &pinctrl_gpio4 &pinctrl_gpio7>; }; &iomuxc_snvs { pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_snvs_gpio1 &pinctrl_snvs_gpio2>; + pinctrl-0 = <&pinctrl_snvs_gpio1>; }; &usdhc2 { diff --git a/arch/arm/boot/dts/imx6ull-colibri.dtsi b/arch/arm/boot/dts/imx6ull-colibri.dtsi index e619da3b00b3..8b5cbe9132a2 100644 --- a/arch/arm/boot/dts/imx6ull-colibri.dtsi +++ b/arch/arm/boot/dts/imx6ull-colibri.dtsi @@ -124,6 +124,19 @@ &i2c1 { pinctrl-1 = <&pinctrl_i2c1_gpio>; sda-gpios = <&gpio1 29 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; scl-gpios = <&gpio1 28 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; + status = "okay"; + + /* Atmel maxtouch controller */ + atmel_mxt_ts: touchscreen@4a { + compatible = "atmel,maxtouch"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_atmel_conn>; + reg = <0x4a>; + interrupt-parent = <&gpio5>; + interrupts = <4 IRQ_TYPE_EDGE_FALLING>; /* SODIMM_107, INT */ + reset-gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>; /* SODIMM_106, RST */ + status = "disabled"; + }; }; &i2c2 { @@ -241,6 +254,20 @@ MX6UL_PAD_GPIO1_IO09__GPIO1_IO09 0x3000 /* SODIMM 2 */ >; }; + pinctrl_atmel_adap: atmeladapgrp { + fsl,pins = < + MX6UL_PAD_NAND_DQS__GPIO4_IO16 0xb0a0 /* SODIMM 28 */ + MX6UL_PAD_ENET1_TX_EN__GPIO2_IO05 0xb0a0 /* SODIMM 30 */ + >; + }; + + pinctrl_atmel_conn: atmelconngrp { + fsl,pins = < + 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 = < MX6UL_PAD_ENET1_TX_DATA1__GPIO2_IO04 0x13010 /* SODIMM 73 */ @@ -347,12 +374,6 @@ MX6UL_PAD_CSI_DATA07__GPIO4_IO28 0x10b0 /* SODIMM 65 */ >; }; - pinctrl_gpio5: gpio5-grp { /* ATMEL MXT TOUCH */ - fsl,pins = < - MX6UL_PAD_JTAG_MOD__GPIO1_IO10 0xb0a0 /* SODIMM 106 */ - >; - }; - pinctrl_gpio6: gpio6-grp { /* Wifi pins */ fsl,pins = < MX6UL_PAD_GPIO1_IO03__GPIO1_IO03 0x10b0 /* SODIMM 89 */ @@ -606,12 +627,6 @@ MX6ULL_PAD_SNVS_TAMPER8__GPIO5_IO08 0x110a0 /* SODIMM 138 */ >; }; - pinctrl_snvs_gpio2: snvs-gpio2-grp { /* ATMEL MXT TOUCH */ - fsl,pins = < - MX6ULL_PAD_SNVS_TAMPER4__GPIO5_IO04 0xb0a0 /* SODIMM 107 */ - >; - }; - pinctrl_snvs_gpio3: snvs-gpio3-grp { /* Wifi pins */ fsl,pins = < MX6ULL_PAD_BOOT_MODE1__GPIO5_IO11 0x130a0 /* SODIMM 127 */ From patchwork Mon Apr 25 16:23:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 12825919 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id A1833C433FE for ; Mon, 25 Apr 2022 16:26:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=gOzO9THj7LdzYF+wzrHt/qcc8acNf/4IKifnXOh6GT0=; b=M7f4D4SnehSvTO aZ+T0oE9wqE5JPBJs/IF3E+YUO5gosJ7mofyskosWpuBZ2K6NmtAMwySo9AVSJYuGA85SZdSPzQkI d+84I5TVIYrFl6P0eF1JDOa72hhFhz7JpgYst3WBbjvyArZ86RXPXEWKVoJE7aKgzVm7ybdtOZ2bI u4XSrgtMj2ORIQN57q/loojvV0RsW5pp6m2NzEhXGxKJ94c4QJ2CvpwNaNujsRGLM+vHpYOU/H9PN qvXro9yAHVHcdc/KZYtzH27HypU34ZwzB7wWyz5nMGj3t84e7E86nepFPPQb9DJCpqDNc74sbRoT2 MSzMcfo/AkzUgYfz7N7w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nj1WS-00AL74-9I; Mon, 25 Apr 2022 16:25:12 +0000 Received: from mout.perfora.net ([74.208.4.197]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nj1Vl-00AKtS-Tu for linux-arm-kernel@lists.infradead.org; Mon, 25 Apr 2022 16:24:31 +0000 Received: from toolbox.int.toradex.com ([81.221.85.15]) by mrelay.perfora.net (mreueus002 [74.208.5.2]) with ESMTPSA (Nemesis) id 0MhBdX-1nW2xY1deD-00MIqv; Mon, 25 Apr 2022 18:24:21 +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 v2 05/14] ARM: dts: imx6ull-colibri: update usdhc1 pixmux and signaling Date: Mon, 25 Apr 2022 18:23:47 +0200 Message-Id: <20220425162356.176665-6-marcel@ziswiler.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220425162356.176665-1-marcel@ziswiler.com> References: <20220425162356.176665-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:jirVTnUYpdwujfn+5jPySQnJyzKNTOO5efbk0ZJLpEP6pqohgqi sHYfDFjcDoTJA1u4hUAYuVmoUVPn57fUKTHzXhHhvvSg29eyupyU/iNKorpjhdX1bf64h7j CvbmNw1fVgJzENnAmzhgsScpU9+M1J/ful4rmSeC266QKJ8mOtJ9F5pRn1huddCv6JtYETO 52g8VxYrqRMEJNztJawqA== X-UI-Out-Filterresults: notjunk:1;V03:K0:jjpJSo0kxAw=:t4G94iIIJlDsY6gGkRrKYU fv6j2xmquzS7UANO8Awelm41xEicz+jG2/1fLyhG4/jDNqHGmpjSasMas0ry/AMm6MD9xtf47 eAVRSkG3FxVPwE9s+0FciWSOZap1dbcwKOlhN1/Tg8+IQP17XmT4RBW3X177gUcxupdBZ7dCH w8DjMSDVKgZLVsOaJmWLJrl7cEVW2LpZ1qQIrnRz4gntmbyfdmcBr3Tu6vT5nUJNom+jPsL3S XnT7Bg3d2Yy9bYtKPCMvLGNqVKb0Ua7NfWvnvr/cFTh0wFi7YEYyCdkNDIzUTYbbcloq4BFSS tdkiDcPPkvJBVrdtOLcVBf2hvkh7/zklSHKdcFt+HNyzkLU2+Tc1aG/DD8H2jqUgpuUsSNbeU ekF8S4yW+h40wgjMrcf6UQN5ZoosYRiF/MTpkcNt81MSpJ4XiKU4AQ0fjhStX/9xFgW1haFM4 DFQoEEh7h/Bd9vDUIvZHcFHWL+cmvXn3qxlfjo2rWJb0AVERQaNgBqeZjRVTWI/bmjAuaT9bk VhwjbWJ9ovnavuyG+ZJF5lr3FDLCiFA8ihafzYrHOZYd/nT9KDXSvunjC87STDzByOE0UMezD j3oS/ena42PNmDiQZVEtjsLbfWA8d5/lrZ6ubw4ubT5DZ78Kfrddjp4N3VbCuPD8NVxswYHAS e9wwAKHqEGmq9S7a25MmVy6RDIql37CmWswhKrS7QcoylDEpMU+iVoY3StV8517FGY/fOvTr3 KWhPHIBNRXLxtZTY X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220425_092430_085753_910C28D1 X-CRM114-Status: GOOD ( 10.66 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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 --- (no changes since v1) .../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 { }; &usdhc1 { - pinctrl-names = "default", "state_100mhz", "state_200mhz", "sleep"; - pinctrl-0 = <&pinctrl_usdhc1 &pinctrl_snvs_usdhc1_cd>; - pinctrl-1 = <&pinctrl_usdhc1_100mhz &pinctrl_snvs_usdhc1_cd>; - pinctrl-2 = <&pinctrl_usdhc1_200mhz &pinctrl_snvs_usdhc1_cd>; - pinctrl-3 = <&pinctrl_usdhc1 &pinctrl_snvs_usdhc1_sleep_cd>; - cd-gpios = <&gpio5 0 GPIO_ACTIVE_LOW>; - disable-wp; - wakeup-source; - keep-power-in-suspend; vmmc-supply = <®_3v3>; - vqmmc-supply = <®_sd1_vmmc>; - sd-uhs-sdr12; - sd-uhs-sdr25; - sd-uhs-sdr50; - sd-uhs-sdr104; status = "okay"; }; diff --git a/arch/arm/boot/dts/imx6ull-colibri.dtsi b/arch/arm/boot/dts/imx6ull-colibri.dtsi index 8b5cbe9132a2..bd8736d90cbb 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 = <3300000>; }; - reg_sd1_vmmc: regulator-sd1-vmmc { + reg_sd1_vqmmc: regulator-sd1-vqmmc { compatible = "regulator-gpio"; gpios = <&gpio5 9 GPIO_ACTIVE_HIGH>; pinctrl-names = "default"; @@ -232,9 +232,21 @@ &usbotg2 { }; &usdhc1 { + pinctrl-names = "default", "state_100mhz", "state_200mhz", "sleep"; + pinctrl-0 = <&pinctrl_usdhc1 &pinctrl_snvs_usdhc1_cd>; + pinctrl-1 = <&pinctrl_usdhc1_100mhz &pinctrl_snvs_usdhc1_cd>; + pinctrl-2 = <&pinctrl_usdhc1_200mhz &pinctrl_snvs_usdhc1_cd>; + pinctrl-3 = <&pinctrl_usdhc1 &pinctrl_snvs_usdhc1_sleep_cd>; assigned-clocks = <&clks IMX6UL_CLK_USDHC1_SEL>, <&clks IMX6UL_CLK_USDHC1>; assigned-clock-parents = <&clks IMX6UL_CLK_PLL2_PFD2>; assigned-clock-rates = <0>, <198000000>; + bus-width = <4>; + cd-gpios = <&gpio5 0 GPIO_ACTIVE_LOW>; + disable-wp; + keep-power-in-suspend; + no-1-8-v; + vqmmc-supply = <®_sd1_vqmmc>; + wakeup-source; }; &wdog1 { @@ -550,8 +562,8 @@ MX6UL_PAD_GPIO1_IO02__GPIO1_IO02 0x10b0 /* SODIMM 129 */ pinctrl_usdhc1: usdhc1-grp { fsl,pins = < - 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 */ pinctrl_usdhc1_100mhz: usdhc1-100mhz-grp { fsl,pins = < - 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 pinctrl_usdhc1_200mhz: usdhc1-200mhz-grp { fsl,pins = < - 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 >; }; @@ -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 MX6UL_PAD_GPIO1_IO03__OSC32K_32K_OUT 0x10 >; From patchwork Mon Apr 25 16:23:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 12825921 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 22A06C433EF for ; Mon, 25 Apr 2022 16:27:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=+FG8uqYbjKLvoCevcpgW7judrZNFkJ/0i96RfK0Y1As=; b=z/XmsluSkeHr6L pmzIUvNp4yonZAlA3+1oEJb3NMHqBsi+k3YReNWjzv5VH4B6cy1Bf7A8PwPRuIquSvYNU0fgil/1q jFhVeVUOd1X6nLc9pzFQKQjERvKHeralTZJ7wZ1z5MMq68OW4WN/HZpHqWtlcR9oeuVULIsMxIJoR Tc7nKvHu4sCcRlvIIdHHhY6anfW2fo1LTIDbViRytx/oUB6s0bW5v2F6uW3T8YJHxQBGnnOM6U5rW glcmjLXb3nAbT2KnZ+8jb1YgO97Kf+zrJ0TYukHelwA132IwvTHL0bpDR/O9A7iP5zvDV5P5+sX1g aVuFa3KElBei8Q5DUCUA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nj1XS-00ALg7-Lg; Mon, 25 Apr 2022 16:26:15 +0000 Received: from mout.perfora.net ([74.208.4.194]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nj1Vr-00AKuB-ET for linux-arm-kernel@lists.infradead.org; Mon, 25 Apr 2022 16:24:36 +0000 Received: from toolbox.int.toradex.com ([81.221.85.15]) by mrelay.perfora.net (mreueus002 [74.208.5.2]) with ESMTPSA (Nemesis) id 0MIcLW-1nlDMm0OF6-002Gzw; Mon, 25 Apr 2022 18:24:24 +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 v2 06/14] ARM: dts: imx6ull-colibri: update device trees to support overlays Date: Mon, 25 Apr 2022 18:23:48 +0200 Message-Id: <20220425162356.176665-7-marcel@ziswiler.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220425162356.176665-1-marcel@ziswiler.com> References: <20220425162356.176665-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:+igbeOghPhe6M3gEizB8AVT7oSjjfiUdrze/kubBf24xhfoW15O O6mFkgRIAi+NMEP9ztA8Cx66mpJtVKPBVPOuuT5kONJVhezN+L+Zt9O8R/glThQLCLwKNIo uaKSMosEQoY68PsU0BXn5KR1buyrrUQZul/hHsTJjtXhomCdX72UcREW7Y+xmA1anfaRr+D 7mTxKOg/TerJ8JP1OyzqQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:t8g3efxgEBg=:BvN3l9h5fjZ7lUIsV5IsqF I7PJtrF3Pp51fJ93iVf9R5GjrH5oRFQaOBDotbK69D7qUQgZFGeooF8Nho3GnqYvUmG6FKlyH pII2mpnAnX+LQ5UX1Ku2wP43yF5zfr0ocxpKz/zoWn87uUnR/UT8aG2oy9OKixx58bLSIZqJ+ XdXZT+Ms4ZQ5K5R9Rgxrhuupx0pbm/KWuaIE2RsmJdMZFAkwk0rsgBw9JWscery+rWArhluVi fyPKKpdL+DEUQY+uxJc5t0z8cyo4rzg1u5syFkx1DGEefcb05/ndUrZPXtmnl91aU2ql8RfjM IPBy97Tit7o2xJxcOfhL64RXSAzMQJ1KBvsBK2pk3G5kL1RywY10zcVHnBj/lCbBuUHT5eAQx GFj2PK5QA3rYk209qlmFgdLpeM/1aFO5uuDAItxJ24dnFPDqSKyz+GLkTvEvdaeEBUZZAZFGF UIhaz3JXlYcUKRcSFK79odOgUWGi+UUPthvbczuG4kY+Dhn2DyDRyF/T/M1+vFArp9flsU+Md vBl9FPf1YufcQWy2efiyLBRVP6uyzOytN2FZ+BItUt33TMJUWWzOvdv3xeXmivrexiL2Y9vbS MR/gtFTQsefdYYi6OW/x9IH/R2Z7cu9wsqgzX3VS7t2tqrgK5SHvAFPJ/RPoZWOF0RXcFD4l+ ki1pgMOmO2obbAGWADTrNp3GzU06DDixphUtYlTSYpUqNrzsE7xB9JmonmuDHBftjc/sLalB/ EBAssrKQSRa8rK9U X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220425_092435_578781_99EAE7A0 X-CRM114-Status: GOOD ( 10.39 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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 --- (no changes since v1) .../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 = <16000000>; }; - panel: panel { - compatible = "edt,et057090dhu"; - backlight = <&bl>; - power-supply = <®_3v3>; - - port { - panel_in: endpoint { - remote-endpoint = <&lcdif_out>; - }; - }; - }; reg_3v3: regulator-3v3 { compatible = "regulator-fixed"; @@ -71,14 +60,6 @@ &adc1 { status = "okay"; }; -&bl { - brightness-levels = <0 4 8 16 32 64 128 255>; - default-brightness-level = <6>; - power-supply = <®_3v3>; - pwms = <&pwm4 0 5000000 1>; - status = "okay"; -}; - &ecspi1 { status = "okay"; @@ -107,16 +88,6 @@ m41t0m6: rtc@68 { }; }; -&lcdif { - status = "okay"; - - port { - lcdif_out: endpoint { - remote-endpoint = <&panel_in>; - }; - }; -}; - /* PWM */ &pwm4 { status = "okay"; diff --git a/arch/arm/boot/dts/imx6ull-colibri.dtsi b/arch/arm/boot/dts/imx6ull-colibri.dtsi index bd8736d90cbb..756cb4222805 100644 --- a/arch/arm/boot/dts/imx6ull-colibri.dtsi +++ b/arch/arm/boot/dts/imx6ull-colibri.dtsi @@ -11,12 +11,29 @@ aliases { ethernet1 = &fec1; }; - bl: backlight { + backlight: backlight { compatible = "pwm-backlight"; + brightness-levels = <0 4 8 16 32 64 128 255>; + default-brightness-level = <6>; + enable-gpios = <&gpio1 11 GPIO_ACTIVE_HIGH>; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_gpio_bl_on>; - enable-gpios = <&gpio1 11 GPIO_ACTIVE_HIGH>; - status = "disabled"; + power-supply = <®_3v3>; + pwms = <&pwm4 0 5000000 1>; + status = "okay"; + }; + + panel_dpi: panel-dpi { + compatible = "edt,et057090dhu"; + backlight = <&backlight>; + power-supply = <®_3v3>; + status = "okay"; + + port { + lcd_panel_in: endpoint { + remote-endpoint = <&lcdif_out>; + }; + }; }; reg_module_3v3: regulator-module-3v3 { @@ -149,7 +166,7 @@ &i2c2 { scl-gpios = <&gpio1 30 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; status = "okay"; - ad7879@2c { + ad7879_ts: touchscreen@2c { compatible = "adi,ad7879-1"; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_snvs_ad7879_int>; @@ -170,6 +187,12 @@ &lcdif { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_lcdif_dat &pinctrl_lcdif_ctrl>; + + port { + lcdif_out: endpoint { + remote-endpoint = <&lcd_panel_in>; + }; + }; }; &pwm4 { From patchwork Mon Apr 25 16:23:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 12825922 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 448B9C433F5 for ; Mon, 25 Apr 2022 16:28:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=jmPqZ0HgPtZtGFU7G29+y6lFqGjZGBpnL0fvjmGua0A=; b=iEn54AzhmkUprk doHdsP45jnxCzy6wk8B9MA7pBV+ojPuLOza0qpbVSCH0vK10R1sKfniiZWiJl/z5LuQQv967SiNH1 dVxrwrgw9G3nwbXd3HBsmEVJ2jjH8KZOytcFsvGF79xdyZtpVRNHLczkal3jp7huWpDlFz/dv1hqT dE2D9/bNxmvYp3AGFVku858WOdXmDfJd4dCXprpxP+wsgGbQJhxBdfbqxFxHHex9afUKrkmGz8Iig 7ami47G1ysbWOsm9WbDu+1NKTcrtXbpE/BED2+c1jhEILUT0mGbT9uYviJLewWyMoer+DPoCoeBzT v0Py2bmRMJrRVP2Iq8Jg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nj1Xz-00ALx1-1Q; Mon, 25 Apr 2022 16:26:47 +0000 Received: from mout.perfora.net ([74.208.4.194]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nj1Vw-00AKwF-8s for linux-arm-kernel@lists.infradead.org; Mon, 25 Apr 2022 16:24:41 +0000 Received: from toolbox.int.toradex.com ([81.221.85.15]) by mrelay.perfora.net (mreueus002 [74.208.5.2]) with ESMTPSA (Nemesis) id 0M39Wb-1nz2j7463L-00srzL; Mon, 25 Apr 2022 18:24:27 +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 v2 07/14] ARM: dts: imx6ull-colibri: add gpio-line-names Date: Mon, 25 Apr 2022 18:23:49 +0200 Message-Id: <20220425162356.176665-8-marcel@ziswiler.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220425162356.176665-1-marcel@ziswiler.com> References: <20220425162356.176665-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:66p6PX5wNb2wKe+k/nkJom0jqdDprxuGWpoW1j6+9i8a/UBM3Bf ovH4F+Vh82Q5+tUgzkfz60OKff+TJhCyzTKyr6hrVhwvyDqdWRGTbnJP7iwKlLQt9GKcssG z5weaCT0PBCcQIqGmFaAqYBefaQ4QDIjD+H6JplNCcs75yIVLtBY/BUbu9DRXh3QAU+/NPQ /mUpV08OH5tsj9eS2zE2g== X-UI-Out-Filterresults: notjunk:1;V03:K0:S3yHckW9Wvw=:myicn4QsuBW6gSPTvp1HtE pGhl0ziXwLqxQ9W9rymBzsMqrdXgvHUJtzLeCpnkhIMvtEkqYRU2aLNt6wnNfP44DUod0xyBl wsZKGvrX6vD/E3eDP8AOjZ3/nrQQEpPkW8uSO9JtIgvII/l1kB3Meoxcg1ZuvtCLDI8t0gS8t OZdt+UUsuL2hKgCKd6HqVVucA0kaQ0fZp4DkGojhZ8ZXrUWqQYWGfgDDfTTHtCV0XqR2/rPqR czMGYR2Ot81AwCJVTV/K3gLrELpCr1OBOduX3F9b56ZyLUUrjj9ZDWyxEQds2MAwUPauOmqx5 8gJYAdiUhclLaK8lachQfR/8NyjucbbkvkNJI2xQCYHYac0dsGHrA3Z+0RMGQBVHcgWFVPJj3 R8d/mx3fhQaQkZQ7c4GExbOuyc32iDJOCSGzfXc8fjagfYAyhKwpDawAl7LTRn0Qd43e+wEP0 D7AMgnpxqcAOgtDPL9+H4cPkXt8VyppJgbfV79/8ITyRUE9XQP7ItI9Hri3v9nzzOydHUpdmI BCv2MWs9kL6j6sH4lVqCo+Perk4j3HFSAWjFzHUTQVobbh1l7TDNEkS4a8QAOg+vfUbARi3+c bN5ClldTUKQJIs/y840qRlVqLhB0XjW/pC4nYvodrH6RsNTRqFqA8lr/G3C6WSnP5Ii+ZVgEB pj+kiFeNXRqDySoF+v3uWd51xbXZPe/aqrguwPoR/hgXuPtef5utIR7z2KMiOO9G770rH1POZ 81TuZe/FQ0zSgmlg X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220425_092440_434056_67E1A6A3 X-CRM114-Status: UNSURE ( 9.28 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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 --- (no changes since v1) .../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 { }; }; +&gpio1 { + gpio-line-names = "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 = "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 = "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 = "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "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 = "SODIMM_43", + "SODIMM_45", + "SODIMM_137", + "SODIMM_95", + "SODIMM_107", + "SODIMM_131", + "SODIMM_93", + "", + "SODIMM_138", + "", + "SODIMM_105", + "SODIMM_127"; +}; + &iomuxc { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_gpio1 &pinctrl_gpio2 &pinctrl_gpio3 diff --git a/arch/arm/boot/dts/imx6ull-colibri-wifi.dtsi b/arch/arm/boot/dts/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 = <792000000>; }; +&gpio1 { + gpio-line-names = "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 = "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 = "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 = "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "SODIMM_59", + "", + "", + "SODIMM_133", + "", + "SODIMM_28", + "SODIMM_75", + "SODIMM_96", + "", + "", + "", + "", + "", + "", + "SODIMM_69", + "SODIMM_98", + "SODIMM_85", + "SODIMM_65"; +}; + +&gpio5 { + gpio-line-names = "SODIMM_43", + "SODIMM_45", + "SODIMM_137", + "SODIMM_95", + "SODIMM_107", + "SODIMM_131", + "", + "", + "", + "", + "SODIMM_105"; +}; + &iomuxc { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_gpio1 &pinctrl_gpio2 &pinctrl_gpio3 From patchwork Mon Apr 25 16:23:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 12825923 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id A2048C433EF for ; Mon, 25 Apr 2022 16:28:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=ZyLxdUt0Hryv4/ONc5M1uYXR2mrVGxjHsXK2BTXfVHM=; b=fZjb3GqDuXNpcN Ei8e+TkllaZbSjvfH1UtXQtOjn0jFJ7DdU03tpg8ZhX8KL1MBq9tdGEHLolEqIkVoWbIQvq5OjFg2 kI1veHgQtHV7H+gfq3c9RCmrG1n6Z/GBV+Q81aEdacUqbmnF3L7C7QVVvMWjpcVxFvA9mtxKwIqnh fYLZ/8D3hkbl4+suNOvbY+7w5zb5AzqeXTT/pNJHX0K+9oxtTsQgBNxBGueevUsJ7iLgHfJBzx10S unmo7IY2vhz7R+jtVaICsHv2wVb/Fmi/C6gdg5FdCNN8oquDhWp9xLFRusqqDOYb6F0JO3wGdaQ37 OdBt+nYWwrMEQbT4JGRQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nj1YN-00AM78-3m; Mon, 25 Apr 2022 16:27:11 +0000 Received: from mout.perfora.net ([74.208.4.196]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nj1W0-00AKxG-Ul for linux-arm-kernel@lists.infradead.org; Mon, 25 Apr 2022 16:24:46 +0000 Received: from toolbox.int.toradex.com ([81.221.85.15]) by mrelay.perfora.net (mreueus002 [74.208.5.2]) with ESMTPSA (Nemesis) id 0Lt0Wa-1ntI5U0w4A-012WcU; Mon, 25 Apr 2022 18:24:30 +0200 From: Marcel Ziswiler To: linux-arm-kernel@lists.infradead.org Cc: Denys Drozdov , Marcel Ziswiler , Alexander Stein , Frank Rowand , Krzysztof Kozlowski , Li Yang , Lucas Stach , Marek Vasut , Matthias Schiffer , Max Krummenacher , Rob Herring , Russell King , Sascha Hauer , Shawn Guo , Tim Harvey , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 08/14] dt-bindings: arm: fsl: add toradex,colibri-imx6ull Date: Mon, 25 Apr 2022 18:23:50 +0200 Message-Id: <20220425162356.176665-9-marcel@ziswiler.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220425162356.176665-1-marcel@ziswiler.com> References: <20220425162356.176665-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:QGn3W3fpuCg72/ljdA8CgDdA35f9/4dCx/JnBmOd/eW57nCgI4i ie+NIlll7tBwg7TNidsG7VJBbzrr8tJvhVS9qPz2Od6KkN71qGBZbgJST7vW74+2p9pZFwg SDMqAJK6ZWlJkINwfQu0bl7Z+oOBPaLnPVywBQJ9RnJSCBL3MZ02+oHbOU4M8Fij5BiQECo 84aFZmCgEpgLjrQZ14/yA== X-UI-Out-Filterresults: notjunk:1;V03:K0:IiZ+WPH5P9g=:JNNV4Zo4loBqFNBBAOKGSo NL/XMUm7KXYTzwtZKhx6JryZD2M5U3CT7iRTGKpUcJgq9HpMZuj/pj0SI4/NCD0Pplo+5NZhS /yVkViff51KJzhtXoZoBAhk/5hVnZUCCJ2SpuUfHifyCyNiiwQJzisX20WVDmr/fDQLaOHcaX jtQ5nTrQSZQQWTnjqddUaZRDVvVnaYX7MiWVVIfsJ5sNQDnY+jhyCMPxIzpVKU1zFyzdyY6al QE/RUMAFG8pgDy5ffTdCzQyUlKXgLB6C6pYOAajkvWxJ2BQ/KgPwnhL1U5hduRAacyAOThdG0 mgjgnYnQ/Q/9R+b9MU+bB1pYnjQpAg2wS5++3fUz+2VPD9lZ9L+VwM9ZDUzDV5UIMzz2NG0J7 KfphZMuZQXUYCV7+veccEMTJaq2d6r88Cc8q/iYMfa0kGP7iKc38lAnjMavAuhMgJdEonue73 Rm/JEIsscY1DHQ/4CG67IQm+SHNfY6rgysAhCrNlv9G9y0IaMEc1JaAp5ymMOpqW5WMeIIWmD kITdhOLJOMuQmyq4xheFIDlA9vZoe9/0IRVnSRAHnyZIfyTOCfi+WlBzEGSN5wcP5R09v0/wG Sun2av7bMmMEmFPKi5wMABZhAdOiR2U4bC6csaqUBxYLcrijdtwYAEzcElni39CcZHewX92aP sHXID61K6ZhraQR4KqcceiBtYbG9J6/+fbWbKdz8AYFKbQS9jPkYuES0atnMB/fwKOGA= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220425_092445_115623_CF4EFEB7 X-CRM114-Status: UNSURE ( 9.09 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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 Acked-by: Rob Herring --- Changes in v2: - Fixed long line as pointed out by Rob's bot. - Added V3 to Colibri Evaluation Board as done elsewhere. .../devicetree/bindings/arm/fsl.yaml | 25 +++++++++++++------ 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/Documentation/devicetree/bindings/arm/fsl.yaml b/Documentation/devicetree/bindings/arm/fsl.yaml index b8b0efa55339..0f0f20ec7b16 100644 --- a/Documentation/devicetree/bindings/arm/fsl.yaml +++ b/Documentation/devicetree/bindings/arm/fsl.yaml @@ -669,23 +669,32 @@ properties: - description: i.MX6ULL Boards with Toradex Colibri iMX6ULL Modules items: - enum: - - toradex,colibri-imx6ull-eval # Colibri iMX6ULL Module on Colibri Evaluation Board + - toradex,colibri-imx6ull-aster # Colibri iMX6ULL Module on Aster Carrier Board + - toradex,colibri-imx6ull-eval # Colibri iMX6ULL Module on Colibri Evaluation Board V3 + - 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 - description: i.MX6ULL Boards with Toradex Colibri iMX6ULL 1GB (eMMC) Module items: - enum: - - toradex,colibri-imx6ull-emmc-eval # Colibri iMX6ULL 1GB (eMMC) M. on Colibri Evaluation Board - - const: toradex,colibri-imx6ull-emmc # Colibri iMX6ULL 1GB (eMMC) Module - - const: fsl,imx6dl + - toradex,colibri-imx6ull-emmc-aster # Colibri iMX6ULL 1G (eMMC) on Aster Carrier Board + - toradex,colibri-imx6ull-emmc-eval # Colibri iMX6ULL 1G (eMMC) on Colibri Evaluation B. V3 + - toradex,colibri-imx6ull-emmc-iris # Colibri iMX6ULL 1G (eMMC) on Iris Carrier Board + - toradex,colibri-imx6ull-emmc-iris-v2 # Colibri iMX6ULL 1G (eMMC) on Iris V2 Carrier Board + - const: toradex,colibri-imx6ull-emmc # Colibri iMX6ULL 1GB (eMMC) Module + - const: fsl,imx6ull - 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 Eval. B. V3 + - 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 - description: Kontron N6411 S Board items: From patchwork Mon Apr 25 16:23:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 12825924 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 5DEE2C433F5 for ; Mon, 25 Apr 2022 16:28:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=LE15WC9ZQ1hGgnDN+tzRtEi23kD6Rc6V2t7y5o4vTlg=; b=nV8kxccJEeawvt nGtuj+IoyN9l3YMSnVZ5yWyjwACFK5YUbYk4gP2MHssyKfvhkMmy0OGXFIPJeX1QazJK0t0i+5XMD xx1MH0pQj7PM+anVnlQodf12fehGEZxNiA/56wYDdBQowl8EtsGIctXe9NtSDXjtAdTNeATcdztf7 0O/lGULPrDJNN62/s5/nLM1nwOCibDcuY56mPVLsy9eUslBBqiY1OzcHYEQWLPA3K7FvubP5fsIhl XiCGp8xD8hdr4EB4wBm3s/Kxwrphep6IQSm5kYK4QjNptJ2wl/ef2vtxLLAof27g6/M7BD/Kc6eb8 X+8norG+az1H1xZYiYOA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nj1Ya-00AMDB-Kz; Mon, 25 Apr 2022 16:27:24 +0000 Received: from mout.perfora.net ([74.208.4.197]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nj1W0-00AKxF-Ta for linux-arm-kernel@lists.infradead.org; Mon, 25 Apr 2022 16:24:47 +0000 Received: from toolbox.int.toradex.com ([81.221.85.15]) by mrelay.perfora.net (mreueus002 [74.208.5.2]) with ESMTPSA (Nemesis) id 0LynwX-1nuh7e1kPv-0167WJ; Mon, 25 Apr 2022 18:24:33 +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 v2 09/14] ARM: dts: imx6ull-colibri: add support for toradex iris carrier boards Date: Mon, 25 Apr 2022 18:23:51 +0200 Message-Id: <20220425162356.176665-10-marcel@ziswiler.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220425162356.176665-1-marcel@ziswiler.com> References: <20220425162356.176665-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:Pyij+OQcaHIRR6KuRRyDLiFOodMJqm/PRzuuCSFm/sVSSMghlgG dDm7by1JwTPUn0oodaSMsBp/4LtvE3eLXg9NSI8BHutHJwYXsT+sCToMRaMp+Aa9KFFrN+g Yc6EngvOuFGv+ouNi0v0hXRKzYzDQvohuXTR/JmjZNNBbw2V9iBdn5KVDRTKOf+nwtPS9V7 H7e8Q8iSgGk0KbVSXJKkg== X-UI-Out-Filterresults: notjunk:1;V03:K0:yHhEV0UtuQM=:xloRgMPyoU0yfd11N8V9g+ w06CJkXVYyfM1+Rd8shIDghc8UvpvdqyZphR9Sh2HjXBWI5BnJI9QnXRxtcY7Idc8xWZ0isn2 kW/pBOOngw/QOJ09NR1m4Phthr/I3UdzX8Z53QkdoOGZKd8koBtE8Bvc0VDnlxsDPFehgkMZy FTcU905l4sHmU0pOBnSNsdVnv9ntg07C9kRYDoozSvC38yCTdBHf6rvzNjb2KaH1URMz8gJND lTK4kFg7amvYSyvLgVHN/algOCgld8JoiKCHc0i1RVajZ0+QFc2KlV9a1QhgI4FcBHeH4mLAN Sh1M7IxlFeydzNvJlTytV/ASayhI1/lZOWFid0GSE7CevZc9z/Fm/4IBiduqZD72ldB2Ybh4C 5wHp4clG/sGD+4QFIDM7VEOFojpY7grENPFq5KAgOL0L8SBU4dvUimJnA/hS3jWrm9egYBgrS Bq36GcxptmbHGfidXtuf4luGGgg6N7FD+gVK/idjpR6dh9e3xBPWddyR4vY05xFxcJLgRBrsC 8li/LN+ZJTNmUCwarnsYzhiHRDzUptaHR0+Gi8MbteZfPUzBJ264JaoXxdma3FQiKO3ziGIyv PNoVYp/tqOEusZizABE+tUPf9FviKNHtoabunIw6NLfZegYCEdZdteLzElABTWRkUo51EtUnK g3yYm5oEqFunu73PuokJU6ZUbH+q4TlvrZOEWZfmOqxdcNLYMePejNTC9WR6IkMEUQvKsrKLX TyiidM+eqVhktgOa X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220425_092445_105870_2B7ABC67 X-CRM114-Status: GOOD ( 18.75 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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 --- Changes in v2: - Fix alphabetical node order as suggested by Shawn. 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 32e9bbf0d13c..727aa78443e1 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -707,8 +707,14 @@ dtb-$(CONFIG_SOC_IMX6UL) += \ 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 = "Toradex Colibri iMX6ULL 1G (eMMC) on Colibri Iris V2"; + compatible = "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/boot/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 = "Toradex Colibri iMX6ULL 1GB (eMMC) on Colibri Iris"; + compatible = "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 */ #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 */ /dts-v1/; @@ -9,6 +9,6 @@ #include "imx6ull-colibri-eval-v3.dtsi" / { - model = "Toradex Colibri iMX6ULL 256MB on Colibri Evaluation Board V3"; + model = "Toradex Colibri iMX6ULL 256/512MB on Colibri Evaluation Board V3"; compatible = "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 */ / { @@ -121,6 +121,7 @@ &uart5 { }; &usbotg1 { + vbus-supply = <®_usbh_vbus>; status = "okay"; }; 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 = "Toradex Colibri iMX6ULL 256M/512B on Colibri Iris V2"; + compatible = "toradex,colibri-imx6ull-iris-v2", + "toradex,colibri-imx6ull", + "fsl,imx6ull"; +}; + +&atmel_mxt_ts { + status = "okay"; +}; + +&gpio1 { + lvds_tx_on { + gpio-hog; + gpios = <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 = "regulator-fixed"; + regulator-name = "3v3_vmmc"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + gpio = <&gpio1 26 GPIO_ACTIVE_HIGH>; + startup-delay-us = <100>; + enable-active-high; + }; +}; + + +&usdhc1 { + cap-power-off-card; + vmmc-supply = <®_3v3_vmmc>; + /delete-property/ keep-power-in-suspend; + /delete-property/ no-1-8-v; + status = "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 = "Toradex Colibri iMX6ULL 256/512MB on Colibri Iris"; + compatible = "toradex,colibri-imx6ull-iris", + "toradex,colibri-imx6ull", + "fsl,imx6ull"; +}; + +&atmel_mxt_ts { + status = "okay"; +}; diff --git a/arch/arm/boot/dts/imx6ull-colibri-iris.dtsi b/arch/arm/boot/dts/imx6ull-colibri-iris.dtsi new file mode 100644 index 000000000000..7f3b37baba88 --- /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 = "serial0:115200n8"; + }; + + gpio-keys { + compatible = "gpio-keys"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_snvs_gpiokeys>; + + power { + label = "Wake-Up"; + gpios = <&gpio5 1 GPIO_ACTIVE_HIGH>; + linux,code = ; + debounce-interval = <10>; + wakeup-source; + }; + }; + + reg_3v3: regulator-3v3 { + compatible = "regulator-fixed"; + regulator-name = "3.3V"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + }; + + reg_5v0: regulator-5v0 { + compatible = "regulator-fixed"; + regulator-name = "5V"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + }; + + reg_usbh_vbus: regulator-usbh-vbus { + compatible = "regulator-fixed"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_usbh_reg>; + regulator-name = "VCC_USB[1-4]"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + gpio = <&gpio1 2 GPIO_ACTIVE_LOW>; + vin-supply = <®_5v0>; + }; +}; + +&adc1 { + status = "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 = <15 0>; + output-high; + }; +}; + +&gpio2 { + uart1_tx_on { + gpio-hog; + gpios = <7 0>; + output-high; + }; +}; + +&i2c1 { + status = "okay"; + + /* M41T0M6 real time clock on carrier board */ + m41t0m6: rtc@68 { + compatible = "st,m41t0"; + reg = <0x68>; + }; +}; + +/* PWM */ +&pwm4 { + status = "okay"; +}; + +/* PWM */ +&pwm5 { + status = "okay"; +}; + +/* PWM */ +&pwm6 { + status = "okay"; +}; + +/* PWM */ +&pwm7 { + status = "okay"; +}; + +&uart1 { + status = "okay"; +}; + +&uart2 { + status = "okay"; +}; + +&uart5 { + status = "okay"; +}; + +&usbotg1 { + vbus-supply = <®_usbh_vbus>; + status = "okay"; +}; + +&usbotg2 { + vbus-supply = <®_usbh_vbus>; + status = "okay"; +}; + +&usdhc1 { + vmmc-supply = <®_3v3>; + status = "okay"; +}; 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 */ #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 */ /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 = "Toradex Colibri iMX6ULL 512MB on Colibri Iris V2"; + compatible = "toradex,colibri-imx6ull-wifi-iris-v2", + "toradex,colibri-imx6ull", + "fsl,imx6ull"; +}; + +&atmel_mxt_ts { + status = "okay"; +}; + +&gpio1 { + lvds_tx_on { + gpio-hog; + gpios = <14 GPIO_ACTIVE_HIGH>; + output-high; + }; +}; diff --git a/arch/arm/boot/dts/imx6ull-colibri-wifi-iris.dts b/arch/arm/boot/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 = "Toradex Colibri iMX6ULL 512MB on Colibri Iris"; + compatible = "toradex,colibri-imx6ull-wifi-iris", + "toradex,colibri-imx6ull", + "fsl,imx6ull"; +}; + +&atmel_mxt_ts { + status = "okay"; +}; diff --git a/arch/arm/boot/dts/imx6ull-colibri-wifi.dtsi b/arch/arm/boot/dts/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 */ #include "imx6ull-colibri.dtsi" diff --git a/arch/arm/boot/dts/imx6ull-colibri.dtsi b/arch/arm/boot/dts/imx6ull-colibri.dtsi index 756cb4222805..86855738f2bd 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 */ #include "imx6ull.dtsi" From patchwork Mon Apr 25 16:23:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 12825939 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 3C783C433F5 for ; Mon, 25 Apr 2022 16:29:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=ix7tz10u/kZh95KFS6OkP5+bZjhMaShaXXzDVTzdFF8=; b=J0gsJJktF+Gz/G tA146+h04jnlX+ws+KgHtjLObpUBne4hdbf+ayKkakuZsu4k5TRoCqB1XL/NV5mfAb/NvXP6VrKfj M8zC93PUTsR51SPTw9FzL2sPQi9qVzLZSMxTKX6Lgewk1oWfaFJ5mLKnkMwgE5JMgL43wSUn5UIZe zPWPta1kpj73U+CsngoYpG5V/b/s52+pm2jiE2Ty8iDTSZePprU6eDcXlGa4MyIcKT+xyf2Pv/O3m zyxb8qTBmOLOOneSES3fwaoBdD/fs6afqD3Of+JhhHZ+5FyOD/O2b4vvOeJ57bFl3xMsNKcOUqbOe SIQTAmPjZpYa4IUYPmFA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nj1ZS-00AMef-G8; Mon, 25 Apr 2022 16:28:19 +0000 Received: from mout.perfora.net ([74.208.4.196]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nj1W3-00AKye-Eq for linux-arm-kernel@lists.infradead.org; Mon, 25 Apr 2022 16:24:49 +0000 Received: from toolbox.int.toradex.com ([81.221.85.15]) by mrelay.perfora.net (mreueus002 [74.208.5.2]) with ESMTPSA (Nemesis) id 0M5dpW-1o71aO2Im0-00xYXo; Mon, 25 Apr 2022 18:24:37 +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 v2 10/14] ARM: dts: imx6ull-colibri: add support for toradex aster carrier boards Date: Mon, 25 Apr 2022 18:23:52 +0200 Message-Id: <20220425162356.176665-11-marcel@ziswiler.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220425162356.176665-1-marcel@ziswiler.com> References: <20220425162356.176665-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:Hzr4iHc16kut1SNComZgrRs7isdK2Ry5z8GurKHUydqJTTC1fQT ZKtj/cM4MAoNy294udAHPQDujvE7B+/A5GwSy3sYlCODuKxzV9KzRMBv+rizSOAQISv2WrQ cRlqd/90TWZFQWzUefnF4XdmkZmxriN7gAjQIUUSYzhuo/akePzPpWTE/2hlBZ8Emi2MNnq KqqmlK742DIUsOwF1gAfw== X-UI-Out-Filterresults: notjunk:1;V03:K0:L27nKVNhx7s=:k5VF5uqJSuiihzASpAUSa2 0xiET0q86BMaG7NqS1vqcZCk55y38oyUUXY6juSRcuAUrCHm944CcieqVv1C+9jMM/ysWKcbE P6FWeP17t/fjlw5CseTUX6uc9ZKoluMUWPf+Os8wC1i5suHvSR80HuHwcM9yuOEKRjT9+xoY3 QfZbbXZtJYRHhQE41JSgNH9THv6KOqiZoNld/+89+TG49WYaK7AkF7nIuKcNS/eQCec1isdcj NQ02UBo2M+l8tWUayNTL+dJLngb1UwT7OyzqBMlmS56ssWpZqw8nTlo7Z8J+vOhzQAz94x2FK FiZy96X1QZKtzdGsNOVg3MRkXDGJemAbQgFD3w850jb1V2LKzvhrP9VyZBr3+tGJFNe8P5W0D gAuZ7DoGTDorUfI0z+gCQDo3vj7sgAJHn/oomr4ds3CpIGcGqBNKNi9ppITYCmGVp1RY/P5fn idcfiCvvkBjlheMMPb7nmnqC5+ul+O6ALalWICJRuKBJmMOtgsyQrjLdHUSEtRuR7gU1xw913 oxlmfJn//lmv5WlC0gOuHX0KGqTZgaFhpKzoFhJ/aOdoKtydaIdgeoOqo+zkPkTononilpNpu S5fUIT58dOdNajy79NIs6Rz8CeCi/wXieM1EBBJGy/qHcbswz+tuE2sxbU2c0/9d0hGLeXGK9 9FGvbju1kMUmalllbXaZ/i5vDSGV2gLoNnwI6UWW7XNw1d9ItItmyVfSVca4s5nHjShE= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220425_092447_645542_0E2F4842 X-CRM114-Status: GOOD ( 16.88 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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 --- Changes in v2: - Dropped [PATCH v1 02/14] ARM: dts: imx6ull-colibri: fix vqmmc regulator which already got applied by Shawn. Thanks! 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 727aa78443e1..011f0747fdb2 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -706,12 +706,15 @@ dtb-$(CONFIG_SOC_IMX6UL) += \ 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/dts/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 = "Toradex Colibri iMX6ULL 256/512MB on Colibri Aster"; + compatible = "toradex,colibri-imx6ull-aster", + "toradex,colibri-imx6ull", + "fsl,imx6ull"; +}; + +&atmel_mxt_ts { + status = "okay"; +}; diff --git a/arch/arm/boot/dts/imx6ull-colibri-aster.dtsi b/arch/arm/boot/dts/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 = "serial0:115200n8"; + }; + + gpio-keys { + compatible = "gpio-keys"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_snvs_gpiokeys>; + + power { + label = "Wake-Up"; + gpios = <&gpio5 1 GPIO_ACTIVE_HIGH>; + linux,code = ; + debounce-interval = <10>; + wakeup-source; + }; + }; + + reg_3v3: regulator-3v3 { + compatible = "regulator-fixed"; + regulator-name = "3.3V"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + }; + + reg_5v0: regulator-5v0 { + compatible = "regulator-fixed"; + regulator-name = "5V"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + }; + + reg_usbh_vbus: regulator-usbh-vbus { + compatible = "regulator-fixed"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_usbh_reg>; + regulator-name = "VCC_USB[1-4]"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + gpio = <&gpio1 2 GPIO_ACTIVE_LOW>; + vin-supply = <®_5v0>; + }; +}; + +&adc1 { + status = "okay"; +}; + +&ecspi1 { + status = "okay"; + + num-cs = <2>; + cs-gpios = < + &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 following: + * &iomuxc { + * pinctrl-names = "default"; + * pinctrl-0 = < + * &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 = < + * MX6UL_PAD_GPIO1_IO07__GPIO1_IO07 0x1b0b0 + * >; + * }; + * }; + */ + +&i2c1 { + status = "okay"; + + m41t0m6: rtc@68 { + compatible = "st,m41t0"; + reg = <0x68>; + }; +}; + +/* PWM */ +&pwm4 { + status = "okay"; +}; + +/* PWM */ +&pwm5 { + status = "okay"; +}; + +/* PWM */ +&pwm6 { + status = "okay"; +}; + +/* PWM */ +&pwm7 { + status = "okay"; +}; + +&uart1 { + status = "okay"; +}; + +&uart2 { + status = "okay"; +}; + +&uart5 { + status = "okay"; +}; + +&usbotg1 { + vbus-supply = <®_usbh_vbus>; + status = "okay"; +}; + +&usbotg2 { + vbus-supply = <®_usbh_vbus>; + status = "okay"; +}; + +&usdhc1 { + vmmc-supply = <®_3v3>; + status = "okay"; +}; diff --git a/arch/arm/boot/dts/imx6ull-colibri-emmc-aster.dts b/arch/arm/boot/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 = "Toradex Colibri iMX6ULL 1GB (eMMC) on Colibri Aster"; + compatible = "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/boot/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 = "Toradex Colibri iMX6ULL 512MB on Colibri Aster"; + compatible = "toradex,colibri-imx6ull-wifi-aster", + "toradex,colibri-imx6ull", + "fsl,imx6ull"; +}; + +&atmel_mxt_ts { + status = "okay"; +}; From patchwork Mon Apr 25 16:23:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 12825938 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 5CFF7C433EF for ; Mon, 25 Apr 2022 16:29:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=qPtBx/LQLp035x/jjmTIqV3SWTP1a9isVv26S+sq+L4=; b=e7PcVjq9CwNxYT jPijHEw3KOvwA419DBF11+98IpOnuDV+Q6A36ODfnf2N3Kao1WVFR/Qa8efXZ5n7AD/sLYtMN/jyh Uv4bZRiOl8AlBxQJ01LldlJ+sO9IYjY4c2rcAGT9gKiqp12rc7YrGt36/LcpuvD8gHfyRxapc3/+/ NSbMMXHsmp3RyFoiwk/w3SzdDdJHuEqYX61XC9cKNao9UzxaDMUS+sJB8lY962xF4FHH8VOfVcAai A+Q32ce7H4hXbWMJ7dYHMi76QjKHoW+iRUDix+WpyzXpUa9fK3br3ikfmxjS60RwPxkJy992KYzRo m0lBOIf7TxlZ3mocGxmQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nj1Z0-00AMQZ-E8; Mon, 25 Apr 2022 16:27:51 +0000 Received: from mout.perfora.net ([74.208.4.196]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nj1W2-00AKxv-Eh for linux-arm-kernel@lists.infradead.org; Mon, 25 Apr 2022 16:24:47 +0000 Received: from toolbox.int.toradex.com ([81.221.85.15]) by mrelay.perfora.net (mreueus002 [74.208.5.2]) with ESMTPSA (Nemesis) id 0MXab2-1nLMMz0i7K-00WVig; Mon, 25 Apr 2022 18:24:39 +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 v2 11/14] ARM: dts: imx6ull-colibri: fix nand bch geometry Date: Mon, 25 Apr 2022 18:23:53 +0200 Message-Id: <20220425162356.176665-12-marcel@ziswiler.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220425162356.176665-1-marcel@ziswiler.com> References: <20220425162356.176665-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:VPvbNQmlE2SkG8+cY0c+w5lLEPlSKKBcNKtm47mUvAqrpNmgFYX j+IhkW/XtLJQb09apN7GZkg9jqD4ify51guGplTI2ClxEqGAWWYsoys9OILPzi7YKM+/Vys 83JjrHwLf2OHDLjGGucDBRHy4Np2b51jg8iOkH/5AqyoJwbd0mwgMjXfnit+AudWH01m2jU pAQGkyJnBRtb5hn+LUmqg== X-UI-Out-Filterresults: notjunk:1;V03:K0:djS0+e1cOrg=:tJr1Qc8WBCQ3kQaRL9zTdN zN4AhtlDmQHP4jZz8r4i/RXUptDAuos9u4VxQoaIDxULdNU1eOHFbqKfZTahz6kr9Z/ReoS09 BoYb4PWoqTExKpgTG3kjW2SXb7mCOKxtqfM9jvXuPT7OKe0j4osUmGAjjE9qwhbxE6O0MBpt+ qfLxfEIkTc8u0oysfXAB2kcDJRTE5y2+CMuOmlWi0f037oGYqigOyqf8168se6lfUto+ooUaL KrFzdMvTFWm8kNUmzO/2UpNzRsVkdt1ijjlGDuSUqYnhhLzBkW0/3dp54yOi3BVLTerDBQx6X eNctA13pKvoZn52SlZoEQu9QQhEhNV9VcKRTVsOaV441WYylqbSsgC0VuDFJ2n0rARWMH/6ma e9DlK4cetokNbbhE8yznGzYtid8t+aG3wtlUpPzY/jhZfWo8T+rOJ3Fi+YBxmmyICQ6nGLgEN J+57qZ6Vs2bKjfO0SDKGRBbPVzB3HKlPUw1rzY31vJDa5m6v1D/z1VJMQ26qWDnepbkf7y+RT sqUfqHrWitUIHxxSQ5+BR3hGtRM5GEGKBR7LIMx6s4VjYV+IBDxVLSQGJEMDUNHiibJUYltv4 4ZwbYU5b4xz5QDz1pXEWwlW+wcHi99nNLRl5Bmi0cS+Os1DViJmWIOa0ZZgXx8/Uoxn76nByq 3sKclVnx5I1hmYGcE3g9FcEqVAgCccHwlA2mv8HG7BeDF3tjezuxYNNjsnFXU6AaQBktSz2q4 8wvtG3n+3vzp76Ct X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220425_092446_659792_481D26F9 X-CRM114-Status: UNSURE ( 7.98 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Marcel Ziswiler Fix NAND BCH geometry relevant mainly for U-Boot. Signed-off-by: Marcel Ziswiler --- (no changes since v1) 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/imx6ull-colibri.dtsi index 86855738f2bd..10e5242fd516 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 = "default"; pinctrl-0 = <&pinctrl_gpmi_nand>; + fsl,use-minimum-ecc; nand-on-flash-bbt; nand-ecc-mode = "hw"; nand-ecc-strength = <8>; From patchwork Mon Apr 25 16:23:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 12825940 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 4A7C4C433EF for ; Mon, 25 Apr 2022 16:30:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=pQCqXQvTJI5yXk7crJVM0q0u8bgmC/J5F0hwQENhrPI=; b=ZecscSPyxg9cGx z9w+pAz5ItPthikPNr3lJiiRxfFG+Etvb0LtcJZIZxPGF5iIO/8s1g08gA/kvbtf3ci7A+In/hwzr JPqRiFNahU+Cw2Lvp+1gTc7yxqERPM+omL61tS3BjukXqV8kusF2ltTGLI+Cyk8g1NK7JNevDsfSA JmwpypR9uOPp/LSV0IjaePNTcI4vimTetDjNGkhUpBWLKK1IplHIIGJQP+y+Auq2xP7/Hpo74/PyU eicrn4wg4SZuWbYBybGjIYps6PLaHQDZP1A03n2EenO2NbLMHsD9DDuX2igPq+HnCrg55yuiBJ37r m6oSZPEs+97pFniLVkgA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nj1Zv-00AMtK-Gi; Mon, 25 Apr 2022 16:28:47 +0000 Received: from mout.perfora.net ([74.208.4.194]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nj1W5-00AKzb-UI for linux-arm-kernel@lists.infradead.org; Mon, 25 Apr 2022 16:24:51 +0000 Received: from toolbox.int.toradex.com ([81.221.85.15]) by mrelay.perfora.net (mreueus002 [74.208.5.2]) with ESMTPSA (Nemesis) id 0M8fpd-1o4YTi37aN-00wBtz; Mon, 25 Apr 2022 18:24:42 +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 v2 12/14] ARM: dts: imx6ull-colibri: add/update some comments Date: Mon, 25 Apr 2022 18:23:54 +0200 Message-Id: <20220425162356.176665-13-marcel@ziswiler.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220425162356.176665-1-marcel@ziswiler.com> References: <20220425162356.176665-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:X35BKI64vq4Rev9p9fnBW1cBTv6G1LEYaMPHz6WZVAGcvay/und Ol7rnxlhXydyp3xjC93TN+o28bvEH2GDC/ioYBosZS+ZzbEG52eeomobyzwU0U9kGQ4wpQM 5uXxkw81eQOxZuFKydbR+MMjyFxy+cgXZtfr2Ncc+DkrXm6NS/VGxMTEgbHfQEMAUyTkbXW GLiBSL9VP2yOwIOpVDnMQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:Fk0YdMNY5EQ=:7AxSi/+a9D4w847f1MSObZ 19drRh0LNiwBva6HyQC3ihI1f1EUZD1l6cd7jZMSxoA9ylLsRyofByUDAv5zF7qaO4GlNVsmp 2YYcQk63Lh6AgzmUZWujHh3hZhMSn/lGP4PC9t0oWqcDfuKRbqNq7n7HvwuHuqakmIVOUEzLh zBlPjL9rbhk5gnuY5r56RQGzqO9tfUFTI4tSVRCvqWBjzoDOjw62c2ZPkceaXFa3GIfzjqGgK ZDdj7/CqDB+z9AGAYZCI002YjPSU8T8YaJvb9HXPOoOd+vxv7apJblkXqKWr5vcL9bc0IHRdq FDVJsaOifLIvcJxQOvg2uFeOkBPXlV+vFXdkua0/UijV8YSyCZtztHjM+N427Hm6HkNjEI/iO LTmXhB1NinmuRze5HexwgD3kMuuBnrF409/xNQeGXU3jJE730aK8GKLEH5tt4bKW9mW2cb5rS ImIwgTk86LzLVZNBNrpzSJvwjZzo+JPtvz+0L9Bz3E0lbEZw76MgBN1mvHOk5RFAAOPbY78V/ JGjiBN0WqC96xVxemW1A9L9p0nGmFSt3DJiUtqWAmz7/Q+7i6E/PaQjPB4UZqSeoJRKSmpTpS d5l+6ss+xGljCpyuDXaL1ICyZCBXcGWA93cyT1ewS11lWsx/EpZWrzg7E/t1tkbxitQT+999C kJT15+mDe6qoTFOp/97zr9LZtVf6p2MDuMk6mavfhy5Hoew2rlzGMEcUxXtl5hcyOjGK+k67p YBtiOduUNk7wG+Ur X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220425_092450_147952_10E4EF92 X-CRM114-Status: GOOD ( 12.02 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Marcel Ziswiler Add/update some comments. Signed-off-by: Marcel Ziswiler --- (no changes since v1) .../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 = &usdhc2; /* eMMC */ - mmc1 = &usdhc1; /* MMC 4bit slot */ + mmc1 = &usdhc1; /* MMC 4-bit slot */ }; memory@80000000 { @@ -154,6 +154,7 @@ &gpio5 { "SODIMM_127"; }; +/* NAND */ &gpmi { status = "disabled"; }; @@ -170,6 +171,7 @@ &iomuxc_snvs { pinctrl-0 = <&pinctrl_snvs_gpio1 &pinctrl_snvs_gpio3>; }; +/* eMMC */ &usdhc2 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usdhc2emmc>; diff --git a/arch/arm/boot/dts/imx6ull-colibri.dtsi b/arch/arm/boot/dts/imx6ull-colibri.dtsi index 10e5242fd516..13a3f251d9eb 100644 --- a/arch/arm/boot/dts/imx6ull-colibri.dtsi +++ b/arch/arm/boot/dts/imx6ull-colibri.dtsi @@ -6,6 +6,7 @@ #include "imx6ull.dtsi" / { + /* Ethernet aliases to ensure correct MAC addresses */ aliases { ethernet0 = &fec2; ethernet1 = &fec1; @@ -104,6 +105,7 @@ &ecspi1 { pinctrl-0 = <&pinctrl_ecspi1 &pinctrl_ecspi1_cs>; }; +/* Ethernet */ &fec2 { pinctrl-names = "default", "sleep"; pinctrl-0 = <&pinctrl_enet2>; @@ -125,6 +127,7 @@ ethphy1: ethernet-phy@2 { }; }; +/* NAND */ &gpmi { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_gpmi_nand>; @@ -136,6 +139,7 @@ &gpmi { status = "okay"; }; +/* I2C3_SDA/SCL on SODIMM 194/196 (e.g. RTC on carrier board) */ &i2c1 { pinctrl-names = "default", "gpio"; pinctrl-0 = <&pinctrl_i2c1>; @@ -157,6 +161,10 @@ atmel_mxt_ts: touchscreen@4a { }; }; +/* + * 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 = <40000>; @@ -196,21 +204,25 @@ lcdif_out: endpoint { }; }; +/* PWM */ &pwm4 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_pwm4>; }; +/* PWM */ &pwm5 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_pwm5>; }; +/* PWM */ &pwm6 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_pwm6>; }; +/* PWM */ &pwm7 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_pwm7>; @@ -224,6 +236,7 @@ &snvs_pwrkey { status = "disabled"; }; +/* Colibri UART_A */ &uart1 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_uart1 &pinctrl_uart1_ctrl1>; @@ -231,6 +244,7 @@ &uart1 { fsl,dte-mode; }; +/* Colibri UART_B */ &uart2 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_uart2>; @@ -238,12 +252,14 @@ &uart2 { fsl,dte-mode; }; +/* Colibri UART_C */ &uart5 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_uart5>; fsl,dte-mode; }; +/* Colibri USBC */ &usbotg1 { dr_mode = "otg"; srp-disable; @@ -251,10 +267,12 @@ &usbotg1 { adp-disable; }; +/* Colibri USBH */ &usbotg2 { dr_mode = "host"; }; +/* Colibri MMC/SD */ &usdhc1 { pinctrl-names = "default", "state_100mhz", "state_200mhz", "sleep"; pinctrl-0 = <&pinctrl_usdhc1 &pinctrl_snvs_usdhc1_cd>; @@ -265,7 +283,7 @@ &usdhc1 { assigned-clock-parents = <&clks IMX6UL_CLK_PLL2_PFD2>; assigned-clock-rates = <0>, <198000000>; bus-width = <4>; - cd-gpios = <&gpio5 0 GPIO_ACTIVE_LOW>; + cd-gpios = <&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 63 */ /* * 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 = < @@ -556,10 +574,10 @@ MX6UL_PAD_UART1_CTS_B__UART1_DTE_RTS 0x1b0b1 /* SODIMM 25 */ pinctrl_uart1_ctrl1: uart1-ctrl1-grp { /* Additional DTR, DCD */ fsl,pins = < - 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 */ >; }; @@ -580,7 +598,7 @@ MX6UL_PAD_GPIO1_IO05__UART5_DTE_TX 0x1b0b1 /* SODIMM 21 */ pinctrl_usbh_reg: gpio-usbh-reg { fsl,pins = < - MX6UL_PAD_GPIO1_IO02__GPIO1_IO02 0x10b0 /* SODIMM 129 */ + MX6UL_PAD_GPIO1_IO02__GPIO1_IO02 0x10b0 /* SODIMM 129 / USBH_PEN */ >; }; @@ -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 45 */ pinctrl_snvs_usdhc1_cd: snvs-usdhc1-cd-grp { fsl,pins = < - MX6ULL_PAD_SNVS_TAMPER0__GPIO5_IO00 0x1b0a0 /* SODIMM 43 */ + MX6ULL_PAD_SNVS_TAMPER0__GPIO5_IO00 0x1b0a0 /* SODIMM 43 / MMC_CD */ >; }; From patchwork Mon Apr 25 16:23:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 12825941 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 87019C433EF for ; Mon, 25 Apr 2022 16:30:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=mUwv2jKI3L/4YAXGRZVcjEg0fDvLaYcCJYCzj0g83mY=; b=QCkE9CJHpHZEMZ 8G588B+gi7mBI0AskcahoDBX/d1egytl9V9XZmOCYEqrvyIEJJL/HMGVaVwqO3vqvtVeQfMFXlBoP QCYMrhUQN/gYJp5c4FPO6lRgLy/kXiiga5LQl6o+oJJWoLySU1PXn+gPwGCXBOid7+EUJ+51and9T 0WEbm4hJqLLtPx1DKgu1lkaWK0Gju1ViAf1JHSZqWwT0jbB3pd8c91UIHVoWr/YA/TrJ8Ad0LS1lA Zge8rpm+vvwU7fBU9AZvs4XWhmKw7cLvKP0DroBQIuWNClm4c3R6dAlERwQ47zYyQNVeDcfF7sRiw bAcMSxrJ6NnNOACyYmrw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nj1an-00ANJ6-6Z; Mon, 25 Apr 2022 16:29:41 +0000 Received: from mout.perfora.net ([74.208.4.194]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nj1W8-00AL0X-5l for linux-arm-kernel@lists.infradead.org; Mon, 25 Apr 2022 16:24:53 +0000 Received: from toolbox.int.toradex.com ([81.221.85.15]) by mrelay.perfora.net (mreueus002 [74.208.5.2]) with ESMTPSA (Nemesis) id 0LiS78-1oJBD61bGW-00chkK; Mon, 25 Apr 2022 18:24:44 +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 v2 13/14] ARM: dts: imx6ull-colibri: move gpio-keys node to som dtsi Date: Mon, 25 Apr 2022 18:23:55 +0200 Message-Id: <20220425162356.176665-14-marcel@ziswiler.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220425162356.176665-1-marcel@ziswiler.com> References: <20220425162356.176665-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:2wLqalwvBvHjQI0F6bwaX+aju6hhfLeigrJDH7hvf7o4SviWJsz YjPxhFznJJ09jTQTFqTNy48dlPYgRPzdAVgSshekfav2zeuXZILl7tPO4CKTDqsYpGUTDG8 I1j7Q/YTWdzbZpURx1j64jrd64IS+HEenyPsO/BP67qxnIILye/x2eQ3PlPnc0kic2r7pkM XsPzbMRKRq8m9C22+So5A== X-UI-Out-Filterresults: notjunk:1;V03:K0:YK334HG6ib4=:Ovs1iPJGRN9wr3DHRSPc0l OUhzsIK9U5FFfDu+4+zBN6RTQUTggDIS1mYlaNhVbxGXhu/m4Ufr4mdmgyRsjynfpPllCvJTB UHHdWoe9bpnzr0aIJ0dgWBPas17MY0QJXYxe/vrz+BxombJSywzTL1SneSFk2LqMYvuDKMQiB kwgTo6SXwA380cXM7TMX4/SjRej7+GcgKcZqsZtCgtAG1AQcJF67N9Y+qR8TElb4G7V/B2kqD Wu+A0SmyKjp66OBBcwXtrX3yhMbiIITcoVEJXixKT/JGKdzdgGROgsmZdnRA5uRzOcs99+J6Q 0uBHndvydR0Uuewad3Q547VEq/lab2QVEXL0dW17JJW7DvPticU7DV6hKcUW++0J3l2pzdC8g Q2s8kxSl9R0Wnxhc/p8KASLV/N444IcoNz4qlfWkXxEuJqjaJh/O+dFFybEXtyb34vSj5JLLb xIH91wGRrkbV96CKi5S6BBcDyt9JMwBgD3KNPERXNrTfweimljjFDRdnzJ+pKv5/F+Id+90U2 M/oKB089xTg6IFK9LFXfC1Ty7TAUg9tczNWM2dxz6Te0ouFXvv09CmODJXg84boUc6fjRLsWa 9jC0MvdlmDxCM+GBttt55PBbG7M91T4Q7VP44jz780X/lcqJILHfB+fWvmN2LcVS0N7fiI9t5 6mHPO3R/EOo5yqitcU6emN2UwmVJoyqvT35AbPsn8N09D2eI15/SCcm625U1Wtfvx6IIf7rh7 58MNCXpQlJsTi0H5 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220425_092452_363733_C577EBE8 X-CRM114-Status: GOOD ( 10.34 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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 --- (no changes since v1) 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 = "serial0:115200n8"; }; - gpio-keys { - compatible = "gpio-keys"; - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_snvs_gpiokeys>; - - power { - label = "Wake-Up"; - gpios = <&gpio5 1 GPIO_ACTIVE_HIGH>; - linux,code = ; - debounce-interval = <10>; - wakeup-source; - }; - }; - /* fixed crystal dedicated to mcp2515 */ clk16m: clk16m { compatible = "fixed-clock"; @@ -29,7 +15,6 @@ clk16m: clk16m { clock-frequency = <16000000>; }; - reg_3v3: regulator-3v3 { compatible = "regulator-fixed"; regulator-name = "3.3V"; diff --git a/arch/arm/boot/dts/imx6ull-colibri.dtsi b/arch/arm/boot/dts/imx6ull-colibri.dtsi index 13a3f251d9eb..f1e724f6cdfc 100644 --- a/arch/arm/boot/dts/imx6ull-colibri.dtsi +++ b/arch/arm/boot/dts/imx6ull-colibri.dtsi @@ -24,6 +24,20 @@ backlight: backlight { status = "okay"; }; + gpio-keys { + compatible = "gpio-keys"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_snvs_gpiokeys>; + + wakeup { + debounce-interval = <10>; + gpios = <&gpio5 1 GPIO_ACTIVE_HIGH>; /* SODIMM 45 */ + label = "Wake-Up"; + linux,code = ; + wakeup-source; + }; + }; + panel_dpi: panel-dpi { compatible = "edt,et057090dhu"; backlight = <&backlight>; @@ -707,7 +721,7 @@ MX6ULL_PAD_SNVS_TAMPER2__GPIO5_IO02 0x130b0 pinctrl_snvs_gpiokeys: snvs-gpiokeys-grp { fsl,pins = < - MX6ULL_PAD_SNVS_TAMPER1__GPIO5_IO01 0x130a0 /* SODIMM 45 */ + MX6ULL_PAD_SNVS_TAMPER1__GPIO5_IO01 0x130a0 /* SODIMM 45 / WAKE_UP */ >; }; From patchwork Mon Apr 25 16:23:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 12825942 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 1B7E3C433EF for ; Mon, 25 Apr 2022 16:31:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=Qsom9fPhGWNY7hvYEOOh0QH9rjOX3V+ng8LX0hT8Fkc=; b=JUZRWI0F8cfRaD oUD5/TuEzz5m4Xut3I95T6nhFeOjPR+T5ZVXTIwzNwrM2++N2lC1/Q6Bi30/iRxGRcb+lPvsLUO6F qEXt0glJ15fzIhiwNobgen/5fkByG0c8xJzzD9DE/9yV/ommoDEDNK+TYJETHXp+7BQ0EaLnFe9L5 38uGpPWYlCDHGTBRmI61uqECJSaXdgOBU85AX8XMx5jqjbIhOKYsLdcSBkzwLJxwQew+fYg/T6J8g WhQSEQYhdpvOVlOr7T0g5qcEoGs1a0zOYC1ClV+sPRaYBeROhJdj2Lb0reycvWCaSr0wa2B3jl8lK QM/UPSKG0nYiOYZWcB0g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nj1bV-00ANei-OC; Mon, 25 Apr 2022 16:30:26 +0000 Received: from mout.perfora.net ([74.208.4.196]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nj1WB-00AL1a-9o for linux-arm-kernel@lists.infradead.org; Mon, 25 Apr 2022 16:24:57 +0000 Received: from toolbox.int.toradex.com ([81.221.85.15]) by mrelay.perfora.net (mreueus002 [74.208.5.2]) with ESMTPSA (Nemesis) id 0MX2dG-1nLubS3tRc-00VxUK; Mon, 25 Apr 2022 18:24:47 +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 v2 14/14] ARM: dts: imx6ull-colibri: improve pinctrl node names Date: Mon, 25 Apr 2022 18:23:56 +0200 Message-Id: <20220425162356.176665-15-marcel@ziswiler.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220425162356.176665-1-marcel@ziswiler.com> References: <20220425162356.176665-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:Whjpx5n/qdybkQ7T1QbJ+atL1ykOESLcqi8QNtAtBXFFt+ws87P nL/Stw8BMDAJTcafzAgat6TvZpDb/QV7GZ+RErqvgCltRejoGPfbwB+/HaDT+918LfMg7YA QGtfyFaZrVq4lDXIuEeb4Bi1kbtgMBE6VWowKwR8VrEkIMxmEXBlm0qUMXYfSD0QGPEub/3 Q3y9b94Hped/U2RVzN9bQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:QK0yuB8fsSU=:hKY4/NFG+erhTd8a0RdwnD +oee7KYyKXeXzfAwQFtTQQjQnkMRgz/pyBE/G/klvI8FYfnodcZ089VjjXWlrMfmtfUK5U54A DyxiuvJctUtxQufU/yYWJ7tM21sTIXn6KVLEe8HHkPmg64djhlugiNYKUgsy5w1FOYBOT0tNy ZPlZntO+zMwqWmT7L+T5wawcnt7LC0gTFYwu2S4NyZNkll55EhCE9kSN5c8O9sk8xSzrEuYcC YndI37OnNKGiJ2B4wyXJzxBH6M/71lyz9h6dvSdPv5omXZHsJ72lMbmdSYHdWB66vaBF9O7aQ AsIbS8fowJYQsPf9g1CsYbdjqcPl+rMqKNwPa6i8YnWSLOn/ZjeIYlOAQC4ZozDjywyAAz3Yt /g3saEkTBnoEkWYndGAWr+CqQnxIPW60NexiZgfSrTkMThfElVRWsPPO+iPhe2NmzaEDVGZNs 7ZipHSGhxSIHp8JqSXO79etu2T3DWu3qFxXh+5cr2dyBUPk/5odktT4Lvc9CVHx9Ts9wmYB1/ qB4ogmhXFuJt4FODnMvV8Kk9I5MVtaK54Pyele7nXoMZaCRnrmhCy6A7lPq28MjjhwfVmPHMd NJHn4cZZivQek16sZBegXRDBHNYVKx6I9efpdjiEL8sFy4fg9a7JCswk0g8oUsTkhFsRGvGuZ oraI6HjIpA29ZZFxTVIa2sI+vVNRMu7b5jVMyiNP3y8HCL/1kHem801NQEuY0H6vNwAxiGLmb mr1H8Yl5zaXQgS/o X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220425_092455_463443_1F50E065 X-CRM114-Status: GOOD ( 10.76 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Marcel Ziswiler Improve on pinctrl node names. Signed-off-by: Marcel Ziswiler --- Changes in v2: - New commit with pinctrl node name improvements as suggested by Shawn. arch/arm/boot/dts/imx6ull-colibri.dtsi | 93 +++++++++++++------------- 1 file changed, 46 insertions(+), 47 deletions(-) diff --git a/arch/arm/boot/dts/imx6ull-colibri.dtsi b/arch/arm/boot/dts/imx6ull-colibri.dtsi index f1e724f6cdfc..bb1c3e6c4afe 100644 --- a/arch/arm/boot/dts/imx6ull-colibri.dtsi +++ b/arch/arm/boot/dts/imx6ull-colibri.dtsi @@ -292,7 +292,7 @@ &usdhc1 { pinctrl-0 = <&pinctrl_usdhc1 &pinctrl_snvs_usdhc1_cd>; pinctrl-1 = <&pinctrl_usdhc1_100mhz &pinctrl_snvs_usdhc1_cd>; pinctrl-2 = <&pinctrl_usdhc1_200mhz &pinctrl_snvs_usdhc1_cd>; - pinctrl-3 = <&pinctrl_usdhc1 &pinctrl_snvs_usdhc1_sleep_cd>; + pinctrl-3 = <&pinctrl_usdhc1 &pinctrl_snvs_usdhc1_cd_sleep>; assigned-clocks = <&clks IMX6UL_CLK_USDHC1_SEL>, <&clks IMX6UL_CLK_USDHC1>; assigned-clock-parents = <&clks IMX6UL_CLK_PLL2_PFD2>; assigned-clock-rates = <0>, <198000000>; @@ -312,7 +312,6 @@ &wdog1 { }; &iomuxc { - pinctrl_adc1: adc1grp { fsl,pins = < MX6UL_PAD_GPIO1_IO00__GPIO1_IO00 0x3000 /* SODIMM 8 */ @@ -336,13 +335,13 @@ MX6ULL_PAD_SNVS_TAMPER4__GPIO5_IO04 0xb0a0 /* SODIMM 107 */ >; }; - pinctrl_can_int: canint-grp { + pinctrl_can_int: canintgrp { fsl,pins = < MX6UL_PAD_ENET1_TX_DATA1__GPIO2_IO04 0x13010 /* SODIMM 73 */ >; }; - pinctrl_enet2: enet2-grp { + pinctrl_enet2: enet2grp { fsl,pins = < MX6UL_PAD_GPIO1_IO06__ENET2_MDIO 0x1b0b0 MX6UL_PAD_GPIO1_IO07__ENET2_MDC 0x1b0b0 @@ -357,7 +356,7 @@ MX6UL_PAD_ENET2_TX_EN__ENET2_TX_EN 0x1b0b0 >; }; - pinctrl_enet2_sleep: enet2sleepgrp { + pinctrl_enet2_sleep: enet2-sleepgrp { fsl,pins = < MX6UL_PAD_GPIO1_IO06__GPIO1_IO06 0x0 MX6UL_PAD_GPIO1_IO07__GPIO1_IO07 0x0 @@ -372,13 +371,13 @@ MX6UL_PAD_ENET2_TX_EN__GPIO2_IO13 0x0 >; }; - pinctrl_ecspi1_cs: ecspi1-cs-grp { + pinctrl_ecspi1_cs: ecspi1csgrp { fsl,pins = < MX6UL_PAD_LCD_DATA21__GPIO3_IO26 0x70a0 /* SODIMM 86 */ >; }; - pinctrl_ecspi1: ecspi1-grp { + pinctrl_ecspi1: ecspi1grp { fsl,pins = < MX6UL_PAD_LCD_DATA20__ECSPI1_SCLK 0x000a0 /* SODIMM 88 */ MX6UL_PAD_LCD_DATA22__ECSPI1_MOSI 0x000a0 /* SODIMM 92 */ @@ -386,27 +385,27 @@ MX6UL_PAD_LCD_DATA23__ECSPI1_MISO 0x100a0 /* SODIMM 90 */ >; }; - pinctrl_flexcan1: flexcan1-grp { + pinctrl_flexcan1: flexcan1grp { fsl,pins = < MX6UL_PAD_ENET1_RX_DATA0__FLEXCAN1_TX 0x1b020 MX6UL_PAD_ENET1_RX_DATA1__FLEXCAN1_RX 0x1b020 >; }; - pinctrl_flexcan2: flexcan2-grp { + pinctrl_flexcan2: flexcan2grp { fsl,pins = < MX6UL_PAD_ENET1_TX_DATA0__FLEXCAN2_RX 0x1b020 MX6UL_PAD_ENET1_RX_EN__FLEXCAN2_TX 0x1b020 >; }; - pinctrl_gpio_bl_on: gpio-bl-on-grp { + pinctrl_gpio_bl_on: gpioblongrp { fsl,pins = < MX6UL_PAD_JTAG_TMS__GPIO1_IO11 0x30a0 /* SODIMM 71 */ >; }; - pinctrl_gpio1: gpio1-grp { + pinctrl_gpio1: gpio1grp { fsl,pins = < MX6UL_PAD_UART3_RX_DATA__GPIO1_IO25 0x10b0 /* SODIMM 77 */ MX6UL_PAD_JTAG_TCK__GPIO1_IO14 0x70a0 /* SODIMM 99 */ @@ -419,7 +418,7 @@ MX6UL_PAD_UART3_RTS_B__GPIO1_IO27 0x10b0 /* SODIMM 186 */ >; }; - pinctrl_gpio2: gpio2-grp { /* Camera */ + pinctrl_gpio2: gpio2grp { /* Camera */ fsl,pins = < MX6UL_PAD_CSI_DATA04__GPIO4_IO25 0x10b0 /* SODIMM 69 */ MX6UL_PAD_CSI_MCLK__GPIO4_IO17 0x10b0 /* SODIMM 75 */ @@ -429,20 +428,20 @@ MX6UL_PAD_CSI_DATA05__GPIO4_IO26 0x10b0 /* SODIMM 98 */ >; }; - pinctrl_gpio3: gpio3-grp { /* CAN2 */ + pinctrl_gpio3: gpio3grp { /* CAN2 */ fsl,pins = < MX6UL_PAD_ENET1_RX_EN__GPIO2_IO02 0x10b0 /* SODIMM 178 */ MX6UL_PAD_ENET1_TX_DATA0__GPIO2_IO03 0x10b0 /* SODIMM 188 */ >; }; - pinctrl_gpio4: gpio4-grp { + pinctrl_gpio4: gpio4grp { fsl,pins = < MX6UL_PAD_CSI_DATA07__GPIO4_IO28 0x10b0 /* SODIMM 65 */ >; }; - pinctrl_gpio6: gpio6-grp { /* Wifi pins */ + pinctrl_gpio6: gpio6grp { /* Wifi pins */ fsl,pins = < MX6UL_PAD_GPIO1_IO03__GPIO1_IO03 0x10b0 /* SODIMM 89 */ MX6UL_PAD_CSI_DATA02__GPIO4_IO23 0x10b0 /* SODIMM 79 */ @@ -454,7 +453,7 @@ MX6UL_PAD_CSI_HSYNC__GPIO4_IO20 0x10b0 /* SODIMM 94 */ >; }; - pinctrl_gpio7: gpio7-grp { /* CAN1 */ + pinctrl_gpio7: gpio7grp { /* CAN1 */ fsl,pins = < MX6UL_PAD_ENET1_RX_DATA0__GPIO2_IO00 0xb0b0/* SODIMM 55 */ MX6UL_PAD_ENET1_RX_DATA1__GPIO2_IO01 0xb0b0 /* SODIMM 63 */ @@ -465,7 +464,7 @@ MX6UL_PAD_ENET1_RX_DATA1__GPIO2_IO01 0xb0b0 /* SODIMM 63 */ * With an eMMC instead of a raw NAND device the following pins * are available at SODIMM pins. */ - pinctrl_gpmi_gpio: gpmi-gpio-grp { + pinctrl_gpmi_gpio: gpmigpiogrp { fsl,pins = < MX6UL_PAD_NAND_ALE__GPIO4_IO10 0x10b0 /* SODIMM 140 */ MX6UL_PAD_NAND_CE0_B__GPIO4_IO13 0x10b0 /* SODIMM 144 */ @@ -474,7 +473,7 @@ MX6UL_PAD_NAND_READY_B__GPIO4_IO12 0x10b0 /* SODIMM 142 */ >; }; - pinctrl_gpmi_nand: gpmi-nand-grp { + pinctrl_gpmi_nand: gpminandgrp { fsl,pins = < MX6UL_PAD_NAND_DATA00__RAWNAND_DATA00 0x100a9 MX6UL_PAD_NAND_DATA01__RAWNAND_DATA01 0x100a9 @@ -493,35 +492,35 @@ MX6UL_PAD_NAND_READY_B__RAWNAND_READY_B 0x100a9 >; }; - pinctrl_i2c1: i2c1-grp { + pinctrl_i2c1: i2c1grp { fsl,pins = < MX6UL_PAD_UART4_TX_DATA__I2C1_SCL 0x4001b8b0 /* SODIMM 196 */ MX6UL_PAD_UART4_RX_DATA__I2C1_SDA 0x4001b8b0 /* SODIMM 194 */ >; }; - pinctrl_i2c1_gpio: i2c1-gpio-grp { + pinctrl_i2c1_gpio: i2c1-gpiogrp { fsl,pins = < MX6UL_PAD_UART4_TX_DATA__GPIO1_IO28 0x4001b8b0 /* SODIMM 196 */ MX6UL_PAD_UART4_RX_DATA__GPIO1_IO29 0x4001b8b0 /* SODIMM 194 */ >; }; - pinctrl_i2c2: i2c2-grp { + pinctrl_i2c2: i2c2grp { fsl,pins = < MX6UL_PAD_UART5_TX_DATA__I2C2_SCL 0x4001f8b0 MX6UL_PAD_UART5_RX_DATA__I2C2_SDA 0x4001f8b0 >; }; - pinctrl_i2c2_gpio: i2c2-gpio-grp { + pinctrl_i2c2_gpio: i2c2-gpiogrp { fsl,pins = < MX6UL_PAD_UART5_TX_DATA__GPIO1_IO30 0x4001f8b0 MX6UL_PAD_UART5_RX_DATA__GPIO1_IO31 0x4001f8b0 >; }; - pinctrl_lcdif_dat: lcdif-dat-grp { + pinctrl_lcdif_dat: lcdifdatgrp { fsl,pins = < MX6UL_PAD_LCD_DATA00__LCDIF_DATA00 0x00079 /* SODIMM 76 */ MX6UL_PAD_LCD_DATA01__LCDIF_DATA01 0x00079 /* SODIMM 70 */ @@ -544,7 +543,7 @@ MX6UL_PAD_LCD_DATA17__LCDIF_DATA17 0x00079 /* SODIMM 61 */ >; }; - pinctrl_lcdif_ctrl: lcdif-ctrl-grp { + pinctrl_lcdif_ctrl: lcdifctrlgrp { fsl,pins = < MX6UL_PAD_LCD_CLK__LCDIF_CLK 0x00079 /* SODIMM 56 */ MX6UL_PAD_LCD_ENABLE__LCDIF_ENABLE 0x00079 /* SODIMM 44 */ @@ -553,31 +552,31 @@ MX6UL_PAD_LCD_VSYNC__LCDIF_VSYNC 0x00079 /* SODIMM 82 */ >; }; - pinctrl_pwm4: pwm4-grp { + pinctrl_pwm4: pwm4grp { fsl,pins = < MX6UL_PAD_NAND_WP_B__PWM4_OUT 0x00079 /* SODIMM 59 */ >; }; - pinctrl_pwm5: pwm5-grp { + pinctrl_pwm5: pwm5grp { fsl,pins = < MX6UL_PAD_NAND_DQS__PWM5_OUT 0x00079 /* SODIMM 28 */ >; }; - pinctrl_pwm6: pwm6-grp { + pinctrl_pwm6: pwm6grp { fsl,pins = < MX6UL_PAD_ENET1_TX_EN__PWM6_OUT 0x00079 /* SODIMM 30 */ >; }; - pinctrl_pwm7: pwm7-grp { + pinctrl_pwm7: pwm7grp { fsl,pins = < MX6UL_PAD_ENET1_TX_CLK__PWM7_OUT 0x00079 /* SODIMM 67 */ >; }; - pinctrl_uart1: uart1-grp { + pinctrl_uart1: uart1grp { fsl,pins = < MX6UL_PAD_UART1_TX_DATA__UART1_DTE_RX 0x1b0b1 /* SODIMM 33 */ MX6UL_PAD_UART1_RX_DATA__UART1_DTE_TX 0x1b0b1 /* SODIMM 35 */ @@ -586,7 +585,7 @@ MX6UL_PAD_UART1_CTS_B__UART1_DTE_RTS 0x1b0b1 /* SODIMM 25 */ >; }; - pinctrl_uart1_ctrl1: uart1-ctrl1-grp { /* Additional DTR, DCD */ + pinctrl_uart1_ctrl1: uart1ctrl1grp { /* Additional DTR, DCD */ fsl,pins = < MX6UL_PAD_JTAG_TDI__GPIO1_IO13 0x70a0 /* SODIMM 31 / DCD */ MX6UL_PAD_LCD_DATA18__GPIO3_IO23 0x10b0 /* SODIMM 29 / DSR */ @@ -595,7 +594,7 @@ MX6UL_PAD_LCD_DATA19__GPIO3_IO24 0x10b0 /* SODIMM 37 / RI */ >; }; - pinctrl_uart2: uart2-grp { + pinctrl_uart2: uart2grp { fsl,pins = < MX6UL_PAD_UART2_TX_DATA__UART2_DTE_RX 0x1b0b1 /* SODIMM 36 */ MX6UL_PAD_UART2_RX_DATA__UART2_DTE_TX 0x1b0b1 /* SODIMM 38 */ @@ -603,20 +602,20 @@ MX6UL_PAD_UART2_CTS_B__UART2_DTE_RTS 0x1b0b1 /* SODIMM 32 */ MX6UL_PAD_UART2_RTS_B__UART2_DTE_CTS 0x1b0b1 /* SODIMM 34 */ >; }; - pinctrl_uart5: uart5-grp { + pinctrl_uart5: uart5grp { fsl,pins = < MX6UL_PAD_GPIO1_IO04__UART5_DTE_RX 0x1b0b1 /* SODIMM 19 */ MX6UL_PAD_GPIO1_IO05__UART5_DTE_TX 0x1b0b1 /* SODIMM 21 */ >; }; - pinctrl_usbh_reg: gpio-usbh-reg { + pinctrl_usbh_reg: usbhreggrp { fsl,pins = < MX6UL_PAD_GPIO1_IO02__GPIO1_IO02 0x10b0 /* SODIMM 129 / USBH_PEN */ >; }; - pinctrl_usdhc1: usdhc1-grp { + pinctrl_usdhc1: usdhc1grp { fsl,pins = < MX6UL_PAD_SD1_CLK__USDHC1_CLK 0x10059 /* SODIMM 47 */ MX6UL_PAD_SD1_CMD__USDHC1_CMD 0x17059 /* SODIMM 190 */ @@ -627,7 +626,7 @@ MX6UL_PAD_SD1_DATA3__USDHC1_DATA3 0x17059 /* SODIMM 53 */ >; }; - pinctrl_usdhc1_100mhz: usdhc1-100mhz-grp { + pinctrl_usdhc1_100mhz: usdhc1-100mhzgrp { fsl,pins = < MX6UL_PAD_SD1_CLK__USDHC1_CLK 0x100b9 MX6UL_PAD_SD1_CMD__USDHC1_CMD 0x170b9 @@ -638,7 +637,7 @@ MX6UL_PAD_SD1_DATA3__USDHC1_DATA3 0x170b9 >; }; - pinctrl_usdhc1_200mhz: usdhc1-200mhz-grp { + pinctrl_usdhc1_200mhz: usdhc1-200mhzgrp { fsl,pins = < MX6UL_PAD_SD1_CLK__USDHC1_CLK 0x100f9 MX6UL_PAD_SD1_CMD__USDHC1_CMD 0x170f9 @@ -649,7 +648,7 @@ MX6UL_PAD_SD1_DATA3__USDHC1_DATA3 0x170f9 >; }; - pinctrl_usdhc2: usdhc2-grp { + pinctrl_usdhc2: usdhc2grp { fsl,pins = < MX6UL_PAD_CSI_DATA00__USDHC2_DATA0 0x17069 MX6UL_PAD_CSI_DATA01__USDHC2_DATA1 0x17069 @@ -677,7 +676,7 @@ MX6UL_PAD_NAND_DATA07__USDHC2_DATA7 0x17059 >; }; - pinctrl_wdog: wdog-grp { + pinctrl_wdog: wdoggrp { fsl,pins = < MX6UL_PAD_LCD_RESET__WDOG1_WDOG_ANY 0x30b0 >; @@ -685,7 +684,7 @@ MX6UL_PAD_LCD_RESET__WDOG1_WDOG_ANY 0x30b0 }; &iomuxc_snvs { - pinctrl_snvs_gpio1: snvs-gpio1-grp { + pinctrl_snvs_gpio1: snvsgpio1grp { fsl,pins = < MX6ULL_PAD_SNVS_TAMPER6__GPIO5_IO06 0x110a0 /* SODIMM 93 */ MX6ULL_PAD_SNVS_TAMPER3__GPIO5_IO03 0x110a0 /* SODIMM 95 */ @@ -695,49 +694,49 @@ MX6ULL_PAD_SNVS_TAMPER8__GPIO5_IO08 0x110a0 /* SODIMM 138 */ >; }; - pinctrl_snvs_gpio3: snvs-gpio3-grp { /* Wifi pins */ + pinctrl_snvs_gpio3: snvsgpio3grp { /* Wifi pins */ fsl,pins = < MX6ULL_PAD_BOOT_MODE1__GPIO5_IO11 0x130a0 /* SODIMM 127 */ >; }; - pinctrl_snvs_ad7879_int: snvs-ad7879-int-grp { /* TOUCH Interrupt */ + pinctrl_snvs_ad7879_int: snvsad7879intgrp { /* TOUCH Interrupt */ fsl,pins = < MX6ULL_PAD_SNVS_TAMPER7__GPIO5_IO07 0x100b0 >; }; - pinctrl_snvs_reg_sd: snvs-reg-sd-grp { + pinctrl_snvs_reg_sd: snvsregsdgrp { fsl,pins = < MX6ULL_PAD_SNVS_TAMPER9__GPIO5_IO09 0x400100b0 >; }; - pinctrl_snvs_usbc_det: snvs-usbc-det-grp { + pinctrl_snvs_usbc_det: snvsusbcdetgrp { fsl,pins = < MX6ULL_PAD_SNVS_TAMPER2__GPIO5_IO02 0x130b0 >; }; - pinctrl_snvs_gpiokeys: snvs-gpiokeys-grp { + pinctrl_snvs_gpiokeys: snvsgpiokeysgrp { fsl,pins = < MX6ULL_PAD_SNVS_TAMPER1__GPIO5_IO01 0x130a0 /* SODIMM 45 / WAKE_UP */ >; }; - pinctrl_snvs_usdhc1_cd: snvs-usdhc1-cd-grp { + pinctrl_snvs_usdhc1_cd: snvsusdhc1cdgrp { fsl,pins = < MX6ULL_PAD_SNVS_TAMPER0__GPIO5_IO00 0x1b0a0 /* SODIMM 43 / MMC_CD */ >; }; - pinctrl_snvs_usdhc1_sleep_cd: snvs-usdhc1-cd-grp-slp { + pinctrl_snvs_usdhc1_cd_sleep: snvsusdhc1cd-sleepgrp { fsl,pins = < MX6ULL_PAD_SNVS_TAMPER0__GPIO5_IO00 0x0 >; }; - pinctrl_snvs_wifi_pdn: snvs-wifi-pdn-grp { + pinctrl_snvs_wifi_pdn: snvswifipdngrp { fsl,pins = < MX6ULL_PAD_BOOT_MODE1__GPIO5_IO11 0x130a0 >;