From patchwork Tue Jun 4 13:59:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Walle X-Patchwork-Id: 13685363 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 963F68F45; Tue, 4 Jun 2024 13:59:52 +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=1717509592; cv=none; b=blXTRR3mNsq3B8eZN0+SEF63M7QB0SboyAG7xdcTVNlUFy/bmetOSBJlvXf4SXIIuoaHCWSGiGHPbNFyJMasdhAxd3Na0TOqrw9HyoK4VQC3BGqUc49KZxFVsthYjQH4WyNJI26VG/26jEDrtILQKF0yndQ0SYFIwcXERpOptio= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717509592; c=relaxed/simple; bh=Fc3EWf1xyaS4qCDa8Ib0P/io9+UBcvdp5p0ftGP6Cpk=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=ghjut2guroOuEYRXPCr/bt/DksAxqVwoo1v7HbKu+gioa5SHnxXv0uo+HFf+MHBTWLtG02MR84+rh9NTRRZ03z9fmExxocquWtxPYWFBDtLXjHU2PE/twAQ6xMtELv/7M/QfTP9kOgHlquvyfZuNjWWE+QuAeQvFxyyGvdIeeHk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=qCqaUlTV; 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="qCqaUlTV" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 325A0C32786; Tue, 4 Jun 2024 13:59:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1717509592; bh=Fc3EWf1xyaS4qCDa8Ib0P/io9+UBcvdp5p0ftGP6Cpk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qCqaUlTVX31xEbNvWVZsSdUFZg+20t161rlA6M3O5hkG5wjWkXXH1T5jUZGux42Wr B5/UngxDYKXJ+d3GaG2xZLS9VVokncniWMzwzCh8tg0fS2cJQBWh05hrLS2LyiAmwr 95cZ5k+iBJFE5y/5w12LwMl5vJon6BGizZDcTfkpJNEnGS3K087wEBcPZ5FbkCpZFr LWLbM2O5j2Y2WrFCDzs+ISXUVy89/gynAvzXaq7W5+PySuB0gmle/9qbgnrHGn1r5w SIwEHxdbjweK/TLmKzdNMLBfAktRiyDvzhPLyhal+L4HVUquuoPLI7iCtCRpzJOmVD G8jpq00zbQH9Q== 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, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, Michael Walle Subject: [PATCH 01/10] ARM: dts: imx6qdl-kontron-samx6i: fix phy-mode Date: Tue, 4 Jun 2024 15:59:25 +0200 Message-Id: <20240604135934.1951189-2-mwalle@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240604135934.1951189-1-mwalle@kernel.org> References: <20240604135934.1951189-1-mwalle@kernel.org> Precedence: bulk X-Mailing-List: imx@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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 Tue Jun 4 13:59:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Walle X-Patchwork-Id: 13685364 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 034C974297; Tue, 4 Jun 2024 13:59:55 +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=1717509596; cv=none; b=RcYKONxCUB1VNVttyz9Fv6+6rY4ZnRJX7y17fWG+qJOayNBja/8Bo8QyTeeaw6kfPx+V5KLt/fvlR6iXuemJQhrbpsmqTFgDwBXyxrM9J1pZHfivWfDKkKxFMkg4+RUv22bi97YVVEBzk5HpXRhxgEc1Kuv+ltfVtbiGuB8KrrE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717509596; c=relaxed/simple; bh=2Qw+7Rve50c6UoNrfytgIz8RzG/OQfuJ1xjLwlqspyo=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=X6cqGN29AGYKVvoeVJEiLD9uXbV8geDU6NmcdLWX3Lwlf/bWMkg1mqb6WI2Mil9M5S4qiEpnjfg3zdPoo2vgjqomA9u0yGa9GJBG7f0oohw6BvZumk00xEDCuJ/rDBbDanK61IYtcggvLDf0NkTQLwCw2vKTqtaJ5P7POZbPFVo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=WeRH4UBA; 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="WeRH4UBA" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A02AAC2BBFC; Tue, 4 Jun 2024 13:59:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1717509595; bh=2Qw+7Rve50c6UoNrfytgIz8RzG/OQfuJ1xjLwlqspyo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WeRH4UBAp34KH9bLuOJCjmEiebZzChPZgnBRhtxkGe1K2BtDSFHntaN0fdjrck//a LQfoTbvTonNz/oyzjZErxU5vPzzzDMlBQ+7dwQYR0FDBK43OW7BjjEoq0Cs6lenjz8 zum7bSsdyk6LZQWM+oN81iUovvg4KRS3Y69Zaxouhpjh0SM9ubntBo9sqvsA3Yre7r NaPRubsW8VmWRvXv0/BIoj4LL4VAHbSYVg0ZjnrQyaaZG62UOTibh7CvySxJMMFN+m Uu/9rUUZKAbLEt2Aie9NLxmkEXUdgYn6fruLW1jhnIr0aWK0LJHyIhY5cVWiLVCajC aHHcnIbhjJ2uA== 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, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, Michael Walle Subject: [PATCH 02/10] ARM: dts: imx6qdl-kontron-samx6i: fix PHY reset Date: Tue, 4 Jun 2024 15:59:26 +0200 Message-Id: <20240604135934.1951189-3-mwalle@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240604135934.1951189-1-mwalle@kernel.org> References: <20240604135934.1951189-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 Tue Jun 4 13:59:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Walle X-Patchwork-Id: 13685365 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 8CA2A132C3B; Tue, 4 Jun 2024 13:59:59 +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=1717509599; cv=none; b=IsGUx56hJR5+/o9Ohdc2FPvpIjhXB/ucF8e3/tMUp/oeXDgl25V3Qu+JlXDMr1O0Y0XiBgI7Ahls8YKqj3nUg6tTQJq/qypb+mxY2MtxIPVm7gPUoIXSDx7XDcxBo2JUrcKIofYDAIh3Ga7XF0izjNEM4JbjukVUr/bfeaqWD0M= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717509599; c=relaxed/simple; bh=pmxH+3/T6ldwrIaJrUq9EPud/gdsJYcTk1L1yQXC5Yc=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=JhEG4GvUnQnKGwD8K6pwI8m2AqsBLdGHPH/7Nd6uf3xizpzsCtyFR/eBlWtYKYoeeOafhYa9sHGkEZGujOuZqaJ8+63MYu8krACugjG8iW/xS/MiwaHPZbiZXk4RTskIH9fvcG0r1lriCSsO2V+x92tPtAGVSHVgq2bGQimA2jY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=WWjTgzr1; 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="WWjTgzr1" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1DABEC4AF0A; Tue, 4 Jun 2024 13:59:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1717509599; bh=pmxH+3/T6ldwrIaJrUq9EPud/gdsJYcTk1L1yQXC5Yc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WWjTgzr1Ptqbqdy5Pd6ic/b9wCn/kdyxwV6JUkUiTOADIQSUrZrXa5I8apEAUYi59 oJHPb/1TtSz00s1cWAGiYnYFCNTw4tED1Ssxmu0JWNx4Y2vj9YMMyRPCH166pVcdC5 7HILtsZXM2XG6jWixxC36gTrCaewYK5mia98fDZpICQuEqYUov7kaNCFskrxHI4yJj ayVO1R4aongYVCHQwlYgDO40g33/maBd2TgDCsnYhmvvke2pHHcsbis1XIutoY0DNp MlsKwX9cg743IF/0V6AbFzNGZwlg0eJk7U+kqP2NCC853jyXPKt9mJRXdnl1dfp6yF OlcOOx6PanRlQ== 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, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, Michael Walle Subject: [PATCH 03/10] ARM: dts: imx6qdl-kontron-samx6i: fix board reset Date: Tue, 4 Jun 2024 15:59:27 +0200 Message-Id: <20240604135934.1951189-4-mwalle@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240604135934.1951189-1-mwalle@kernel.org> References: <20240604135934.1951189-1-mwalle@kernel.org> Precedence: bulk X-Mailing-List: imx@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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 Tue Jun 4 13:59:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Walle X-Patchwork-Id: 13685366 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 2C91717BA5; Tue, 4 Jun 2024 14:00:02 +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=1717509603; cv=none; b=c0z74dO6dyFL1v4OF55q5ywqXP8X5TLA1zKz7O/18jUxVXpL+WuTAU/Zgf+LsfO1PXp7q1BAxPgZDGjjnyy/11J+E1g9Qlut09FeB59ht796MsFjVFxZpiZy6JYUsadOmryu7bf5xfxRr55TjuIkhOulqSRA2pmSBFwPiXHZuos= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717509603; c=relaxed/simple; bh=pyCuKjBDzEztSGL5VPV6DvGUsY4tB58LJ6wtMtXdCKw=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=mCTWS9p4zKk0NvUyfdgJjJvlvwMtDn+jqDxfHAPpu1a/jVwxHtg1MTunASiyeyDvMjO72UgcMe3EUxFnb8pE80DtK1ZPN8mEnu3GWy+CrAK0g8h1lV6UtqVghuasXoK3Vzre74UYmf2n9q2O/1qBoy8iuCSQMShR6li2uCWnAvU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=uGsGogX1; 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="uGsGogX1" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8BBB2C4AF08; Tue, 4 Jun 2024 13:59:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1717509602; bh=pyCuKjBDzEztSGL5VPV6DvGUsY4tB58LJ6wtMtXdCKw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uGsGogX1Rff5OZP/fg8dZcaHUX296tarnWi8+y5fqmKcVPyoxViU8VehFvUhCclSS H7rxF0Atv120NqCRniYpcHvxZUj7mNCMqsXROm/hhUiazarxz+XUARZt4JgVzt3M2O ALdAPEniThHo6zDvjfj+q59AXXYMT0tXVK9kUaWVM32fFGqRF0jsdfmvPMWBIUr6Bo p7iBK29Zo/xlueS6gO/uPQ3k5ir0mFqCmwYlEoXtALuONkKlNoif5CJbdO6oZ07tPA gMqfT8siKnXneH3f9xBafqlPcCJqWe0TdAmJ3tT4i+m+27JZouOkZfBtMZoz03BORd hRqI665E5QGcQ== 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, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, Michael Walle Subject: [PATCH 04/10] ARM: dts: imx6qdl-kontron-samx6i: cleanup the PMIC node Date: Tue, 4 Jun 2024 15:59:28 +0200 Message-Id: <20240604135934.1951189-5-mwalle@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240604135934.1951189-1-mwalle@kernel.org> References: <20240604135934.1951189-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 Tue Jun 4 13:59: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: 13685367 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 87BE413D24F; Tue, 4 Jun 2024 14:00:06 +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=1717509606; cv=none; b=fQkDoZj97OpTrUMemt4/unNmx261Cd5046UBHs2OhW25l1GX75OepqluTCML+Gm5TTWkPI+hH71qYIzrbUrQ/MD/Yp4x4K9YFGQtAgHPWpxqIPMPCUi1KS4viRELFVwlCZm8tmGgUCwrXF/xRURW/8YXIZTODl0MdZS8CuRaKCc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717509606; c=relaxed/simple; bh=pE0vsrGZNwEDC2VKKmVgmDKbUEz9TgECCZmW3XAqSV0=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=cSjf3+Q+if3g0AQUz+JgwpGjICfy0nxIndWE3zkJDQCVaUak3CgIE4H/RlfG6dsEtm46qOIAkbNZA/ygAYnyaSGTvRGzSnlISkKVWLeQdeSP8rxxVPlpY8E50+xHT2Oj07oDlOj1ujmQXLgEaKzPaKfCFV2YVfOKJkCgQodq+Mg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=DUKG3prz; 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="DUKG3prz" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2E536C2BBFC; Tue, 4 Jun 2024 14:00:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1717509606; bh=pE0vsrGZNwEDC2VKKmVgmDKbUEz9TgECCZmW3XAqSV0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DUKG3przbpzig4SRmiGEvmdMbq5kM2H8CI5ssas2YppLjjocDr+Dmx7ULl3VI4IAI ASnCH+KaWA5zO0T6GM/NkLjKwK8BOuyzqX5V45VgxRekYG2P6/mcjt02HkKAbrN3KI ka/ELZu9HuDW7eBMAV8E8VEs7T1RpsKPODPUzRcUqJbJyrVAhNDTo7ivx0LRM+H1ZG nJd2S9/PQD7qXcInrO5qTHTWzLnZN9VNQ8wHKhOiRs5ElEYfE3z+pzxVBC5OglRCM8 0TYFywCkvCZwSYAsCFU2Hte28HoupgPOFF20qmkXJFfjy3rvJriSiHyhNU0s2Xy6pw 0ZcqJAVZoTs9A== 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, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, Michael Walle Subject: [PATCH 05/10] ARM: dts: imx6qdl-kontron-samx6i: fix SPI0 chip selects Date: Tue, 4 Jun 2024 15:59:29 +0200 Message-Id: <20240604135934.1951189-6-mwalle@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240604135934.1951189-1-mwalle@kernel.org> References: <20240604135934.1951189-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 Tue Jun 4 13:59: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: 13685368 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 1AE4513D24F; Tue, 4 Jun 2024 14:00:09 +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=1717509610; cv=none; b=uUy9BxjchYprYSv+jayxCT8vo4WzRO91EPwsjhsTiTj3+46g/DT5jqfmeznjeBkZ3ZMiVAd4qGfeozNgCD0mk2GoqhnhhprpGDBVg35NKZnH5Ugj+GEFbh6IQSFfDqBafK+eVhuNG5xiHM8gM0gkDQjSRFTFAgIKKuxAJ8ulaOo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717509610; c=relaxed/simple; bh=cP7uD/wG7u91xicq/qibn/jCrRGqs0slZIoz+5q3tuk=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=qaSbAwLwnL7tvsUrAcFr41H3SX+PFyJYFM9IUjrC4c4BiG+glOs28cX3TnbxgLurKRllRcGGVzpucKOoso1/LlVSw2rQscvqNVS5rTBtpQg6yb0EtitDUNLrA5La6d7aYUrySZhMvB7klR9Z62T70qKkRDlUW1kS2hVgZUgPW0E= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=RYUL7o6u; 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="RYUL7o6u" Received: by smtp.kernel.org (Postfix) with ESMTPSA id AEC62C4AF07; Tue, 4 Jun 2024 14:00:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1717509609; bh=cP7uD/wG7u91xicq/qibn/jCrRGqs0slZIoz+5q3tuk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RYUL7o6uWryWEjlN0rRCAeL587woAKjq97KzFJcTzeBKoUAQbSoMwAAuIifxaB1ey AX8pwjTg4ngTXHHOsVxU6EV3mbV9TBP8xyCAz2D2xTH2+spNZsKUD7CtHLuQeSDUnZ D4X1U4BgDhfhoQew587hNofF7X8J1/tGEV0Z+JUdHk4Ziv+yXiMTM91h8JtPfrJSjE Xlp94kJsIL/NoU0cnBcKStNPxEFD+PyHLfOAQ1eLO40U8iw7JgwG6kXkotUc1LQqGd BNwEzZTlIL0tlDHHp1aB9bZdObI925AA8AGJ+Gf4lZM+gaaoC9/SVGL6f+eCYYYYYq Sgj8DVHk0Jlzg== 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, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, Michael Walle Subject: [PATCH 06/10] ARM: dts: imx6qdl-kontron-samx6i: fix product name Date: Tue, 4 Jun 2024 15:59:30 +0200 Message-Id: <20240604135934.1951189-7-mwalle@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240604135934.1951189-1-mwalle@kernel.org> References: <20240604135934.1951189-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 Tue Jun 4 13:59: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: 13685369 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 A094E1EB26; Tue, 4 Jun 2024 14:00:13 +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=1717509613; cv=none; b=AdOt+TeyIFumTogb2TlpI7NZNFj36Ijiv2/WmBH3zMlxzKtbO0wLFHaDSa6c4xFk3LblnzBqF4D2NcwdIfXOh6aBXxs64Dy2mFvwPxQPJDJPKDrMmwCHKg0nhE2QZvTsn5IfKY4MSna3/G3HaKGr/YDGcdk5aRQt1g01wjneFfE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717509613; c=relaxed/simple; bh=bp4RUBBoDBNxBmueQhwpMXLVezAaB2zJTWzVJs7lfD8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=XYvZrDiPmy+54DpbvWi1IFa+w/jrO9VC0Smm4nM8M0VNL9t4qJtKMUE8BRJfCjljk4FsSZQpm3ruP584cjEZzgS1vRukfDYv44tP4DhyxZ7jSbqmAamKKeZk2Tjfi80wHuaHaPBxOnnveBEcPB8C9H0XyVxDncI7OPxOfk3Qpno= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=eZTqIUin; 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="eZTqIUin" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 278F9C2BBFC; Tue, 4 Jun 2024 14:00:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1717509613; bh=bp4RUBBoDBNxBmueQhwpMXLVezAaB2zJTWzVJs7lfD8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=eZTqIUin6QMORoeiFVbD804WbJDlgJ7D5GtxruxhrtSHTjJQyYCVzoKPGvLAa4E2j ofSSDd2suDVVfLZ1TlDX4s653lNKNPEHAtJvJQCs64r6q5f75cDDVzhKRI3elI80xC rtQ6eYScDyQItOnoG6srCQee12gBfXHNNhpA2/JkLHhHkkRq/HlwYl39n4mapXGGAJ 3qaUii2Zo9ekQtEWPa2ONsDwROdiQpJm1U8QyDeebCg/vuObbHBk47p6Xn0HQlyeSb 16CsS7X+YOA181TdABY75YTewaDVcNr3vun2FjarbbDFSoP8NlM21ZzEURBlvxk+OD 09/WG9cZUz/pQ== 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, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, Michael Walle Subject: [PATCH 07/10] ARM: dts: imx6qdl-kontron-samx6i: always enable eMMC Date: Tue, 4 Jun 2024 15:59:31 +0200 Message-Id: <20240604135934.1951189-8-mwalle@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240604135934.1951189-1-mwalle@kernel.org> References: <20240604135934.1951189-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 Tue Jun 4 13:59: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: 13685370 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 B43F9143C6D; Tue, 4 Jun 2024 14:00: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=1717509616; cv=none; b=uYBV1ti7gJJOfbqSoaX5GfhKjv9P3CfaKqsWda/vwTUuyULW8tpdauJvTV2aao4lrwjdwLNEMNvHijddlwdWTZu7vM0JDHJg7XxatEp21rDVqBQrxLf+bJUY5LIWnJOaEMcvgzlkEFr9DajlsWI3WFjzUIdtafFOg8kbzsmlwUg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717509616; c=relaxed/simple; bh=rFDucDznyAp9KdW6DmpqQ16mThJdgkTuPLsOXBQR5oo=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=p9s4CZsSs3sy1b9eIY9ohOF3q7mElfFtjLlHPJtroW+z/cIJlzi0m6SA5/3Xk9uFv3yO3uWmE9eh4z5pe3RZPAfvzmVOqEVE0PPgz6uvFIp6HnHeINC9w0s/5rtGZ2+0XYKWg3UkAV/RoipbjTGHI7dx14jSrTIBwQxkJp0gQFM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=aphoHj1i; 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="aphoHj1i" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 95D78C4AF09; Tue, 4 Jun 2024 14:00:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1717509616; bh=rFDucDznyAp9KdW6DmpqQ16mThJdgkTuPLsOXBQR5oo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=aphoHj1iBTcKQXKi3MxhatfTqitW3ZHgLOzyXkL3OgeTdWQNWhyfMdxW0Ozdhiy9C YwpUG9zWnVCBUllJExAftLctkpA7S4RfNL2B0yS38axBmxvOHl+EjIlHApG/Q/XoWF mhB4lDj22qWlJFtgjydgQvhIVZ/XDVa3ruenQPDberDElA8J+iNPJf1LXnI4S3h6ss tMqqif91QcvwQrzjeAvyTf3bOqyT5VypHgfAHvbu5V6MuxZBeuE+7aq33ehZVW9Ul1 ifm0plRpKbhDlSxzQ+9Q+vqbOphN2+DnK249Je9eIRlWo0uS5EYp81r73wRAHcsTUb XRvWKXiJzRXIQ== 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, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, Michael Walle Subject: [PATCH 08/10] ARM: dts: imx6qdl-kontron-samx6i: add SDIO_PWR_EN support Date: Tue, 4 Jun 2024 15:59:32 +0200 Message-Id: <20240604135934.1951189-9-mwalle@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240604135934.1951189-1-mwalle@kernel.org> References: <20240604135934.1951189-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..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 Tue Jun 4 13:59: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: 13685371 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 7DCD41448D4; Tue, 4 Jun 2024 14:00: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=1717509620; cv=none; b=nnpOtiqiFsVbB/sCsuuKvvZpVaOBs7Ax3U36DpTIdnivHm/pSqwwyEvCqR3FMUfrESf7BKtZXpz7VoTfOupkrhK+9J7DXq7onU/LUg5O2uB7svJ6vdDD+xLEfAYLEIPBtguXd1WYjtumz/nKBoQvQc+G61ZdmZScmeFDFIAafXc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717509620; c=relaxed/simple; bh=hTgdd4VxlXEUeWp19ojj9wjG3qoCtaUyDpv0giCGjYo=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=dK569zMHFaHHyM4hrVsNYj1FAUcEeULDvTwUvnI83IO4k5MbEFw9DpvI+K1aXDhfQqDC4KuKx8cQYQ0kEruNawHweer41T0Xig8OnPCXBLzIUzIOUDSnPLRUZqo9PWMHLNS53DpzUqGErhhmSVfgvAJp2lj7LNasi4PRFL1l/mc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=jjLxrkVx; 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="jjLxrkVx" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 12185C32786; Tue, 4 Jun 2024 14:00:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1717509620; bh=hTgdd4VxlXEUeWp19ojj9wjG3qoCtaUyDpv0giCGjYo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jjLxrkVx8rhNxbn81JEIiRJS3xk/CEOvBAYj0uN3KJDxLrkyoW57Mo0geQxofjexm sgd8ysO7okVCKeiG6GGahAZNf3pk/DKgbA8BAVNdBFrLcOqPKN59cJawfOkqchJiEj /soPIZxT/OYluCuOyDquntycyaZzZSK9KGT2lNfVXsm1Tp+QSK7uiIo+8ZlCMJD2tm cA9+J6Sgym75E96RFFB3Ft70nTjH9R792BhsQknqbKOnhR4dzfKqMwlBXgRtWj8Sv/ MRg/w9trieAbE2Xg3rhVGjoDFnbk0TVeKeP9ew6GSHmrJK6vFYVT3svxF46sE77ZY0 Oi+AZBSzexX3A== 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, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, Michael Walle Subject: [PATCH 09/10] dt-bindings: arm: fsl: document Kontron SMARC-sAMX6i boards Date: Tue, 4 Jun 2024 15:59:33 +0200 Message-Id: <20240604135934.1951189-10-mwalle@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240604135934.1951189-1-mwalle@kernel.org> References: <20240604135934.1951189-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. Signed-off-by: Michael Walle Acked-by: Krzysztof Kozlowski --- 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 Tue Jun 4 13:59: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: 13685372 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 D46ED143C6D; Tue, 4 Jun 2024 14:00:23 +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=1717509623; cv=none; b=RNjHq+TLi44GjDJoS0hlC++6XUtgSrKtD+bqY31sIA5gnbptsf1JPDhMUYEna104gMIx59V8lKSrmYd83SVfE1/bP9HH9xiCd1+XXEM7+H2JLbqo/5DYuuJz0I6B/hWiNpO6dfiMcbqLWD11gcgZghhsavPGL9NFRqFUYl6zmvw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717509623; c=relaxed/simple; bh=TuTC4xMc7GZShagg8C4/PapTgXr8QVOOxVdDj2YUO5k=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=DqxCBjZcPo//ZrKCUG6FgUNyzX7yljUEmBkATfO7ufv3wsp1ncysl5qB6jRqixAdpd+zaTS5S5Ey95mh4HmbW3MpS29q/58iHq51S0ZFnsw8nssicmBNdSsGgV99+X+O2bJPUCjQQqDLhT45CbeKjnghCSWpmCIM++VsNmwMDg8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=beELly/C; 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="beELly/C" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7DFD3C4AF09; Tue, 4 Jun 2024 14:00:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1717509623; bh=TuTC4xMc7GZShagg8C4/PapTgXr8QVOOxVdDj2YUO5k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=beELly/CphT0spKfPrIMjBbO5t3cx+jVCiTq36qfzDNQjw0il4I6dzs2iUfkBKypM F7jMyF/XKkAklCMlGdzkWifNgDZonhtqeN3tmQDnBLKs2Od3Scow1bRD9v/3nIwSXM edownA4rOB3pMgM4a4Nt0fWHMFsT8iA5swWTp88PkMtT/8Ng6XLmIIZS+rKfy5/GZJ D2gkPeVeWqQVQlN009nnVkAS69lEI0BFV2Pt/jhMpMAmcbDBzADyEDAFVZXcDtF9ev L/dzAupQ4fqSucbVpG7NSjdlq/HQxNY4Iyuo6JVYLUhskLbmd0An/rUDGT6C6/xyjK TZBqXSSZOEN1w== 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, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, Michael Walle Subject: [PATCH 10/10] ARM: dts: imx6qdl-kontron-samx6i: add actual device trees Date: Tue, 4 Jun 2024 15:59:34 +0200 Message-Id: <20240604135934.1951189-11-mwalle@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240604135934.1951189-1-mwalle@kernel.org> References: <20240604135934.1951189-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 | 121 ++++++++++++++++++ 4 files changed, 147 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..e5b3183d4ae0 --- /dev/null +++ b/arch/arm/boot/dts/nxp/imx/imx6qdl-kontron-samx6i-ads2.dtsi @@ -0,0 +1,121 @@ +// 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>; + }; + }; +}; + +&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"; + }; +}; + +&i2c3 { + eeprom@57 { + compatible = "atmel,24c64"; + reg = <0x57>; + pagesize = <32>; + }; +}; + +&ssi1 { + status = "okay"; +}; + +&uart1 { + status = "okay"; +}; + +&uart2 { + status = "okay"; +}; + +&uart4 { + status = "okay"; +}; + +&uart5 { + status = "okay"; +}; + +&usbh1 { + status = "okay"; +}; + +&usbotg { + status = "okay"; +}; + +&usdhc3 { + status = "okay"; +};