From patchwork Thu Jun 6 09:01:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Walle X-Patchwork-Id: 13688100 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 3885FC25B75 for ; Thu, 6 Jun 2024 09:02: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=C2NcOCr9TAuJk7rnO0jcPlkxDk+3Pbc+IRhqajIIOgY=; b=LuAop5q++BTwdh euYXsR+RsQguLdUMGT8tpWUWJMxsGm+Z81vcLDQUZTVzvJvrpPKc3/ejouv7srpxRoskXY83+TPVh f+4hb1y2D7Ylln/UcHnlf1kH6JCo/kNxDx7i/fGbiJJR0mBaB9I3jwM71r1GE4K6HHfpfzzqkfHL7 u7MF9wVMe4bA96Rhml26iOMN693emplVYf5EJ+musyD3Ms8Hj3BWv7C0CuWJKz6HeEHCgC4Dqv4x/ GeXymiNHHEd79N72gVwOR/wtTcLwyt+yRNPqhK7UxyIwMLoooPGNjowNSv5NwP7B6uGtW0N9jPLD3 HsloMt9pxyZP6IlKKN5Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sF90t-00000008zGI-0eu8; Thu, 06 Jun 2024 09:02:27 +0000 Received: from dfw.source.kernel.org ([2604:1380:4641:c500::1]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sF90q-00000008zEN-0VYS for linux-arm-kernel@lists.infradead.org; Thu, 06 Jun 2024 09:02:25 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 20AAC61C65; Thu, 6 Jun 2024 09:02:23 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E0997C4AF0E; Thu, 6 Jun 2024 09:02:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1717664542; bh=Fc3EWf1xyaS4qCDa8Ib0P/io9+UBcvdp5p0ftGP6Cpk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mGAvkZADY2fa+063+uyU0aMLkNJvvH/MfVMK4hYUYHlswrgrz9jqwmemtCKibo9ix w4qhSB3XZuNR2AbiZ8msPxv8dpR9W6cEvvTwI/qZ8Kfy4Pc0mQStMuRClMuoAUgUy5 ze35Poq+wQe8F3HxIm+WSmkj19CTVSbHZaoJJfnjjXl1JGi6XM++MlL/Mq2M5Pd2V4 6lYEo42TS9ZELlqjWxs8+9nijO+p4HQgYZgA4QK0RVls8ggrB9TvvR4SZDQej7v60B oe/Ox3l4lmfKDuwTlHbes3KvRFc01xao6wsQnH5q7AzropRG+CsTPhti79vD1uKxXM +uEV4oli0MrEw== 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 v2 01/13] ARM: dts: imx6qdl-kontron-samx6i: fix phy-mode Date: Thu, 6 Jun 2024 11:01:54 +0200 Message-Id: <20240606090206.2021237-2-mwalle@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240606090206.2021237-1-mwalle@kernel.org> References: <20240606090206.2021237-1-mwalle@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240606_020224_234550_BD99EFBA X-CRM114-Status: GOOD ( 12.11 ) 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 The iMX.6 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 Thu Jun 6 09:01:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Walle X-Patchwork-Id: 13688101 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 F058CC27C55 for ; Thu, 6 Jun 2024 09:02:41 +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=cVoLhyd8I/NbDtD2XnME7OSkYFntvdIVj4FUaWDwht4=; b=QKVeM8+DpAUFMF FzZCbXLVB+87Ssm388wv87ekyMS7Fs301zgNNDiqKC31Oq4GqaQK9FbZfXZJU2C4vC1NLqxQvUo90 sCnJzg2jdM21TKA0AV9KEa487PMrG4zwrz8N/pG1evASFaGi3ElXoAA1w+vjuqR8Xk5OqvWeeHKAH slNTVpvcU21oHfJvCRrE1A6o5Idnd7qp+7w2i0qVUiLDDVy15oFzQ4G9+o1PEIzVv549AYNdft9CS 6g33ctt5ZlMEjy447RE2y0NdTjJGK/eYRRrVVmpA6NZYVIb6ESrHZBxID75G8TdTsY/fcrj8R++IR Ra8aZLU/yiXUsrWNwCVQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sF90w-00000008zI1-2zW5; Thu, 06 Jun 2024 09:02:30 +0000 Received: from dfw.source.kernel.org ([139.178.84.217]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sF90t-00000008zGH-1oIN for linux-arm-kernel@lists.infradead.org; Thu, 06 Jun 2024 09:02:28 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 994B161D0E; Thu, 6 Jun 2024 09:02:26 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 64E1AC4AF07; Thu, 6 Jun 2024 09:02:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1717664546; bh=2Qw+7Rve50c6UoNrfytgIz8RzG/OQfuJ1xjLwlqspyo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=S2d+6eBjZ5kP68dFSj0TZzIf77aFWFvjtoO4cL7KOZjFtNAa8JqtPRCvHkvK4iZnE vvx2fZriKpWQIVmjfo8nTCZ8rGtkvcOodMqnpuOe3JVTwtW3LXMGaQN50RjKg+7QFW 0ABben+eHgityInCqu19O+/vV19lW5kqNXt7Pfm1fr9rhkaaCOJqzxh9lvB0/HAy1q rHj7PZe1Wfjo+brqxERA5hVzduUe+niEyIt8EBer0jdhkmxlapUlYWGIT5Q27Dcl64 C1j7Pdv6bMcD2Grt14K70TuNakWIk7Pre9VnvxqOGq1YsdbhOKDFiVqjOkv1Fohser WDZn/ZHBD6W7A== 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 v2 02/13] ARM: dts: imx6qdl-kontron-samx6i: fix PHY reset Date: Thu, 6 Jun 2024 11:01:55 +0200 Message-Id: <20240606090206.2021237-3-mwalle@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240606090206.2021237-1-mwalle@kernel.org> References: <20240606090206.2021237-1-mwalle@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240606_020227_602853_113B2248 X-CRM114-Status: GOOD ( 12.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 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 Thu Jun 6 09:01:56 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Walle X-Patchwork-Id: 13688118 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 B0FDAC25B75 for ; Thu, 6 Jun 2024 09:10:18 +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=wc6U4JVyAkbAy5aMWKgjXee5h2WIWHBt+wiqs/8nUUA=; b=nhHHr/9rrYDATN Zce/Z4R2/PBzhqEVkbOxXiqgr4POx6qijmxTjVZ2UYaJoN11ZAyzRU8vCQTvemBlpq3jNiDOOM/XN yg9Gety5zzXStstcxBJArs367OUY4rjLv0uEsBI3PbsUmQ88SZAtO6CsPKQnn6kclj5bkcSF4n5mX QUfQPApz4l4qd1TrqvD48Wy+yIsNrzRRe0n8s8L4YKgB1CDnX5lwEdj/AnwVsfd0eAgZ+LHrrp16C PoYrZlDwn3SP9TZigjjCqrov/nzN2mRRhQPq5lcmhpl1JjC8mHHwrSm3DH9dIz9VAsXtjmHSEBNHk 78dGepG8VfFUmv+ghMGQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sF98H-000000092ee-3PJ5; Thu, 06 Jun 2024 09:10:05 +0000 Received: from dfw.source.kernel.org ([139.178.84.217]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sF98F-000000092ch-0FbO for linux-arm-kernel@lists.infradead.org; Thu, 06 Jun 2024 09:10:04 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 066AC61D23; Thu, 6 Jun 2024 09:10:02 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id DA777C4AF0E; Thu, 6 Jun 2024 09:02:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1717664549; bh=pmxH+3/T6ldwrIaJrUq9EPud/gdsJYcTk1L1yQXC5Yc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Rr4KguAxRO83o1oOwBS82084EmVpU2HrIaegP7YxAzlq4g4czu3a1Ro+kefM9TDFi zioF8hGypYGj1cPOcAjARo3WvpLvGWUOjUljkaU2VL3Shq0W7M5AzfUtYkPIiKyaXL CqnT5PXEESZ2igkyT3KIs2/ro5ATDz/hVfOF0ZY8/3KY0x6L7Pavps9gITBlTiQFLp 1ihJpTpDspuVGBCim+VJKkRCuH8o3slYu4ManKirkXel0jVs6ZZmEH8oYTCAQ8p/nx HrVsQcONfcgBuoorChbMRJlGar4fF57msBhgksLwp2yax0uZljlnvrmZoB0GvAs0j1 P8xmgq3kMLR+A== 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 v2 03/13] ARM: dts: imx6qdl-kontron-samx6i: fix board reset Date: Thu, 6 Jun 2024 11:01:56 +0200 Message-Id: <20240606090206.2021237-4-mwalle@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240606090206.2021237-1-mwalle@kernel.org> References: <20240606090206.2021237-1-mwalle@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240606_021003_195395_0513E188 X-CRM114-Status: GOOD ( 10.93 ) 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 On iMX.6 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 Thu Jun 6 09:01:57 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Walle X-Patchwork-Id: 13688102 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 1AA6BC27C55 for ; Thu, 6 Jun 2024 09:02:49 +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=d/pqaZbZe4yjm7Ncvym+ajBQa07GXLDkPm0g0HhGREo=; b=ukga5PIIx5dCKf asyGvvZdJDeSY0mAMm4DkiYqM2ls3F7vojJ4WqDtOfK08l3qCHlV84DiBD0ZQm5sBbL8+ZgXSgTgZ IwA+MKExjNCjJZyu7rBnBRdcgMB1Vh/onaKKhlZPgjHr1DRMJC20iYxGiWfydoICl1kftVqkBfoft aYaeMQzNRjDyo7dsRCu4cTDZgELFFPxZi2lFpPEQlaxGGZ8+LSLyvUwwksUZnvGePJrT/2sBbWCKo 9/JCNOPRlLVdWZCekcMptaaFAKi8BLjcoSRqzkBhcIvKhJlnHcL62Em6tllxHJd72kzGKS0CnuOqm /t1P1cFlhye2LRBBeJyA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sF913-00000008zLg-3VAH; Thu, 06 Jun 2024 09:02:37 +0000 Received: from dfw.source.kernel.org ([2604:1380:4641:c500::1]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sF910-00000008zJu-19VX for linux-arm-kernel@lists.infradead.org; Thu, 06 Jun 2024 09:02:35 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 998DB61D0C; Thu, 6 Jun 2024 09:02:33 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 62DD5C4AF65; Thu, 6 Jun 2024 09:02:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1717664553; bh=pyCuKjBDzEztSGL5VPV6DvGUsY4tB58LJ6wtMtXdCKw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uFUno7hnMWnn11NK3ljLrMOmwnTfoUXDXBb/qiUqpfDm7g8JFJVSJAzO7a4S7y0Pd Lgb/Bi+lY2w00kSDWpMuKI18ZMAa/mLzW8+okT4wHvRsqW3EQurqrSfS0h4ZF61hCg pfE3IChzlf6Vbq8P/O0w0Yjzj1ebvZEaACKOM6fIldVSbnzLwIpy9hv/T7ymJRNt2G PNpZ7qgeMzcuBUGVs5GZSAk7K94oI0CCXHix/xJWet3iIgjR42Wtzjalm8yjEVx4O6 oFLwxp6glnxOC8x8/Q/stlX9kw0vV00nm09IYV2SAQZpvb2f+JzaNeuAA2dF3TV/EZ +zKYNefXgZzEA== 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 v2 04/13] ARM: dts: imx6qdl-kontron-samx6i: cleanup the PMIC node Date: Thu, 6 Jun 2024 11:01:57 +0200 Message-Id: <20240606090206.2021237-5-mwalle@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240606090206.2021237-1-mwalle@kernel.org> References: <20240606090206.2021237-1-mwalle@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240606_020234_508133_7E2BE264 X-CRM114-Status: GOOD ( 11.14 ) 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 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 Thu Jun 6 09:01:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Walle X-Patchwork-Id: 13688119 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 6EB1EC27C52 for ; Thu, 6 Jun 2024 09:10:24 +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=GJBj37I5vS+w4YmWQxEOUxIyok4CjthcfE5eH/JshOY=; b=kKIHLkyE0kn/Gm wVn897kSZXdt1gLOM5X3H3iIo1Llfb1c8X3+9wowkLeg1aUNhYeUclSChSJo1eSX/UHQ+b9QsksNJ ghpbP9SD4vYVw4mQspY525/JEN5x4ay9brut4gqoMetu/LGQwkso74WydAJn7dTjTZHrxm/GtWlUC fpg+96ajB/p5FP85T7kssVTTGXo9nU4sTsdt65nWvTETJbzO5WU74GYOQzH3z+nEc7/tk27buvrVS VTb00eOik/lrKH6axPwSXQXPsMwJ1uni6PoFTd7HdESf668BoyajMY4NZMsF8m29tsj8ljleKjTW2 +1lZkX/JvhIcG/IY7pog==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sF98K-000000092gY-2khK; Thu, 06 Jun 2024 09:10:08 +0000 Received: from dfw.source.kernel.org ([139.178.84.217]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sF98F-000000092ck-0FQw for linux-arm-kernel@lists.infradead.org; Thu, 06 Jun 2024 09:10:05 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 408C361D2E; Thu, 6 Jun 2024 09:10:02 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D6189C4AF0F; Thu, 6 Jun 2024 09:02:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1717664556; bh=pE0vsrGZNwEDC2VKKmVgmDKbUEz9TgECCZmW3XAqSV0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lZEUeeJMEbUNU8wARrNbuyW7ZsNzPQJRQfKG2DMHcsaViHQngDoW1FHXMDN6dNapJ mpHcGXXrjXyCdm61vquGV18LKLqiAUeOErpIa1G+A2dLtsBhgQMAeflOrLnERfy46N 30YIbVkaihtmhFPMWA/FcCuaXUrQs1bOI+66tjFeZSEoAyIGDG+cqkt8uQdwEzAcHt U7aUCVSJdn3aJhk8KNW6jBZ5MkYpgtOc7iiqqNrZKY/2hSjPAALzuPPE03yOhTSjsx it6vrWiYMH7m9Nutp/ZljIsv4ZQKdNj8ZqKXGx1QxqGnyXqZW1ddTdxBuQwiLHJXD0 Kn8P6MEqXCuVA== 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 v2 05/13] ARM: dts: imx6qdl-kontron-samx6i: fix SPI0 chip selects Date: Thu, 6 Jun 2024 11:01:58 +0200 Message-Id: <20240606090206.2021237-6-mwalle@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240606090206.2021237-1-mwalle@kernel.org> References: <20240606090206.2021237-1-mwalle@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240606_021003_359113_AB040597 X-CRM114-Status: GOOD ( 12.86 ) 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 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 Thu Jun 6 09:01:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Walle X-Patchwork-Id: 13688103 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 8D997C25B75 for ; Thu, 6 Jun 2024 09:02:55 +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=gxb0tmbp0oq5kwWMOhCbUThdCqFlcJobEDVC/diuidg=; b=wvfxairdMwCB8D RwuNUt3pk+JV6JaAifSlLSTnofvjq9/r4EzUtCDZdqJl7q8O3PPX1vYwJpr6Fj7xzLmAvC5M72E1t HTjhyS15evGDooKiNC7lRmj+7qav2EhZYUMwc8n3yEtzPYrRfyuOB0pXHiiq7w+ugklSt3oio1W6z lruzrDTl+4ssAlFYbgR0uyU0Z5U752TSLz7J5QIjj7pHKOxk3UorXG6yNC7hLMNbi3XYe2PdPmrd/ lQADmoX7GnCRgePN0y52QfLy6sO+XM95hdMtKWs3xnRjmcHpHrCXaY4j54m+LXhow9Fh7fnLtUPTV tkvPj+ShsrIVqpdwuGNg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sF91A-00000008zQA-20qA; Thu, 06 Jun 2024 09:02:44 +0000 Received: from dfw.source.kernel.org ([2604:1380:4641:c500::1]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sF917-00000008zNb-1QlY for linux-arm-kernel@lists.infradead.org; Thu, 06 Jun 2024 09:02:43 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 8926161C65; Thu, 6 Jun 2024 09:02:40 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 55A01C4AF65; Thu, 6 Jun 2024 09:02:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1717664560; bh=cP7uD/wG7u91xicq/qibn/jCrRGqs0slZIoz+5q3tuk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MG/iONmLCzdhh6DeijCIdYqCArLblx3CfaO5+e8eMqEmlFQIpWgMus3s1tz4UM1zu xd/ylO+yxqSznQB5aE8GS5+cxmxZLrb9iMKyklfB4YgfQ5DGXJSe5hL1V5BbXhodHk 0ek9BF6uYPlz568hoyV3Y9EACWdz/4XvJz3i1xL+rU/cDGWvpKVZV2rzHFuVmxkl7p gRVmoNgpl5uW3d+f771Nn5TCfsDhQzWHyXzBhIfwxklwyjDgzuERZAr7KRthIid5di 0JfSOkDUYQCcz1cQDSunO3uwcfyrRHjoSsfQ2yJM6FyYSac1Ws4fXepp0lR6PG3CAi c47wm20AQWzWw== 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 v2 06/13] ARM: dts: imx6qdl-kontron-samx6i: fix product name Date: Thu, 6 Jun 2024 11:01:59 +0200 Message-Id: <20240606090206.2021237-7-mwalle@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240606090206.2021237-1-mwalle@kernel.org> References: <20240606090206.2021237-1-mwalle@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240606_020241_472458_32BC1D60 X-CRM114-Status: GOOD ( 11.16 ) 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 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 Thu Jun 6 09:02:00 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Walle X-Patchwork-Id: 13688104 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 8A1ECC25B75 for ; Thu, 6 Jun 2024 09:03:01 +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=1Jz8wqFT/s89WVJPiJ04HtqL5Vjcq1IgnM9skTB6Nts=; b=DtS2BrANCdJhjf WIluHI9MOHaBs2sWfOp1RBg66AGptLcku5kTlD48GX2C9afcRhtfmAvijtdXhaeiNrZtp/aFI6nKv 204yg5PQOUZjaZjXbMMFurXTq+uVC/W8bPb6lLDy8NnkS5fSouMWSNuzXK6lF05Ab8e58pot1j4OO s9lOE5njSx9YWqWOcIahLRS3/c0PTxP5Aj1vz89PKQf6tyzpze8US8kBWWiHHQ/qg1SIEpfqClEJ9 h/fRkeIrMx14thPur3zEbt9jd32v1F6C7ANhF36xv9SV6iSmdc97EStC4KTZAy9bLTQ+cou5jD1W0 HmMwHT+N/WnELMJpB92A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sF91E-00000008zUY-3bRs; Thu, 06 Jun 2024 09:02:48 +0000 Received: from dfw.source.kernel.org ([2604:1380:4641:c500::1]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sF91A-00000008zQ5-34fv for linux-arm-kernel@lists.infradead.org; Thu, 06 Jun 2024 09:02:46 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 0FCB261D22; Thu, 6 Jun 2024 09:02:44 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id CC427C4AF5F; Thu, 6 Jun 2024 09:02:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1717664563; bh=bp4RUBBoDBNxBmueQhwpMXLVezAaB2zJTWzVJs7lfD8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YlNJxiDRaGHkVH5WhmlcZSrI+sJBY+wep1UQVXW9tnJKzgo6iJBr3IgShNs0hEKuG VjLYoItfd7mfxkfqoJyoKQriCbDlj+xOIdOuK/Ojf5IfN2gZTUtQvKw3LaM6TP4ViE 5iFcmqH5KTHDmlLn+E7xHhXCXB6Vv81pr38QBKxTEXz7yeiQWBojZwLH2PdSCYSGXS bDI+vNrVkNaIhqxJl0PIMQURWZsuE+9PSSxId6esWjRWpcSrVj9TXKySykLwl/x0Im OcQErxcTWMbjrhlRV9378yUtR9oc/31mVsuucyBiT9Vv81RVxe45ChLWGoe7l2pO+5 DhMvqIUDUZpJQ== 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 v2 07/13] ARM: dts: imx6qdl-kontron-samx6i: always enable eMMC Date: Thu, 6 Jun 2024 11:02:00 +0200 Message-Id: <20240606090206.2021237-8-mwalle@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240606090206.2021237-1-mwalle@kernel.org> References: <20240606090206.2021237-1-mwalle@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240606_020245_101219_56200734 X-CRM114-Status: GOOD ( 11.40 ) 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 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 Thu Jun 6 09:02:01 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Walle X-Patchwork-Id: 13688105 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 D5C27C25B75 for ; Thu, 6 Jun 2024 09:03:05 +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=36EpdXfKnxzIhnz/tyL7lc62gHzkLeWRy+jL3M6EktY=; b=ixJx7rzAeyiUhh WQKavXUc8w1K/36dzsmNY6aJZVMJKhwh7UKMLLPdyJMgYpjeOZWthAPngnhYa0V7xwN6jbXHnrx3f SkjLmBuAQnnSYnyNGtr16D2fXe4eP7rVQ0j/2x47nZEyvnW+/9UFRCgiIwClNukwM1nLyYIs60PoD lIWb1HXZt5Aega5xoMZvUOCFl5PxLzuSbFKERS4/s+1vahM1ofTOTGFJxymtgW6ClMKZhs1M01LIU YdQ5iwvj1ON86n1pcKJE49jHebVtPN+OTtKEqxOPBmYYlPJvUwvJaPXyfmD16jd5ZQ7IBWi38Fh2A bHemj0SaMytfMxqrYOnA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sF91I-00000008zXb-2sAb; Thu, 06 Jun 2024 09:02:52 +0000 Received: from dfw.source.kernel.org ([2604:1380:4641:c500::1]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sF91E-00000008zTY-0Uf8 for linux-arm-kernel@lists.infradead.org; Thu, 06 Jun 2024 09:02:50 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 8486E61D08; Thu, 6 Jun 2024 09:02:47 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4FB04C4DE02; Thu, 6 Jun 2024 09:02:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1717664567; bh=rFDucDznyAp9KdW6DmpqQ16mThJdgkTuPLsOXBQR5oo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=EvxZVdrLcPwc1YPGrc4gtpEO3pgWroda9mAdJrQEZZcKl7ApfOKJLanOAqi9UEeOl ZB3sY5DEY/ozQTqT7eD1L1IJzIv+XeI8r5fMTU5ayd5ELgpY0VItwUqiHVTYx+a3qL 2YurrrzY1dDqwPoqa2soUCCfkuxTRxppGc5rHl0S176TnYDvluX0A6gev6LDvzyK2W YbL/0WZtON5zEQKvVeD2PBm2/IpQhGP7LKBgqasfGEedfcJhjUyD9ecDYHAO2srblP 0vxGu1Bkjzg7H2sdf6tCMZHglirpOg2CfSJs8SLCGsrytlNLt3Du5ZNJLITFBbvi/G rqkT7B3Vw6eUA== 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 v2 08/13] ARM: dts: imx6qdl-kontron-samx6i: add SDIO_PWR_EN support Date: Thu, 6 Jun 2024 11:02:01 +0200 Message-Id: <20240606090206.2021237-9-mwalle@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240606090206.2021237-1-mwalle@kernel.org> References: <20240606090206.2021237-1-mwalle@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240606_020248_338847_269E348B X-CRM114-Status: GOOD ( 12.71 ) 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 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..d36743e47552 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>; + off-on-delay-us = <20000>; + enable-active-high; + }; + 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 Thu Jun 6 09:02:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Walle X-Patchwork-Id: 13688106 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 92FEDC25B75 for ; Thu, 6 Jun 2024 09:03: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=eMdTbx/qdieUF7iyBblTztC63WOTOjsIOgSJRFf02IY=; b=V9Mm6+UqX0dg0Y K1vYrVTx8wqEmkfRp5rVD1O6tKpx8yO6ErCw0uxLw9+vkXemvjRvzS6fr2UnDpsFSL2gKnV6Sd6QP NrYIJJQkd2cQ8ZfIu251EebJzFFCYAVBxb9FLQluSw9vyRQH3Obh26C5B7Kj1j2dWQXNZqHcWWmpD nkCGHh0Um8z1I1l+/Zdv7Hdz78me3ldAghhFL0mtE9uqpeGVWrGjEFzlKQARgua/F7tIBDW2GxF5R +JY32f9JnjATZ1+7lIASILFgCkv1egZLOrCw9gYEHtNUkMA2501/fKNH8XPmNjHNKQK18WsSfLJ8M oCkE3hKu2OnnM3VInNlg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sF91N-00000008zbb-2Dw2; Thu, 06 Jun 2024 09:02:57 +0000 Received: from dfw.source.kernel.org ([2604:1380:4641:c500::1]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sF91H-00000008zWb-2rZI for linux-arm-kernel@lists.infradead.org; Thu, 06 Jun 2024 09:02:53 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 0498661D07; Thu, 6 Jun 2024 09:02:51 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C1836C4AF5F; Thu, 6 Jun 2024 09:02:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1717664570; bh=wc3eFNG3Ttq/rANHKbXTFJqSlTdXmLGuxvp1I8yiTCM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Zoq7Y7zOcPk655wEHR6DC6/IF2llMY5psLVgEL5csvjDBBLJdc7e21Q6J21qVcZSA 24Bd2M7voJAlb1CbWFnNLVZ18fHZMfF8JM/YbCSoSecVDGHFGVTZRK/+gmllbyeSL8 40KtjapVxQ5WK6rBhTaDnqWW9hkVY0I00BOdiL7YB43LXcquoOnYEefA8++wFMmekT H+osSnx7cmJ8XDu9iFrZQU1Re+VVBK16HhObIhj64kjYqrpLN7+XWnlvXrCtOYzjxk r6E42pWKJ2QgypWUeZuzFtsLUzuoxpV4orgRrYR3YRIfb5JV7ocW9tlgQzoa7SWd6h UqSEUyAKGZG+w== 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 v2 09/13] ARM: dts: imx6qdl-kontron-samx6i: fix node names Date: Thu, 6 Jun 2024 11:02:02 +0200 Message-Id: <20240606090206.2021237-10-mwalle@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240606090206.2021237-1-mwalle@kernel.org> References: <20240606090206.2021237-1-mwalle@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240606_020252_010923_EAFD28C3 X-CRM114-Status: UNSURE ( 9.89 ) 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 Rename the nodes according to the schema. In particular, renamae 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 d36743e47552..85e5adac6ee9 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 Thu Jun 6 09:02:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Walle X-Patchwork-Id: 13688107 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 2FE8DC27C52 for ; Thu, 6 Jun 2024 09:03:13 +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=nTzLBdt16fotumZGVBZNna55tjxLgVm6PXS1+0Qv0t8=; b=0Px34HFDYddzHx Qw0TxtXnfpOzp3E5RO+LPhnm1EXHWgChczh5Swd24TVUH5Y9hBUOQsT7af+z5vK/JV4PXahAe/vtd n/bd3LH8cdUTmJzGSvsbGRSAYyGCkGtSS8ggGzLJ/ObDQy4YdG0ARPTWBr7lDrPLJNwCUTsP+98an kZHn2GDfnerusqW/ljiHw2yfiLAL/43F6HS53JCPkFk0DQcHIHJpiWhX8/1ib9lJQWYhxGb+Yqivh Lq1lNEMFbG3ZnEZFJ3C52b+eANGaX/lYDKhGSHWi8BZGu882PxuEYkzQA2TGOxGfmC8v9Vta3qi8H QvBbaIYwpDw6sQoZMTrw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sF91S-00000008zfG-05PK; Thu, 06 Jun 2024 09:03:02 +0000 Received: from dfw.source.kernel.org ([2604:1380:4641:c500::1]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sF91L-00000008zZd-18GY for linux-arm-kernel@lists.infradead.org; Thu, 06 Jun 2024 09:02:57 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 8133A61D08; Thu, 6 Jun 2024 09:02:54 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 438B3C4DE1B; Thu, 6 Jun 2024 09:02:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1717664574; bh=Ac0H5gsqJQqS6HEYwakvjdz1l4aupakPJ75lS4SQt4w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rGUh5aoNKysWnsSAw5yxxaGgSYTbQoY9sklA+yczouB+8Px90XMriTbLfohP6z9Sv zR+bnBMPDVT+J4LZpvPhoSY7D1Doo2hrhm8/d0L6N6ny02LXRn5aG2SLuhdfYyz4h9 rvHjECWggl37ELVWymoFvxNoSwLIwr6aBVXClfK8CdZVm9KNjaK/aIjVjFS3j1roQe JPjybbfgUnxBUtPHXQXVXGg7fWBExS2F/61JLHzY+PnucXIup/Ij31NaOFYPWGW9Qd PSFzPTXALe9vRjeo3AvHspzCZqW9U1i6OnJBetz59L2Tt9AT1/rr1Ush/QXNqCuchf Xk+73evNI3CdA== 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 v2 10/13] ARM: dts: imx6qdl-kontron-samx6i: fix PCIe reset polarity Date: Thu, 6 Jun 2024 11:02:03 +0200 Message-Id: <20240606090206.2021237-11-mwalle@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240606090206.2021237-1-mwalle@kernel.org> References: <20240606090206.2021237-1-mwalle@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240606_020255_421056_24518629 X-CRM114-Status: GOOD ( 10.61 ) 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 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 85e5adac6ee9..4c4350d08d47 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 Thu Jun 6 09:02:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Walle X-Patchwork-Id: 13688108 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 607DDC27C55 for ; Thu, 6 Jun 2024 09:03:19 +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=qUzppzToIxudzFlOpS+b3sF9dcdlGUV1FqKbr9CpfGo=; b=QqsZyIeBEixoLc mNLUXgIPL/gkLFKDRuUJXQfO78cPhtfpF91RIsgB1nL3KwHC25s2b2SFk5FURWRL8g6A0vaV7xgDr SKTBkkf3uMH2C3m2uOtANxgjWaaW5Zj9JTsazN8SxBsYe3MkQlYdGDd9v/rlwuVbOa5jvBKzZK1az GIi+ZC6A+mm8k9IIuErpCl5iqCW85QjSonSzqj4tJhYQVKZsvx1sKjJLg0mPPxR3h6RrF+2w0VlPV Ka2ruJZ5jWGSmeuwnXNVQ8V9tMr8E6VYL80JwDyuzCsrHw/TWEHoaKIxAjjmqrGlBq6x+35NV0KJJ 6EqJZkLCUzkS28VxFQzQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sF91U-00000008zht-2djK; Thu, 06 Jun 2024 09:03:04 +0000 Received: from dfw.source.kernel.org ([2604:1380:4641:c500::1]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sF91O-00000008zcY-3Mj1 for linux-arm-kernel@lists.infradead.org; Thu, 06 Jun 2024 09:03:00 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 13E0F61D19; Thu, 6 Jun 2024 09:02:58 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C17F3C4AF5F; Thu, 6 Jun 2024 09:02:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1717664577; bh=Ayp1GAg5GZOVlDFPj51RZap8aLw49SuJ2rC7zWjR5dg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DXioOAUQRiXWQkqdFGJXpk0HHLYJP2HoNXZik7Emj+iXE3ltVc/dioEQNPFburAxc Pm/u9PVFTzPufOthikw3ptmETR4WZmk/W9Qo+69/dfp1QbK5XIdrzu+s1dYnSu49IO c2Ok2fp9y8NX7hxjm8765yFbDbQRRrKZCy6NJGLNyXWuTKEosIRVa5a23wBvIx0HGQ xvc9zdkCa5YgXxvYKeZzW3y+Kytxozs/96dv3kswr5Ai7j6JpW+rF5gX0QbPKjf8gI 7pyVohlMMsC9ujTiUjzls0ivEvQu7Msy392wgHLseJFEqbP4VV7xOHQ/mvzj6nLr9D E5dC3aGWQiFPg== 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 v2 11/13] ARM: dts: imx6qdl-kontron-samx6i: remove wake-up-gpio property Date: Thu, 6 Jun 2024 11:02:04 +0200 Message-Id: <20240606090206.2021237-12-mwalle@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240606090206.2021237-1-mwalle@kernel.org> References: <20240606090206.2021237-1-mwalle@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240606_020258_948860_60B134E7 X-CRM114-Status: UNSURE ( 9.62 ) 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 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 4c4350d08d47..6157fd2817ba 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 Thu Jun 6 09:02:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Walle X-Patchwork-Id: 13688109 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 0CCC5C27C52 for ; Thu, 6 Jun 2024 09:03: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=jIKJlQBdv/sqf2mEBW4MznF27RF+3CloWpb8UpZsJkg=; b=aDge+cHN5caLty wDDjOYeeOQcTBWwIUl4PFgPgGF5a8WQjS9WDe20yS2TOpPmHlgFGwnXmr54yA2COe/wIXuJks/fSB R3j41Gz8LIJDfoxvVpmHYL1RSfTwBzzhYYdjfTXK/hAG4QYSirCYdkD3UWVHKGCgdYeP28v6wx/cb KXM8BDVnMgnUQOBPPX4ADVW3PpnNSbT6vfF88ULBzOb+YSren/N9OFinJHuhmwgZZ/2zEHCw+ziUm 1YATOQr7e7Bw3y7/S1KwU7UwpdzVYYNAHM+hpttrbx+cvNNbYs958q79HrsnrEJaTu5TE0mwEaWyY pPWVIbElPuARXlJcJTog==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sF91e-00000008zqS-3QaE; Thu, 06 Jun 2024 09:03:14 +0000 Received: from dfw.source.kernel.org ([2604:1380:4641:c500::1]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sF91S-00000008zfL-1z89 for linux-arm-kernel@lists.infradead.org; Thu, 06 Jun 2024 09:03:04 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id B08A061D07; Thu, 6 Jun 2024 09:03:01 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 52AF1C4AF61; Thu, 6 Jun 2024 09:02:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1717664581; bh=RlPWeWXjhvnYwwTMXwCVHKOnptTzdjxk1lMBqmrQsYg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cnAPR6YBV6SAMPU3L92YhfSkWaEWg7lywvO6Pbu1r9/6AhLb3h8v4On8qWjcsMqdK yEGgOh9gxZa5LgFCXgUtTRQpRfgEFGiwsXvucgYQIf1X3mEeNe7rui/KctzrroFDWU bVfDUh6C7ycKzD2f4aqx8AcuVtGkV/GxWLfQ5MizHUcYR6yAxhmD2xr/m6pFvzqsrx rLCShOG7IJzL3E9zUmLzRfbhK1Cc6AROYRklBYfDvCxWJsnub5Vi29KfMnldp/eBBI djdaEdPrE70x/SQ2UpNUE/3YOomzpebb9EX9gnhFnedDJb4mGEJ4yCf67q1TdRn7Zf XCDOyByvMlNWg== 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 v2 12/13] dt-bindings: arm: fsl: document Kontron SMARC-sAMX6i boards Date: Thu, 6 Jun 2024 11:02:05 +0200 Message-Id: <20240606090206.2021237-13-mwalle@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240606090206.2021237-1-mwalle@kernel.org> References: <20240606090206.2021237-1-mwalle@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240606_020302_743185_883271AD X-CRM114-Status: UNSURE ( 8.86 ) 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 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 Thu Jun 6 09:02:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Walle X-Patchwork-Id: 13688117 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 A1036C25B75 for ; Thu, 6 Jun 2024 09:09:12 +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=VlqzU9O7nviSd6xVI+y0BHvDeAcUF8Ux0PCkNLZ/oNI=; b=jV6ajOiaVMjA1a CdhmxzDq97u/xADU7PSzViVA0v1q/0taie2UR4R/0z+X9xcL4Q4LegDczGNFMarAO1iPRyFO0/h/c XEGR7ur9xqYRxymW2DpWWw40rVLt0hJ+ZbdkkQLhD6eckhZEePEDkAc60+Q05c7fe3fi1GHPIcRnl xgXWRJJW9avQsbRCCYTlMnXuyY5gYywNa5NY7tXrEdGkn7IUMJwe6u4LupRLUMoaKKasoZx2ODOx8 sibMBFiBi2AkqcXBr6rQYqzYw07faG8DeOxPRnFuygZJ0xMV+YxFOL4vaj5ks/C/uw5j8CysD74Ob jMnAazfQuGGjwrJOUDYw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sF97E-000000092EA-0tSZ; Thu, 06 Jun 2024 09:09:00 +0000 Received: from dfw.source.kernel.org ([139.178.84.217]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sF97B-000000092Db-19Wq for linux-arm-kernel@lists.infradead.org; Thu, 06 Jun 2024 09:08:59 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 6574061D14; Thu, 6 Jun 2024 09:08:56 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 01122C4AF17; Thu, 6 Jun 2024 09:03:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1717664585; bh=5+BkHA78fCbCQTiNzIg43RTLJ7E3srGkuferiHfXMDI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dVfoqeZmmPu/kKKKz+jF3vDB94xG7189a7LpX2GEpnlVbhAZQO9vcjyrL668LkleR widWe9vyIsE7iq4vwDt2SQL4sdQvWSXxtBE0u0D2B2n3wg6RlF5BTFffsklygri+ZR ASYUdC3NLjbx2xFQxROB319aM8/JGta9Wyg9L4PeCExHOX8x0FPlcdgMR1OU9ajk3k 16l/50w68ywlyFi1ISAStkropey2Ip8Y0quIAHgr+J0NF5eKcKFt4rOYFps3pNzqAM gei+GO5wje2Ig8WW4cBRhd3H+M8p2M4ecoXQROee/Wgkb5exRuLtRjSEE3/AJBNJ7w 3bbBfz58ew6/g== 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 v2 13/13] ARM: dts: imx6qdl-kontron-samx6i: add actual device trees Date: Thu, 6 Jun 2024 11:02:06 +0200 Message-Id: <20240606090206.2021237-14-mwalle@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240606090206.2021237-1-mwalle@kernel.org> References: <20240606090206.2021237-1-mwalle@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240606_020857_504053_0E9C77A9 X-CRM114-Status: GOOD ( 14.37 ) 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 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..15a87ee4159d --- /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"; + m25p,fast-read; + spi-max-frequency = <100000000>; + reg = <1>; + }; +}; + +&fec { + status = "okay"; +}; + +&i2c1 { + status = "okay"; + + wm8904: audio-codec@1a { + #sound-dai-cells = <0>; + compatible = "wlf,wm8904"; + reg = <0x1a>; + 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"; +};