From patchwork Mon Jun 17 09:13:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Walle X-Patchwork-Id: 13700350 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D08DF1922DB; Mon, 17 Jun 2024 09:13:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718615633; cv=none; b=PEd6Gto50eU8Tkjab7mZ6glAtiLDW1tXUopw7qxikvmQAOSL9f/W0WywBGKtwgZSxBooRcA+MT+iArH+znazmcS7HvAXhG2mwJZfeDS4MA1ogiEVKY7vKeo7q1u923RKJockJ0OrHJyEhg6rcgWdhKB0cRNITfbHOxRZhNiMIo4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718615633; c=relaxed/simple; bh=jfhN3gQeFOooI14dJj12+Nce4ihd2CQevZSJ2wlc8zo=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=tQ1lwxgjvUjUvoXH28BhXa79Q8ojgVMrA7vPa7JC2OlfZDzn1B/3ql0zy7Srcv95aNuqpuipL36WstJZil/96OsWljRhq2NKgOJpskvf/p8fNrLDuAqgPpPCH188MHd6hbazL2Xe/h5RKsZr6ynHRW+feQ0EDp2dbA8wp62g4nY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=A8yzg3Uo; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="A8yzg3Uo" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D9604C2BD10; Mon, 17 Jun 2024 09:13:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1718615633; bh=jfhN3gQeFOooI14dJj12+Nce4ihd2CQevZSJ2wlc8zo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=A8yzg3Uo2PocnGtNi6iyzvh/9o1b4zQJ0poqyeVS7fkVD+Qkf1sKs8CiqxM114l6+ ozeLNNyvnJesOK8T+xJFLF40MrvMF28JiPNH7Ggx9KGziLCry8Et2JiISuztO8e7S6 JGW5wzleWjZrhGYK9GX9Mc8rPC9PnULN3AWRmxiO4TRSAchsOy8iRyY2U6EfmclYfH aYHjaPdAieqHCJAt1gi95pTeg9n8xI7jijlV+JaViKwrIEUTGLAAuM+aGxFZXAhO9u 7NApD6dFsPoyZakqyxfSQOELx6AFbpH2KMuIiHPXGEaJ3B9HKTVo0liloyE0i+INuH HSUSm5xF8byzg== From: Michael Walle To: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Shawn Guo , Sascha Hauer , Li Yang Cc: Pengutronix Kernel Team , Fabio Estevam , Priit Laes , Michael Grzeschik , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Marco Felsch , imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, Michael Walle Subject: [PATCH v3 01/13] ARM: dts: imx6qdl-kontron-samx6i: fix phy-mode Date: Mon, 17 Jun 2024 11:13:29 +0200 Message-Id: <20240617091341.2375325-2-mwalle@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240617091341.2375325-1-mwalle@kernel.org> References: <20240617091341.2375325-1-mwalle@kernel.org> Precedence: bulk X-Mailing-List: imx@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 The i.MX6 cannot add any RGMII delays. The PHY has to add both the RX and TX delays on the RGMII interface. Fix the interface mode. While at it, use the new phy-connection-type property name. Fixes: 5694eed98cca ("ARM: dts: imx6qdl-kontron-samx6i: move phy reset into phy-node") Signed-off-by: Michael Walle --- arch/arm/boot/dts/nxp/imx/imx6qdl-kontron-samx6i.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/nxp/imx/imx6qdl-kontron-samx6i.dtsi b/arch/arm/boot/dts/nxp/imx/imx6qdl-kontron-samx6i.dtsi index 85aeebc9485d..d8c1dfb8c9ab 100644 --- a/arch/arm/boot/dts/nxp/imx/imx6qdl-kontron-samx6i.dtsi +++ b/arch/arm/boot/dts/nxp/imx/imx6qdl-kontron-samx6i.dtsi @@ -259,7 +259,7 @@ smarc_flash: flash@0 { &fec { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_enet>; - phy-mode = "rgmii"; + phy-connection-type = "rgmii-id"; phy-handle = <ðphy>; mdio { From patchwork Mon Jun 17 09:13:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Walle X-Patchwork-Id: 13700351 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 863511922DB; Mon, 17 Jun 2024 09:13:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718615637; cv=none; b=dhKvAM9Mwa6mGpRvf9iWOa6KRokmHwaROErIFUE7psiXzDoLF+1RTWVZv6L3tYi4Id/hnlrmVvT167qwwT43Zus/RnW085rfaVgfPCZCJqyrCO52j0zr14SWkbOph1FPtEKJuhdwO5WrPckSf4I1sYZM0YVIHsrLfeqalCJKdUM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718615637; c=relaxed/simple; bh=2Qw+7Rve50c6UoNrfytgIz8RzG/OQfuJ1xjLwlqspyo=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=iVZLX6ttKMB27+9C4E1DzaCusgL0hFSO3/GlDa5Lr5DJa1Hbsc+tOmAT4tVTbWU7Y6jk0oFbSdzkPhpQCN5F0lLtALwnRHzJXssBr7sERNXfdIXNEruOI2E6oP5QLIROYC1vja2RHpBiUbYKQQkFjAIRlBvZFZsejxIZVWBEEEw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=gSgLRADI; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="gSgLRADI" Received: by smtp.kernel.org (Postfix) with ESMTPSA id CA09CC3277B; Mon, 17 Jun 2024 09:13:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1718615637; bh=2Qw+7Rve50c6UoNrfytgIz8RzG/OQfuJ1xjLwlqspyo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gSgLRADIKoOCmMyFRz+CnOHRTTUWVz36ssNelNd6IkjvMKrJEc9aQ82LdxSAMh9S8 peNxBrFbD3hFQEevslagbikhL4fvdMvvdB6/wLBjPI/WkDoVrhB/1jMlnUdzzm3snl adk2dQjYfmBivIiWVk0cDHdvFYP06g2KV+jNo619u+aehEkLMnArTxxedkpbBgZmVu 1osLfnHwZ5GYDsfHcFaRTo8X8xAfJmeIThRDU0TeKxgvD5vY+3BT3qGWJlTUoTyc9A hr0jzg5dzS+DgZK+1Tg9cMWLJyWU8kq2h6XqOu1FeqIuFi+qe8e3bBQG4ynzZbhJwK 5zeC/R0g4Kb6A== From: Michael Walle To: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Shawn Guo , Sascha Hauer , Li Yang Cc: Pengutronix Kernel Team , Fabio Estevam , Priit Laes , Michael Grzeschik , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Marco Felsch , imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, Michael Walle Subject: [PATCH v3 02/13] ARM: dts: imx6qdl-kontron-samx6i: fix PHY reset Date: Mon, 17 Jun 2024 11:13:30 +0200 Message-Id: <20240617091341.2375325-3-mwalle@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240617091341.2375325-1-mwalle@kernel.org> References: <20240617091341.2375325-1-mwalle@kernel.org> Precedence: bulk X-Mailing-List: imx@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 The PHY reset line is connected to both the SoC (GPIO1_25) and the CPLD. We must not use the GPIO1_25 as it will drive against the output buffer of the CPLD. Instead there is another GPIO (GPIO2_01), an input to the CPLD, which will tell the CPLD to assert the PHY reset line. Fixes: 2a51f9dae13d ("ARM: dts: imx6qdl-kontron-samx6i: Add iMX6-based Kontron SMARC-sAMX6i module") Fixes: 5694eed98cca ("ARM: dts: imx6qdl-kontron-samx6i: move phy reset into phy-node") Signed-off-by: Michael Walle --- arch/arm/boot/dts/nxp/imx/imx6qdl-kontron-samx6i.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/nxp/imx/imx6qdl-kontron-samx6i.dtsi b/arch/arm/boot/dts/nxp/imx/imx6qdl-kontron-samx6i.dtsi index d8c1dfb8c9ab..d6c049b9a9c6 100644 --- a/arch/arm/boot/dts/nxp/imx/imx6qdl-kontron-samx6i.dtsi +++ b/arch/arm/boot/dts/nxp/imx/imx6qdl-kontron-samx6i.dtsi @@ -269,7 +269,7 @@ mdio { ethphy: ethernet-phy@1 { compatible = "ethernet-phy-ieee802.3-c22"; reg = <1>; - reset-gpios = <&gpio1 25 GPIO_ACTIVE_LOW>; + reset-gpios = <&gpio2 1 GPIO_ACTIVE_LOW>; reset-assert-us = <1000>; }; }; @@ -516,7 +516,7 @@ MX6QDL_PAD_RGMII_RX_CTL__RGMII_RX_CTL 0x1b0b0 MX6QDL_PAD_ENET_MDIO__ENET_MDIO 0x1b0b0 MX6QDL_PAD_ENET_MDC__ENET_MDC 0x1b0b0 MX6QDL_PAD_ENET_REF_CLK__ENET_TX_CLK 0x1b0b0 - MX6QDL_PAD_ENET_CRS_DV__GPIO1_IO25 0x1b0b0 /* RST_GBE0_PHY# */ + MX6QDL_PAD_NANDF_D1__GPIO2_IO01 0x1b0b0 /* RST_GBE0_PHY# */ >; }; From patchwork Mon Jun 17 09:13:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Walle X-Patchwork-Id: 13700352 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 392FA1946C2; Mon, 17 Jun 2024 09:14:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718615642; cv=none; b=BagaZN6stq/H6TBipxQPW16vgpe++HRIE/b5Dy+iEMb3YrJDMf0bVMignXLbkDq8x5S5Cnk8KzeDHjX1ZD/awOXmhiOdChCmjYwc/0LHZfGkbTXjXF+bRf/FvKQPdWlwsKeWmDtIBnHyEywReKNuvBN+c+oN1ehmWvu0MhfaB2A= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718615642; c=relaxed/simple; bh=u7AHMpJ6hxJGCGVBQb96kcRwezvJLSM7EQzp7Un9VP0=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=IwYi8BDhXu/lWXEZyVfGIUiKMWXKiVUdeCAW7Ho3ZDE+ik9euLaVn2/dxhYS8Aj41hFmBi5rx9p4+yZvvgZZLjq8l+jKqoy12TwcaNh4GAMh0klIirqKMQwSEbL40R5lfcY12WB7oGQGUHLxoNIFhqWKwjUe/pyJDt4teVZM7wc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=TR7PI9wj; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="TR7PI9wj" Received: by smtp.kernel.org (Postfix) with ESMTPSA id CE493C2BD10; Mon, 17 Jun 2024 09:13:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1718615641; bh=u7AHMpJ6hxJGCGVBQb96kcRwezvJLSM7EQzp7Un9VP0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TR7PI9wjEpaJiLESintGheMjzmDq2dUthpz5G1LxNSpGs/ZMdn1VOiCC3xq2hnw9I GU/VdpJifNfe0Pvl6XzDu9WEbUmNzNI5sUTWz5Y2jEjJUuExdSVHrI2CmOhJjBgxCm kReeR9kpYd3C0IzjZcSIj74JYmuRpLW39ZKeRrjsvfMauZIrDmbWpIBDusERxbB1N6 NruwfvQVUI3S1naqijfp5Ll8WXYRdzsVZBMLDhIIFYtf3MKzbr6SgzYegtJmaJnw0X EakdtNY0tXXwDkgX/2n/J02LjL6rvRRBTuWo9/R/kzBJ/nk3RaIjbmgryY/iZgq1rX ggFklxvaBxP+Q== From: Michael Walle To: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Shawn Guo , Sascha Hauer , Li Yang Cc: Pengutronix Kernel Team , Fabio Estevam , Priit Laes , Michael Grzeschik , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Marco Felsch , imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, Michael Walle Subject: [PATCH v3 03/13] ARM: dts: imx6qdl-kontron-samx6i: fix board reset Date: Mon, 17 Jun 2024 11:13:31 +0200 Message-Id: <20240617091341.2375325-4-mwalle@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240617091341.2375325-1-mwalle@kernel.org> References: <20240617091341.2375325-1-mwalle@kernel.org> Precedence: bulk X-Mailing-List: imx@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 On i.MX6 the board is reset by the watchdog. But in turn to do a complete board reset, we have to assert the WDOG_B output which is routed also to the CPLD which then do a complete power-cycle of the board. Fixes: 2125212785c9 ("ARM: dts: imx6qdl-kontron-samx6i: add Kontron SMARC SoM Support") Signed-off-by: Michael Walle --- arch/arm/boot/dts/nxp/imx/imx6qdl-kontron-samx6i.dtsi | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm/boot/dts/nxp/imx/imx6qdl-kontron-samx6i.dtsi b/arch/arm/boot/dts/nxp/imx/imx6qdl-kontron-samx6i.dtsi index d6c049b9a9c6..700780bf64f5 100644 --- a/arch/arm/boot/dts/nxp/imx/imx6qdl-kontron-samx6i.dtsi +++ b/arch/arm/boot/dts/nxp/imx/imx6qdl-kontron-samx6i.dtsi @@ -817,5 +817,6 @@ &wdog1 { /* CPLD is feeded by watchdog (hardwired) */ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_wdog1>; + fsl,ext-reset-output; status = "okay"; }; From patchwork Mon Jun 17 09:13:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Walle X-Patchwork-Id: 13700353 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7821C1946C2; Mon, 17 Jun 2024 09:14:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718615645; cv=none; b=RRxf9G/qPcoWwgcvKV0DfVxG7yQ59O0ouu3iDgLE7JoAt297qe03n/7hc45Y/c92ePava8BEuBEvYaFWf+ayZnZ7O2Zo63K0Sk9kvx4Rh08QTAHGsEwA7TZMibbb9ipQeEDHggpuoaFHbZPsI9eWfn9BsuhWgZG3NNHz8nFmBEg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718615645; c=relaxed/simple; bh=pyCuKjBDzEztSGL5VPV6DvGUsY4tB58LJ6wtMtXdCKw=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=YtF2SYC6qQ1bsGwI7MhzdOOWM9eoWQu2a1Jpnz1k0eoMCfDnnsDHT0rMLsOG7ILT9I6uvm2lIUv9tVwBXkguB+LCMYv9KbkA6Qza21cjwTs46+ij7vkVjE6bjdnNNN7m3EmcNb+RxnKIhxIm2fOrj9cSZwa55cLfBCsci5XEPbE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=UcJo24vd; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="UcJo24vd" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2E61BC3277B; Mon, 17 Jun 2024 09:14:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1718615645; bh=pyCuKjBDzEztSGL5VPV6DvGUsY4tB58LJ6wtMtXdCKw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UcJo24vdaFOmcSX4qgULmhUDw9ZyAmfnQojhcYEHB4/oz9kulowztUaKTp8ahoG7S D46WoR2fBKmXN3mqU1zyQwEslixqAO7jplXOlUNmWmDvsKYBPn/EC4FqNn/bspo+Y4 ku5GNoUkMCyJKLAMhlBtidYiZgItTUBZup5xiSbXy+Os7BDpk9lE2nf0eNNPbBrt1K Slkoe72fyFSmGHO8CPLOvrOF8+GIK/ZcwMFsQVNJEaBJUn8PQEnjjqJ0zzdnsKnx73 yHQNz0TZVkvcVmFIO/BOHw880IDXkJiBAHNgFv5PJ0cpatvIsD2uGwS21gPtGQkRp5 oLK74dCyrDa8A== From: Michael Walle To: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Shawn Guo , Sascha Hauer , Li Yang Cc: Pengutronix Kernel Team , Fabio Estevam , Priit Laes , Michael Grzeschik , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Marco Felsch , imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, Michael Walle Subject: [PATCH v3 04/13] ARM: dts: imx6qdl-kontron-samx6i: cleanup the PMIC node Date: Mon, 17 Jun 2024 11:13:32 +0200 Message-Id: <20240617091341.2375325-5-mwalle@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240617091341.2375325-1-mwalle@kernel.org> References: <20240617091341.2375325-1-mwalle@kernel.org> Precedence: bulk X-Mailing-List: imx@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Remove the comment, remove the unused phandle name for the VGEN5 output. VGEN5 is not used at all. Signed-off-by: Michael Walle --- arch/arm/boot/dts/nxp/imx/imx6qdl-kontron-samx6i.dtsi | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/arch/arm/boot/dts/nxp/imx/imx6qdl-kontron-samx6i.dtsi b/arch/arm/boot/dts/nxp/imx/imx6qdl-kontron-samx6i.dtsi index 700780bf64f5..8c7f21f986e1 100644 --- a/arch/arm/boot/dts/nxp/imx/imx6qdl-kontron-samx6i.dtsi +++ b/arch/arm/boot/dts/nxp/imx/imx6qdl-kontron-samx6i.dtsi @@ -356,10 +356,6 @@ reg_vrefddr: vrefddr { regulator-always-on; }; - /* - * Per schematics, of all VGEN's, only VGEN5 has some - * usage ... but even that - over DNI resistor - */ vgen1 { regulator-min-microvolt = <800000>; regulator-max-microvolt = <1550000>; @@ -380,8 +376,7 @@ vgen4 { regulator-max-microvolt = <3300000>; }; - reg_2p5v_s0: vgen5 { - regulator-name = "V_2V5_S0"; + vgen5 { regulator-min-microvolt = <1800000>; regulator-max-microvolt = <3300000>; }; From patchwork Mon Jun 17 09:13:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Walle X-Patchwork-Id: 13700354 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 14620194A43; Mon, 17 Jun 2024 09:14:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718615649; cv=none; b=tJBpROV+ty9NDPgwLl4+TDH69Qx6Xh8utE6U33trIisa4yZYEglCUpDGk91vMiiYxojlwdn8k0koqBn46xE7FRVEp/znjc9WZQ6asEWH6rkwgShoTzeviOZGMkP0tsDFy4oejiaC8F66Ha6n3U0gvfICcD4ZQuxMplROjEtOjq4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718615649; c=relaxed/simple; bh=pE0vsrGZNwEDC2VKKmVgmDKbUEz9TgECCZmW3XAqSV0=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=T+VF70P+bo/6A2ul+/q+0y70EjWAzXQeNOaE5XbxaYJNiLU62xOWGTZf/5badg3Itp3YU02rF6xqXWawrujRgtJzipC/Byp6kKucozp1q6cq//IleW+tFzO3cCsm1XVYO77LAcFdmshZx2EF4a1kMGphDXxOF+DmFf3GaEnJ6d8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=J0/S+A3Z; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="J0/S+A3Z" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B1E5AC4AF48; Mon, 17 Jun 2024 09:14:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1718615648; bh=pE0vsrGZNwEDC2VKKmVgmDKbUEz9TgECCZmW3XAqSV0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=J0/S+A3ZkUHzGlPOPPkSzulsvIzja4HFi9MdZl83i9a+/GUo1Sq7rBtx8g+ZPGPwr 6R+EOyzsrbEVcBGu0ZHjXdEqLm9zW/jRgSzN63xE4GiJC3yJkqjVoIWBOZ27L7e6Lc 513IegajtNQU+JhVJtOCyIdhdedKyMcDRwmwjT2IHZlYu+Uj9S4+qBfz9/s6t1aC0g A0crIxgBGe8j0sPGIHwN8w6GyboNSjhi86eFldbW30v139kCLejM0QC4SM3dLAmDDp IvWcxZD/E10PUhRdt7qV/5wMXmbEChhFIwcftfhkchbGY2jXZD4UMNlQfkLGIGsWte PfgrDEERCtcBg== From: Michael Walle To: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Shawn Guo , Sascha Hauer , Li Yang Cc: Pengutronix Kernel Team , Fabio Estevam , Priit Laes , Michael Grzeschik , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Marco Felsch , imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, Michael Walle Subject: [PATCH v3 05/13] ARM: dts: imx6qdl-kontron-samx6i: fix SPI0 chip selects Date: Mon, 17 Jun 2024 11:13:33 +0200 Message-Id: <20240617091341.2375325-6-mwalle@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240617091341.2375325-1-mwalle@kernel.org> References: <20240617091341.2375325-1-mwalle@kernel.org> Precedence: bulk X-Mailing-List: imx@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 There is a comment in the imx6q variant dtsi claiming that these modules will have one more chip select than the imx6dl variant. This is wrong. Ordinary GPIOs are used for chip selects and both variants of the module share the very same PCB and both have this GPIO routed to the SPI0_CS1# pin of the SMARC connector. Fix it by moving the third chip select description to the common dtsi. Fixes: 2125212785c9 ("ARM: dts: imx6qdl-kontron-samx6i: add Kontron SMARC SoM Support") Signed-off-by: Michael Walle --- .../dts/nxp/imx/imx6q-kontron-samx6i.dtsi | 23 ------------------- .../dts/nxp/imx/imx6qdl-kontron-samx6i.dtsi | 5 +++- 2 files changed, 4 insertions(+), 24 deletions(-) diff --git a/arch/arm/boot/dts/nxp/imx/imx6q-kontron-samx6i.dtsi b/arch/arm/boot/dts/nxp/imx/imx6q-kontron-samx6i.dtsi index 4d6a0c3e8455..ff062f4fd726 100644 --- a/arch/arm/boot/dts/nxp/imx/imx6q-kontron-samx6i.dtsi +++ b/arch/arm/boot/dts/nxp/imx/imx6q-kontron-samx6i.dtsi @@ -5,31 +5,8 @@ #include "imx6q.dtsi" #include "imx6qdl-kontron-samx6i.dtsi" -#include / { model = "Kontron SMARC sAMX6i Quad/Dual"; compatible = "kontron,imx6q-samx6i", "fsl,imx6q"; }; - -/* Quad/Dual SoMs have 3 chip-select signals */ -&ecspi4 { - cs-gpios = <&gpio3 24 GPIO_ACTIVE_LOW>, - <&gpio3 29 GPIO_ACTIVE_LOW>, - <&gpio3 25 GPIO_ACTIVE_LOW>; -}; - -&pinctrl_ecspi4 { - fsl,pins = < - MX6QDL_PAD_EIM_D21__ECSPI4_SCLK 0x100b1 - MX6QDL_PAD_EIM_D28__ECSPI4_MOSI 0x100b1 - MX6QDL_PAD_EIM_D22__ECSPI4_MISO 0x100b1 - - /* SPI4_IMX_CS2# - connected to internal flash */ - MX6QDL_PAD_EIM_D24__GPIO3_IO24 0x1b0b0 - /* SPI4_IMX_CS0# - connected to SMARC SPI0_CS0# */ - MX6QDL_PAD_EIM_D29__GPIO3_IO29 0x1b0b0 - /* SPI4_CS3# - connected to SMARC SPI0_CS1# */ - MX6QDL_PAD_EIM_D25__GPIO3_IO25 0x1b0b0 - >; -}; diff --git a/arch/arm/boot/dts/nxp/imx/imx6qdl-kontron-samx6i.dtsi b/arch/arm/boot/dts/nxp/imx/imx6qdl-kontron-samx6i.dtsi index 8c7f21f986e1..4a6ab7e7908a 100644 --- a/arch/arm/boot/dts/nxp/imx/imx6qdl-kontron-samx6i.dtsi +++ b/arch/arm/boot/dts/nxp/imx/imx6qdl-kontron-samx6i.dtsi @@ -244,7 +244,8 @@ &ecspi4 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_ecspi4>; cs-gpios = <&gpio3 24 GPIO_ACTIVE_LOW>, - <&gpio3 29 GPIO_ACTIVE_LOW>; + <&gpio3 29 GPIO_ACTIVE_LOW>, + <&gpio3 25 GPIO_ACTIVE_LOW>; status = "okay"; /* default boot source: workaround #1 for errata ERR006282 */ @@ -459,6 +460,8 @@ MX6QDL_PAD_EIM_D22__ECSPI4_MISO 0x100b1 MX6QDL_PAD_EIM_D24__GPIO3_IO24 0x1b0b0 /* SPI_IMX_CS0# - connected to SMARC SPI0_CS0# */ MX6QDL_PAD_EIM_D29__GPIO3_IO29 0x1b0b0 + /* SPI4_CS3# - connected to SMARC SPI0_CS1# */ + MX6QDL_PAD_EIM_D25__GPIO3_IO25 0x1b0b0 >; }; From patchwork Mon Jun 17 09:13:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Walle X-Patchwork-Id: 13700355 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 882D8194A43; Mon, 17 Jun 2024 09:14:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718615652; cv=none; b=fHFY4FYrOEuyNZQ4M/ecjLIIIEzAQWYjFjCeJU0OZDscAFN8JOKt8nEOuEcICgNk03zroWaC5yx0ejdeV+CYS6bkqoo8iLS1tn6ytnGeeVkVOffH+bGw/cBYV89jSEX0K604H4Gb7tzy2j2pEtqMcIowN11JipIbswi0UsxjvoU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718615652; c=relaxed/simple; bh=cP7uD/wG7u91xicq/qibn/jCrRGqs0slZIoz+5q3tuk=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=pCGs+60x75b0dKJjrRd9ZAlattv5PVXya/7gaeU2I94H68NrtUtsf0KQZ6extUtWfyTZWoBYY9L4jHLxhANkbTsxOQ+4EoVVQGV8HTploC+ELvENZ9oaPQX1AhahA6eh6lG7Dpo+WcXue+uSCVCg6DyM9f0bzvt7NBh7sZ4mPDk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=kCm6AaBm; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="kCm6AaBm" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 47742C3277B; Mon, 17 Jun 2024 09:14:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1718615652; bh=cP7uD/wG7u91xicq/qibn/jCrRGqs0slZIoz+5q3tuk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kCm6AaBmez7X1vwAKAWGnf189sB/Xi+Sjvf0hxI9KY8IHvb6TnYThlMbYERr7vMLs OgwauOmGXNfHOwrTcq1E7nPSaAKgAbqfOojb8Ax6pG1fh/K/uMETP9ma+TLFhu40aQ cf0qTCjVp82rZBDineucSrUtq+m4TUO2HD+ovDXq48P+5tDQjZTykBf3yP/FDOkRI5 GhslGnuTtC2CoVEDc6N5pH/dQndFHxUMmkgQ9FTXTFooHsVX1XtrMC/uZZHJSFPOkc R7Hm9GcdnfQOpcyICrtpRGBuPEeHyD3aKJwVT3Nv3BuMLi5dDg6apGauqGU/nRzIhH Ra59IfNbhWQFQ== From: Michael Walle To: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Shawn Guo , Sascha Hauer , Li Yang Cc: Pengutronix Kernel Team , Fabio Estevam , Priit Laes , Michael Grzeschik , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Marco Felsch , imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, Michael Walle Subject: [PATCH v3 06/13] ARM: dts: imx6qdl-kontron-samx6i: fix product name Date: Mon, 17 Jun 2024 11:13:34 +0200 Message-Id: <20240617091341.2375325-7-mwalle@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240617091341.2375325-1-mwalle@kernel.org> References: <20240617091341.2375325-1-mwalle@kernel.org> Precedence: bulk X-Mailing-List: imx@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 The correct name of the product is "Kontron SMARC-sAMX6i". See also https://www.kontron.com/en/products/smarc-samx6i/p89810 Signed-off-by: Michael Walle --- arch/arm/boot/dts/nxp/imx/imx6dl-kontron-samx6i.dtsi | 2 +- arch/arm/boot/dts/nxp/imx/imx6q-kontron-samx6i.dtsi | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/nxp/imx/imx6dl-kontron-samx6i.dtsi b/arch/arm/boot/dts/nxp/imx/imx6dl-kontron-samx6i.dtsi index a864fdbd5f16..5a9b819d7ee8 100644 --- a/arch/arm/boot/dts/nxp/imx/imx6dl-kontron-samx6i.dtsi +++ b/arch/arm/boot/dts/nxp/imx/imx6dl-kontron-samx6i.dtsi @@ -7,6 +7,6 @@ #include "imx6qdl-kontron-samx6i.dtsi" / { - model = "Kontron SMARC sAMX6i Dual-Lite/Solo"; + model = "Kontron SMARC-sAMX6i Dual-Lite/Solo"; compatible = "kontron,imx6dl-samx6i", "fsl,imx6dl"; }; diff --git a/arch/arm/boot/dts/nxp/imx/imx6q-kontron-samx6i.dtsi b/arch/arm/boot/dts/nxp/imx/imx6q-kontron-samx6i.dtsi index ff062f4fd726..e76963436079 100644 --- a/arch/arm/boot/dts/nxp/imx/imx6q-kontron-samx6i.dtsi +++ b/arch/arm/boot/dts/nxp/imx/imx6q-kontron-samx6i.dtsi @@ -7,6 +7,6 @@ #include "imx6qdl-kontron-samx6i.dtsi" / { - model = "Kontron SMARC sAMX6i Quad/Dual"; + model = "Kontron SMARC-sAMX6i Quad/Dual"; compatible = "kontron,imx6q-samx6i", "fsl,imx6q"; }; From patchwork Mon Jun 17 09:13:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Walle X-Patchwork-Id: 13700356 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 382E2191487; Mon, 17 Jun 2024 09:14:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718615657; cv=none; b=C7HJbBeLg1lInuQ4siiE0Vcky4ZbhpjbAhLmyajSyvwBGzRlLw3octAmSHrup2rT19sfmumw2HtU0wF25TnRj7zJRW2rVJ7Y8uOyU6mQZuhYEMf3y7mFvItK0N1YkODjUuuTCBn1ltlZbTn+N33Vftu9n2PZnPhWX/eWZXAJlww= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718615657; c=relaxed/simple; bh=bp4RUBBoDBNxBmueQhwpMXLVezAaB2zJTWzVJs7lfD8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=sjUn/wWfu3bCbDdDNPf1g9+YSfA6wIYICgpEKQynFIISkbaQAJmLJoJzpmncbvZrahbUiLZT8R77e0ETeFizmEbFWxfbSZIcfSA4JcQk4d/I91yjHjHKWUwVGmZruZgjUIxT+Mu6qzjfDAFGrlXBNmv0PKFrgKL2o/8WFOcE0AQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=S2QE5Huz; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="S2QE5Huz" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D5C1EC4AF49; Mon, 17 Jun 2024 09:14:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1718615656; bh=bp4RUBBoDBNxBmueQhwpMXLVezAaB2zJTWzVJs7lfD8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=S2QE5HuzOFuX81SdBqF4480CA19sd5iLeOJJU9ZxbBKVBbJCzu5zUDDIlY5aeSPEZ EZkImFPY/kjCSwyESbZhfOAcytLWvavHjA6HF18YqZBX5CDEHn8g5iz2+JZkJC15YK xgxN3PuqG7lVS/3WYF76f8QDjqxwszq/cz9iCYtxIkSnzkpb+aqD2qRDVkV3ujDZWU ooza4qMLdSWx8/pf7F/3hG1Cujt68+pfIZ14tGJ6J64UbCl7754fZv9Ql/3saSGG6U uy/ww3l0BhFWsSMgubbglDdXDwQcGL2TZxDSsJEsnCMQ9pvjjfx9atup7PevQStyhe evgbGwhvKlBhA== From: Michael Walle To: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Shawn Guo , Sascha Hauer , Li Yang Cc: Pengutronix Kernel Team , Fabio Estevam , Priit Laes , Michael Grzeschik , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Marco Felsch , imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, Michael Walle Subject: [PATCH v3 07/13] ARM: dts: imx6qdl-kontron-samx6i: always enable eMMC Date: Mon, 17 Jun 2024 11:13:35 +0200 Message-Id: <20240617091341.2375325-8-mwalle@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240617091341.2375325-1-mwalle@kernel.org> References: <20240617091341.2375325-1-mwalle@kernel.org> Precedence: bulk X-Mailing-List: imx@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 There are no variants of this module without an eMMC. Signed-off-by: Michael Walle --- arch/arm/boot/dts/nxp/imx/imx6qdl-kontron-samx6i.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/nxp/imx/imx6qdl-kontron-samx6i.dtsi b/arch/arm/boot/dts/nxp/imx/imx6qdl-kontron-samx6i.dtsi index 4a6ab7e7908a..4d3cd338a707 100644 --- a/arch/arm/boot/dts/nxp/imx/imx6qdl-kontron-samx6i.dtsi +++ b/arch/arm/boot/dts/nxp/imx/imx6qdl-kontron-samx6i.dtsi @@ -800,7 +800,6 @@ &usdhc3 { /* SDMMC */ &usdhc4 { - /* Internal eMMC, optional on some boards */ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usdhc4>; bus-width = <8>; @@ -809,6 +808,7 @@ &usdhc4 { non-removable; vmmc-supply = <®_3p3v_s0>; vqmmc-supply = <®_1p8v_s0>; + status = "okay"; }; &wdog1 { From patchwork Mon Jun 17 09:13:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Walle X-Patchwork-Id: 13700357 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 73AFD191487; Mon, 17 Jun 2024 09:14:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718615660; cv=none; b=SAmrgzG1LRIlJUMoUS8GbrUeaLhRvcHfffrPH1VPiOIXqNDjvGV9KLJ3PddI1KAcpDAa6pXCohwe38bsiO0s2L7hYwSFEAEyzWorwLqGiLhp2nFt9oi7Hp++G82Sr9FPxK2XS9HL7e2SgE1svwc/cXoLbvHAOC30wJfV/zg2b9w= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718615660; c=relaxed/simple; bh=gTIOno+uQobG2s2zwgq6QAs/t1j8ChDipZAsKji3qro=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=IGmkR7eZemAOuDUliUc5viuqiuMRcdjXfVQLBwCk71FYwSDP+dTZY6Z+WD+7dfJsirCyfC3RReFRSCuEu28czPQ9NsrRBnaXKkZULjldjDebi6WzN2OURz+WF7S+MeBdqYUClyvUyod4yYgGUb98QYK6Ry40UQwvGtbwsoKSpR0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=nJD+U2jN; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="nJD+U2jN" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3EF6DC2BD10; Mon, 17 Jun 2024 09:14:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1718615660; bh=gTIOno+uQobG2s2zwgq6QAs/t1j8ChDipZAsKji3qro=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nJD+U2jNWutuMWLEV8fCL8lqSjVomSN89ADr8oeQx/j4TyLE50LiMOISbSViOaf62 88+mHrLjw6wEhUW6zMTbBVJAVamYzto3SmOsN3pxqRn6B3tUOKciSNevfQ63ualAfI H/ujSesrvsCJv+0pv5lgzZLnRIDqx6TBLcXFGjFnOn5GQuKQLqvwQyUhaCFyCJ3U6t EABoXFoGBJbX2zQ3WUJ1EAasNOzE6E5/Q6zUu3zgoq3zXSl1Z8Mwnn82fnA6WyXDk8 izLVcGmpi6NqdUSQ3weTqtmj/9RYA5/q55A3AKrL9yKkGK47L8NBzU+F2CBH7+K9jq k0kUkKIAnvlmA== From: Michael Walle To: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Shawn Guo , Sascha Hauer , Li Yang Cc: Pengutronix Kernel Team , Fabio Estevam , Priit Laes , Michael Grzeschik , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Marco Felsch , imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, Michael Walle Subject: [PATCH v3 08/13] ARM: dts: imx6qdl-kontron-samx6i: add SDIO_PWR_EN support Date: Mon, 17 Jun 2024 11:13:36 +0200 Message-Id: <20240617091341.2375325-9-mwalle@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240617091341.2375325-1-mwalle@kernel.org> References: <20240617091341.2375325-1-mwalle@kernel.org> Precedence: bulk X-Mailing-List: imx@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 The module can enable/disable the SD card power supply and has it's dedicated pin SDIO_PWR_EN for that reason. This is esp. useful to be able to reset the SD card if it was in an UHS mode. Signed-off-by: Michael Walle --- .../dts/nxp/imx/imx6qdl-kontron-samx6i.dtsi | 20 ++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/nxp/imx/imx6qdl-kontron-samx6i.dtsi b/arch/arm/boot/dts/nxp/imx/imx6qdl-kontron-samx6i.dtsi index 4d3cd338a707..b0fa07ade76d 100644 --- a/arch/arm/boot/dts/nxp/imx/imx6qdl-kontron-samx6i.dtsi +++ b/arch/arm/boot/dts/nxp/imx/imx6qdl-kontron-samx6i.dtsi @@ -61,6 +61,18 @@ reg_3p3v_s5: regulator-3p3v-s5 { vin-supply = <®_smarc_suppy>; }; + reg_sdio: regulator-sdio { + compatible = "regulator-fixed"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_reg_sdio>; + regulator-name = "V_3V3_SD"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + gpio = <&gpio1 29 GPIO_ACTIVE_HIGH>; + enable-active-high; + off-on-delay-us = <20000>; + }; + reg_smarc_lcdbklt: regulator-smarc-lcdbklt { compatible = "regulator-fixed"; pinctrl-names = "default"; @@ -640,6 +652,12 @@ MX6QDL_PAD_SD1_CMD__PWM4_OUT 0x1b0b1 >; }; + pinctrl_reg_sdio: reg-sdiogrp { + fsl,pins = < + MX6QDL_PAD_ENET_TXD1__GPIO1_IO29 0x1b0b0 /* SDIO_PWR_EN */ + >; + }; + pinctrl_uart1: uart1grp { fsl,pins = < MX6QDL_PAD_CSI0_DAT11__UART1_RX_DATA 0x1b0b1 @@ -692,7 +710,6 @@ MX6QDL_PAD_SD3_DAT3__SD3_DATA3 0x17059 MX6QDL_PAD_NANDF_CS1__GPIO6_IO14 0x1b0b0 /* CD */ MX6QDL_PAD_ENET_RXD1__GPIO1_IO26 0x1b0b0 /* WP */ - MX6QDL_PAD_ENET_TXD1__GPIO1_IO29 0x1b0b0 /* PWR_EN */ >; }; @@ -795,6 +812,7 @@ &usdhc3 { pinctrl-0 = <&pinctrl_usdhc3>; cd-gpios = <&gpio6 14 GPIO_ACTIVE_LOW>; wp-gpios = <&gpio1 26 GPIO_ACTIVE_HIGH>; + vmmc-supply = <®_sdio>; no-1-8-v; }; From patchwork Mon Jun 17 09:13:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Walle X-Patchwork-Id: 13700358 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2B238191487; Mon, 17 Jun 2024 09:14:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718615664; cv=none; b=ugw/dWChVu1XGC3yYCOEpmIK1A61Wir3DtXCN8iDc50PDvxk+lxWu3fkrzAttdhJP3V6Hsihv9jqhq9aACDRPVHRDlYwYo6o1MaIFi7OZ7lsNcSGr5Iobp5T+r4Uf4SulkJaIe4lBv5nxbw519gH7OAFBWuyMlab5JG4z96i4rw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718615664; c=relaxed/simple; bh=wvPQCYhRVZsmJmMA1m/0GLBRX74K7bIkQJCEyPrWUjA=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=AYS/fgKHqjTCJQZ09ZidbOfsW9GQy64Jbfng0j+wWdqp7R4eFV4fR0sdlh03DDJeuvtrGbfcBoj8OprJSYZHecdhYF0DRxuDR/0cr5M/wji6pqpgG+QUka8ayMU+j0W4gq2nA4HIoR41tRMlVpLmFrHKrtKQeUtwQBcYmpQpwuk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=D/Hz+fJS; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="D/Hz+fJS" Received: by smtp.kernel.org (Postfix) with ESMTPSA id BED78C4AF48; Mon, 17 Jun 2024 09:14:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1718615663; bh=wvPQCYhRVZsmJmMA1m/0GLBRX74K7bIkQJCEyPrWUjA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=D/Hz+fJSL/DgYt/1UdmanoJnvOOp6OJ7XhXT6kyCOEWAumDM7NPtgp3mJRcB/usv7 MOWYkD4nv4QPRN9INsA2mYe7QjEBbVvjzplXMVU4SzU7PtmkBQ7gsN7x2/2U6YXcAQ AopP2TFg3luyPjXVk+yAtjJIhLYBMMrWB3EynB89dctFnE/8IXF4JbK3feA3m9q9LQ EiZAB0kPnIhr19gTAACUKzesw4930o9TxxPujNMFT1zOC26TBjAyxOvKMdvSSK7gqh xbPueXoc7o/9jdhx13yEOMU+wn9kT6c3f3+ok9c85um2C4gMUgPm3Iv59ogtYk6bJS /JRJuHed42hfw== From: Michael Walle To: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Shawn Guo , Sascha Hauer , Li Yang Cc: Pengutronix Kernel Team , Fabio Estevam , Priit Laes , Michael Grzeschik , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Marco Felsch , imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, Michael Walle Subject: [PATCH v3 09/13] ARM: dts: imx6qdl-kontron-samx6i: fix node names Date: Mon, 17 Jun 2024 11:13:37 +0200 Message-Id: <20240617091341.2375325-10-mwalle@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240617091341.2375325-1-mwalle@kernel.org> References: <20240617091341.2375325-1-mwalle@kernel.org> Precedence: bulk X-Mailing-List: imx@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Rename the nodes according to the schema. In particular, rename the bit bang I2C controller to "i2c-N" and the mux nodes of the audmux to "mux-*". While at it, fix the typo "adu", which should have been "aud". Signed-off-by: Michael Walle --- .../boot/dts/nxp/imx/imx6qdl-kontron-samx6i.dtsi | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/arch/arm/boot/dts/nxp/imx/imx6qdl-kontron-samx6i.dtsi b/arch/arm/boot/dts/nxp/imx/imx6qdl-kontron-samx6i.dtsi index b0fa07ade76d..7eeffd6eb476 100644 --- a/arch/arm/boot/dts/nxp/imx/imx6qdl-kontron-samx6i.dtsi +++ b/arch/arm/boot/dts/nxp/imx/imx6qdl-kontron-samx6i.dtsi @@ -149,7 +149,7 @@ lcd_backlight: lcd-backlight { status = "disabled"; }; - i2c_intern: i2c-gpio-intern { + i2c_intern: i2c-0 { compatible = "i2c-gpio"; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_i2c_gpio_intern>; @@ -160,7 +160,7 @@ i2c_intern: i2c-gpio-intern { #size-cells = <0>; }; - i2c_lcd: i2c-gpio-lcd { + i2c_lcd: i2c-1 { compatible = "i2c-gpio"; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_i2c_gpio_lcd>; @@ -172,7 +172,7 @@ i2c_lcd: i2c-gpio-lcd { status = "disabled"; }; - i2c_cam: i2c-gpio-cam { + i2c_cam: i2c-2 { compatible = "i2c-gpio"; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_i2c_gpio_cam>; @@ -190,7 +190,7 @@ &audmux { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_audmux>; - audmux_ssi1 { + mux-ssi1 { fsl,audmux-port = ; fsl,port-config = < (IMX_AUDMUX_V2_PTCR_TFSEL(MX51_AUDMUX_PORT3) | @@ -202,7 +202,7 @@ IMX_AUDMUX_V2_PDCR_RXDSEL(MX51_AUDMUX_PORT3) >; }; - audmux_adu3 { + mux-aud3 { fsl,audmux-port = ; fsl,port-config = < IMX_AUDMUX_V2_PTCR_SYN @@ -210,7 +210,7 @@ IMX_AUDMUX_V2_PDCR_RXDSEL(MX51_AUDMUX_PORT1_SSI0) >; }; - audmux_ssi2 { + mux-ssi2 { fsl,audmux-port = ; fsl,port-config = < (IMX_AUDMUX_V2_PTCR_TFSEL(MX51_AUDMUX_PORT4) | @@ -222,7 +222,7 @@ IMX_AUDMUX_V2_PDCR_RXDSEL(MX51_AUDMUX_PORT4) >; }; - audmux_adu4 { + mux-aud4 { fsl,audmux-port = ; fsl,port-config = < IMX_AUDMUX_V2_PTCR_SYN From patchwork Mon Jun 17 09:13:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Walle X-Patchwork-Id: 13700359 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8E5E5191487; Mon, 17 Jun 2024 09:14:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718615667; cv=none; b=MVP/CnpfKDaw4rzQhvElVJB+Tfq+w4NKJN8UpX2bMjc93Zvl2prYN7mNMt8O/qBUBXFO9s8GzD6uL5ebhDLVn8fC5wAZdmE3UshtNNIHsdwED718Cg/MGfm0+w3E61Tbc6BUA3+a1O9Qxa3osO5IAW1UGC/EIUAfw2faP+qgBl8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718615667; c=relaxed/simple; bh=fLzK0kTI9Tfc5pcfO4P9fZmej83wx+iFj8ikPvPtfBQ=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Cp+NxgHQtZCw6Bv7FnOZGr+OLk4a1njAX3TOEdik5AME++6Wo+wwy5VqHBtaIu+lUAIl/P7WUeXHZgLaqMcqGZhRdaDvYErSlcm0HhJVR8E45YQVNOjXkjn0CWmg7fvlBUE4MWxpMoOyJyOVL7lsRLi9Pxe2T0ybmfVtCBW0Ah8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=hcO8MRlJ; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="hcO8MRlJ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 52717C2BD10; Mon, 17 Jun 2024 09:14:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1718615667; bh=fLzK0kTI9Tfc5pcfO4P9fZmej83wx+iFj8ikPvPtfBQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hcO8MRlJHQv5Cc1SUYTMLubHFcdI5yS2+ktpI5gmXmNFmHvD7feGXtQd8ebxjwjaD yJRMXF4BAt0r7lR3bckBUQB133KRDLOaUSPPik/vfbRPucDaqD/Vcr2r90mRIYhfev FTFb+NeCr9JmalkKumPvOCW2B3Rv3nkOHsX/QSMX7yVeZM7cgTvxMjxcgtD3CF804W I9XEleethBz79+wnCOH2zNm+TSTeZ+3PJacP8t8rSAHKSmCHT5hv6YAyDpvJbCsZN9 LvViBkWvHsO+2vnqKne+rmPRxm+hDYpol1wM1A65/lnw/3bzj6aYSm+H81FAp3vnga yDPzHRTM031wg== From: Michael Walle To: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Shawn Guo , Sascha Hauer , Li Yang Cc: Pengutronix Kernel Team , Fabio Estevam , Priit Laes , Michael Grzeschik , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Marco Felsch , imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, Michael Walle Subject: [PATCH v3 10/13] ARM: dts: imx6qdl-kontron-samx6i: fix PCIe reset polarity Date: Mon, 17 Jun 2024 11:13:38 +0200 Message-Id: <20240617091341.2375325-11-mwalle@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240617091341.2375325-1-mwalle@kernel.org> References: <20240617091341.2375325-1-mwalle@kernel.org> Precedence: bulk X-Mailing-List: imx@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 The PCIe reset line is active low. Fix it. Fixes: 2a51f9dae13d ("ARM: dts: imx6qdl-kontron-samx6i: Add iMX6-based Kontron SMARC-sAMX6i module") Signed-off-by: Michael Walle --- arch/arm/boot/dts/nxp/imx/imx6qdl-kontron-samx6i.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/nxp/imx/imx6qdl-kontron-samx6i.dtsi b/arch/arm/boot/dts/nxp/imx/imx6qdl-kontron-samx6i.dtsi index 7eeffd6eb476..17abebc006df 100644 --- a/arch/arm/boot/dts/nxp/imx/imx6qdl-kontron-samx6i.dtsi +++ b/arch/arm/boot/dts/nxp/imx/imx6qdl-kontron-samx6i.dtsi @@ -744,7 +744,7 @@ &pcie { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_pcie>; wake-up-gpio = <&gpio6 18 GPIO_ACTIVE_HIGH>; - reset-gpio = <&gpio3 13 GPIO_ACTIVE_HIGH>; + reset-gpio = <&gpio3 13 GPIO_ACTIVE_LOW>; }; /* LCD_BKLT_PWM */ From patchwork Mon Jun 17 09:13:39 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Walle X-Patchwork-Id: 13700360 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 81C72191487; Mon, 17 Jun 2024 09:14:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718615671; cv=none; b=PUfo9NpUA8duGK+UJTBuQIhSQMg+AuC/74n5LapkK/p34S+z+C2c76YCkMaIluwaP4xjm2jdn6aTW8xDLyznrvqtkQujWhU5RBQC4UpBHmv7DvRa5NuwX1Hwk5utkSdYidTQWXiiaTEYs5SebSL/ZDdz+nrs2c1Sv/fZ4H1yhnI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718615671; c=relaxed/simple; bh=tpQMAObsPqtgZVeWEe00fFNPhp6LEVK8ndsh5tnhczo=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=P6944jfG2cRWnf+qZvj4tQOR5G4HUdic2q5YHCx9dSckg4EFcxy1YFG4cE3wCNo8WIxCHxKMI9HQyA32L3vQrYOaoTgKyZuQg2ZtYTZsyw2euuiL4sCubtvFUj4tIh3dIQNUoXHPytm09AOzlGVESVXfdda3ms9VgxvDYJS3el0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=G4dwVvfc; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="G4dwVvfc" Received: by smtp.kernel.org (Postfix) with ESMTPSA id DCC7FC3277B; Mon, 17 Jun 2024 09:14:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1718615671; bh=tpQMAObsPqtgZVeWEe00fFNPhp6LEVK8ndsh5tnhczo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=G4dwVvfcNTCt1bF/ICsimD35oDx+5E0WVm95gTE5aLrpQFgLRElJpIeb/28XgrWCu 6Tm8iWG/hYONPxw5Zcmg/zq1+cC8DZ1RurJobITW3zv7iEqkyAbyPTCwuhgshfCJBj a3yFgJHZOYfhfnJqjxFqRaX/vvremNjmvW8QJo4HuY91SAZNsJKZFnmWoAXK6Wiv7j zH9bbatRhuc7b4AEykVXE1KxaHGPhdI39FC/ucdMrYb5gQZbsCYSa7EzyRd669ZpcP 3qLQGdrLhm5xK1fud0Z2ZJTpEk4gX3piEZK0EKGQTSNTeGU8IESPe1mV2DittpiMn0 f9nRivLPhF/mg== From: Michael Walle To: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Shawn Guo , Sascha Hauer , Li Yang Cc: Pengutronix Kernel Team , Fabio Estevam , Priit Laes , Michael Grzeschik , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Marco Felsch , imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, Michael Walle Subject: [PATCH v3 11/13] ARM: dts: imx6qdl-kontron-samx6i: remove wake-up-gpio property Date: Mon, 17 Jun 2024 11:13:39 +0200 Message-Id: <20240617091341.2375325-12-mwalle@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240617091341.2375325-1-mwalle@kernel.org> References: <20240617091341.2375325-1-mwalle@kernel.org> Precedence: bulk X-Mailing-List: imx@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Remove the "wake-up-gpio" property within the PCIe controller node. There is no such property, thus just remove it. This will also make the schema validation happy. Signed-off-by: Michael Walle --- arch/arm/boot/dts/nxp/imx/imx6qdl-kontron-samx6i.dtsi | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/arm/boot/dts/nxp/imx/imx6qdl-kontron-samx6i.dtsi b/arch/arm/boot/dts/nxp/imx/imx6qdl-kontron-samx6i.dtsi index 17abebc006df..99b5e78458aa 100644 --- a/arch/arm/boot/dts/nxp/imx/imx6qdl-kontron-samx6i.dtsi +++ b/arch/arm/boot/dts/nxp/imx/imx6qdl-kontron-samx6i.dtsi @@ -743,7 +743,6 @@ &mipi_csi { &pcie { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_pcie>; - wake-up-gpio = <&gpio6 18 GPIO_ACTIVE_HIGH>; reset-gpio = <&gpio3 13 GPIO_ACTIVE_LOW>; }; From patchwork Mon Jun 17 09:13:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Walle X-Patchwork-Id: 13700361 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 229F4191487; Mon, 17 Jun 2024 09:14:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718615676; cv=none; b=e1B4ko0OljZYf2aXhuwTOh9Z82va0tKcrQlSli+7hVyqSdX8fCkr7kkTYUAYd2MfKE+KlsODD6WxCauJlbYwjGiyigb40L4+NUxsBR7rOylibKrTZCZSHVo3bo+THjeB6f0m6lrOXD4R+w+1TSKRwbl82deP+6paKtxQOvCdY2E= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718615676; c=relaxed/simple; bh=RlPWeWXjhvnYwwTMXwCVHKOnptTzdjxk1lMBqmrQsYg=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=lINKwtHqeZ4/slagvybrlaqh0MF29ANbsXUbLo6PTeq7yooJzd5atSy6Nqvss0ewFaADf4M+k3WtR3jnGSMWJ0lKX1hAJZmCys+fqpL4zp/1ZvNhPdidmhDhdzLZqa9dAHgKe7FyDbxCbamGQk+zTcueBXowIHELCpCQ0BHqV8U= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=oeWZB1Yu; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="oeWZB1Yu" Received: by smtp.kernel.org (Postfix) with ESMTPSA id CAAC9C4AF1D; Mon, 17 Jun 2024 09:14:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1718615675; bh=RlPWeWXjhvnYwwTMXwCVHKOnptTzdjxk1lMBqmrQsYg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oeWZB1YumCqPsTcKN0L8sJBtZSltuamDJN5SOMEQ5Kaq2IZsHBhmjUCOg0WVwBebF zDoeEjpo4uthc2UcisiZwWED6h+0z3by3IQufGqSkar3QEyrj+mQDx2Umc+ot5suTC 1K+CbBSx/QrktYF7dvM1XZHp30q79JpuxRxBnMOqFDb67EnlSI/ADw1bXcA7Q9NLOp mz5pnUFLd0EMdXG6kjF8TeKNYPNrOn/qGQoViSz2Ed1lOe74Zb4AhQycJsQjTZJW0j jZgcfEpFbFBNg/bHZhkGH/eht84WBwY4c5EV6Ok6tEeqcqXXG9KrwOK7DqtmdPr4Rh 05iOEoNX7YcKQ== From: Michael Walle To: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Shawn Guo , Sascha Hauer , Li Yang Cc: Pengutronix Kernel Team , Fabio Estevam , Priit Laes , Michael Grzeschik , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Marco Felsch , imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, Michael Walle , Krzysztof Kozlowski Subject: [PATCH v3 12/13] dt-bindings: arm: fsl: document Kontron SMARC-sAMX6i boards Date: Mon, 17 Jun 2024 11:13:40 +0200 Message-Id: <20240617091341.2375325-13-mwalle@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240617091341.2375325-1-mwalle@kernel.org> References: <20240617091341.2375325-1-mwalle@kernel.org> Precedence: bulk X-Mailing-List: imx@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 The Kontron SMARC-sAMX6i is just a module. There was no device tree for an actual board for now. Document the binding to use the module on the evaluation carrier. Acked-by: Krzysztof Kozlowski Signed-off-by: Michael Walle --- Documentation/devicetree/bindings/arm/fsl.yaml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/Documentation/devicetree/bindings/arm/fsl.yaml b/Documentation/devicetree/bindings/arm/fsl.yaml index 6d185d09cb6a..f731fb5b5e2a 100644 --- a/Documentation/devicetree/bindings/arm/fsl.yaml +++ b/Documentation/devicetree/bindings/arm/fsl.yaml @@ -363,6 +363,12 @@ properties: - const: gw,ventana - const: fsl,imx6q + - description: i.MX6Q Kontron SMARC-sAMX6i on SMARC Eval Carrier 2.0 + items: + - const: kontron,imx6q-samx6i-ads2 + - const: kontron,imx6q-samx6i + - const: fsl,imx6q + - description: i.MX6Q PHYTEC phyBOARD-Mira items: - enum: @@ -544,6 +550,12 @@ properties: - const: gw,ventana - const: fsl,imx6dl + - description: i.MX6DL Kontron SMARC-sAMX6i on SMARC Eval Carrier 2.0 + items: + - const: kontron,imx6dl-samx6i-ads2 + - const: kontron,imx6dl-samx6i + - const: fsl,imx6dl + - description: i.MX6DL PHYTEC phyBOARD-Mira items: - enum: From patchwork Mon Jun 17 09:13:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Walle X-Patchwork-Id: 13700362 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5C88C191487; Mon, 17 Jun 2024 09:14:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718615680; cv=none; b=K4JHGr7IqZ4icrWM7rBzQyVWtZM7uS5RZDa0mG0zPEtvokgiXerk4bvMBXVUnqVHlXYQoF9myQx+82hvvZoAuHmtwzKfWsQwipLYnsvdy5rueqVViY2IYPqqmAEQyy39YRLIT2DgwMA02SDTcG5nWEbtFFwWBwvdxtgshjbHttE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718615680; c=relaxed/simple; bh=Hz3/IRzoD+tUZSC6A8nnNE9OtA98gNbjbS8JpU8u6Wk=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=fYbPxPMtWZA0xMiuJBkLN2LXEgFcFG49VdQCsE8ea5ufJImgCHLVo/CcKrEu6z9b+7jg37ImpBBEU9DrfBMdfl+HyKTmkNMhMzHO1tM2iFzKgLPvaZ9RITS7hBCxttHaaBdQkDak0l7+VRtRNTEptpilA5hhbxxg/qsenldGdzo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=noE+/5BU; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="noE+/5BU" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 180C1C3277B; Mon, 17 Jun 2024 09:14:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1718615680; bh=Hz3/IRzoD+tUZSC6A8nnNE9OtA98gNbjbS8JpU8u6Wk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=noE+/5BU8w+1Ve0XytfrO1yPQDVn9P1GCr6KACzlux6LvXAquLZEjcuveoAAD+n2S D4VxzxOyKx57sakW9ZWGwjc/JF5jPElkH4B03PTyyecPS4ojNpA7Xon7mNxbaNxaCm UcHqKFHjP/Ny9rPzXdXtJD6DGSph7De+pZsfryIh9A/RXFNUOmiZa5/wCQGA278oc1 rc9yhhalnd2xKXUoNiYw4mEOzdFGCb68N1qEbCs1s6xU/NcwVBRqRv1PBEs9g+ALUD 097c96yzbmy3yGKBX/VXXlDbceaQI765drMNuq52/yxHmDaOHBzz1Ygr16zI2VA+o8 AaQdHlqjjpBGw== From: Michael Walle To: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Shawn Guo , Sascha Hauer , Li Yang Cc: Pengutronix Kernel Team , Fabio Estevam , Priit Laes , Michael Grzeschik , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Marco Felsch , imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, Michael Walle Subject: [PATCH v3 13/13] ARM: dts: imx6qdl-kontron-samx6i: add actual device trees Date: Mon, 17 Jun 2024 11:13:41 +0200 Message-Id: <20240617091341.2375325-14-mwalle@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240617091341.2375325-1-mwalle@kernel.org> References: <20240617091341.2375325-1-mwalle@kernel.org> Precedence: bulk X-Mailing-List: imx@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 For now, there wasn't any in-tree users of the dtsi files for the Kontron SMARC-sAMX6i board. Let's add device trees, for this board on a Kontron SMARC Eval 2.0 Carrier. Signed-off-by: Michael Walle --- arch/arm/boot/dts/nxp/imx/Makefile | 2 + .../nxp/imx/imx6dl-kontron-samx6i-ads2.dts | 12 ++ .../dts/nxp/imx/imx6q-kontron-samx6i-ads2.dts | 12 ++ .../nxp/imx/imx6qdl-kontron-samx6i-ads2.dtsi | 148 ++++++++++++++++++ 4 files changed, 174 insertions(+) create mode 100644 arch/arm/boot/dts/nxp/imx/imx6dl-kontron-samx6i-ads2.dts create mode 100644 arch/arm/boot/dts/nxp/imx/imx6q-kontron-samx6i-ads2.dts create mode 100644 arch/arm/boot/dts/nxp/imx/imx6qdl-kontron-samx6i-ads2.dtsi diff --git a/arch/arm/boot/dts/nxp/imx/Makefile b/arch/arm/boot/dts/nxp/imx/Makefile index 231c0d73a53e..92e291603ea1 100644 --- a/arch/arm/boot/dts/nxp/imx/Makefile +++ b/arch/arm/boot/dts/nxp/imx/Makefile @@ -99,6 +99,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \ imx6dl-icore.dtb \ imx6dl-icore-mipi.dtb \ imx6dl-icore-rqs.dtb \ + imx6dl-kontron-samx6i-ads2.dtb \ imx6dl-lanmcu.dtb \ imx6dl-mamoj.dtb \ imx6dl-mba6a.dtb \ @@ -207,6 +208,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \ imx6q-icore-ofcap10.dtb \ imx6q-icore-ofcap12.dtb \ imx6q-icore-rqs.dtb \ + imx6q-kontron-samx6i-ads2.dtb \ imx6q-kp-tpc.dtb \ imx6q-logicpd.dtb \ imx6q-marsboard.dtb \ diff --git a/arch/arm/boot/dts/nxp/imx/imx6dl-kontron-samx6i-ads2.dts b/arch/arm/boot/dts/nxp/imx/imx6dl-kontron-samx6i-ads2.dts new file mode 100644 index 000000000000..6a0c53f23a15 --- /dev/null +++ b/arch/arm/boot/dts/nxp/imx/imx6dl-kontron-samx6i-ads2.dts @@ -0,0 +1,12 @@ +// SPDX-License-Identifier: GPL-2.0 OR X11 + +/dts-v1/; + +#include "imx6dl.dtsi" +#include "imx6qdl-kontron-samx6i.dtsi" +#include "imx6qdl-kontron-samx6i-ads2.dtsi" + +/ { + model = "Kontron SMARC-sAMX6i Dual-Lite/Solo on SMARC Eval 2.0 carrier"; + compatible = "kontron,imx6dl-samx6i-ads2", "kontron,imx6dl-samx6i", "fsl,imx6dl"; +}; diff --git a/arch/arm/boot/dts/nxp/imx/imx6q-kontron-samx6i-ads2.dts b/arch/arm/boot/dts/nxp/imx/imx6q-kontron-samx6i-ads2.dts new file mode 100644 index 000000000000..94c395cc020e --- /dev/null +++ b/arch/arm/boot/dts/nxp/imx/imx6q-kontron-samx6i-ads2.dts @@ -0,0 +1,12 @@ +// SPDX-License-Identifier: GPL-2.0 OR X11 + +/dts-v1/; + +#include "imx6q.dtsi" +#include "imx6qdl-kontron-samx6i.dtsi" +#include "imx6qdl-kontron-samx6i-ads2.dtsi" + +/ { + model = "Kontron SMARC-sAMX6i Quad/Dual on SMARC Eval 2.0 carrier"; + compatible = "kontron,imx6q-samx6i-ads2", "kontron,imx6q-samx6i", "fsl,imx6q"; +}; diff --git a/arch/arm/boot/dts/nxp/imx/imx6qdl-kontron-samx6i-ads2.dtsi b/arch/arm/boot/dts/nxp/imx/imx6qdl-kontron-samx6i-ads2.dtsi new file mode 100644 index 000000000000..b4a79245b7b6 --- /dev/null +++ b/arch/arm/boot/dts/nxp/imx/imx6qdl-kontron-samx6i-ads2.dtsi @@ -0,0 +1,148 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Device Tree include for the Kontron SMARC-sAMX6i board on a SMARC Eval + * 2.0 carrier (ADS2). + * + */ + +/ { + chosen { + stdout-path = "serial0:115200n8"; + }; + + sound { + #address-cells = <1>; + #size-cells = <0>; + compatible = "simple-audio-card"; + simple-audio-card,format = "i2s"; + simple-audio-card,bitclock-master = <&dailink_master>; + simple-audio-card,frame-master = <&dailink_master>; + simple-audio-card,widgets = + "Headphone", "Headphone Jack", + "Line", "Line Out Jack", + "Microphone", "Microphone Jack", + "Line", "Line In Jack"; + simple-audio-card,routing = + "Line Out Jack", "LINEOUTR", + "Line Out Jack", "LINEOUTL", + "Headphone Jack", "HPOUTR", + "Headphone Jack", "HPOUTL", + "IN1L", "Line In Jack", + "IN1R", "Line In Jack", + "Microphone Jack", "MICBIAS", + "IN2L", "Microphone Jack", + "IN2R", "Microphone Jack"; + + simple-audio-card,cpu { + sound-dai = <&ssi1>; + }; + + dailink_master: simple-audio-card,codec { + sound-dai = <&wm8904>; + }; + }; + + reg_codec_mic: regulator-codec-mic { + compatible = "regulator-fixed"; + regulator-name = "V_3V3_MIC"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-always-on; + regulator-boot-on; + }; + + reg_codec_1p8v: regulator-codec-1p8v { + compatible = "regulator-fixed"; + regulator-name = "V_1V8_S0_CODEC"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + regulator-always-on; + regulator-boot-on; + }; +}; + +&audmux { + status = "okay"; +}; + +&can1 { + status = "okay"; +}; + +&can2 { + status = "okay"; +}; + +&ecspi4 { + flash@1 { + compatible = "jedec,spi-nor"; + reg = <1>; + spi-max-frequency = <100000000>; + m25p,fast-read; + }; +}; + +&fec { + status = "okay"; +}; + +&i2c1 { + status = "okay"; + + wm8904: audio-codec@1a { + compatible = "wlf,wm8904"; + reg = <0x1a>; + #sound-dai-cells = <0>; + clocks = <&clks IMX6QDL_CLK_CKO2>; + clock-names = "mclk"; + AVDD-supply = <®_codec_1p8v>; + CPVDD-supply = <®_codec_1p8v>; + DBVDD-supply = <®_codec_1p8v>; + DCVDD-supply = <®_codec_1p8v>; + MICVDD-supply = <®_codec_mic>; + }; +}; + +&i2c3 { + eeprom@57 { + compatible = "atmel,24c64"; + reg = <0x57>; + pagesize = <32>; + }; +}; + +&pcie { + status = "okay"; +}; + +&ssi1 { + status = "okay"; +}; + +&uart1 { + status = "okay"; +}; + +&uart2 { + status = "okay"; +}; + +&uart4 { + status = "okay"; +}; + +&uart5 { + status = "okay"; +}; + +&usbh1 { + status = "okay"; +}; + +&usbotg { + status = "okay"; +}; + +&usdhc3 { + status = "okay"; +};