From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ej1-f44.google.com (mail-ej1-f44.google.com [209.85.218.44]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9D4EF206F19 for ; Wed, 16 Apr 2025 15:15:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.44 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744816524; cv=none; b=B0pGrc0GydpE5HMeTKoeSHt4dGXrxdlfj8MN7ArBnrdXZoDULjfSVXB5O1ZXdYPC2/vSBST3K/gDMGfxnRbaigKHN6XvLbXxzONgJOYUN+1/rhSQ7PJ/R3XGJ50rt3eQjS3nr5qcFBDDHwDSvgl6tB5hkbgZIyi+HPOGU/7zrI4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744816524; c=relaxed/simple; bh=HpU6VloERQNeMMx8yqX2bXPiTYCq+K5EnDiKMZtvK64=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=B+9TdKyqfSZdm1dpxRjGQpD4uPnvER63HzO3AuOTQ6buXljrwzZiGOGuJksJ4I9Y5PhhdkJBZJ6KKkQ3b6wrkNGFu0of0oxdv0ZrZiiL1Zmujdi7QT4MwSGDCWFDn1JyAar4R8sHfbfC9Jwab0zvz3u2rxnES19xLNuW7zYHSy4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=H4MDYX8x; arc=none smtp.client-ip=209.85.218.44 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="H4MDYX8x" Received: by mail-ej1-f44.google.com with SMTP id a640c23a62f3a-ac6e8cf9132so1305406266b.2 for ; Wed, 16 Apr 2025 08:15:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1744816521; x=1745421321; darn=lists.linux.dev; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=f54xB8jAzZGxPN+eurWEBlbBBztYq662AJjtmWBvOs8=; b=H4MDYX8xLITBmDp/BP43KBrRI19iMhteTi+Nc/PkQ0/sHczyY01CO2s/WrvSFNcCsS AI5QPnxwPMGjdcCsWeUacbU3vEaoDz0YzvPWB7ot9kPqc+vKkJPh5bLrWTyzCBCY66M7 EjmO8Vm7QYhchSZOb4vMMP2FmiPRpg1LZrpcYn+hi4ZyvB8KJlc1efoO5Okn+pR4a3aF 6597tTlplIY0pnDbqWVyupFwUzCa74oLTUHenV+vd18G1iicYhpi3VmKTNRQUQf8PFBv b5qARH2Lw7mhT8naxGOZtJSOuQ3II/GBol5jgTGLNpajL5UbuU8KZjeFuK8aQbD6ee+i KjHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744816521; x=1745421321; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=f54xB8jAzZGxPN+eurWEBlbBBztYq662AJjtmWBvOs8=; b=sNfSxg8/4R4KM47nDF0Vs2ZsQbDm3t3pUIR1c6+V/JzeV6jwzIVI8eRkWM4BjMGcSF R6fmYhoRTSIxBAgUNXrRgtNfsKfv6n2M6DVdL5R15lWqcnuBceO586E2DFIPy4Lz9idL JFS4qZjQwceKDlvrWl1VLNzCz+F879JmygtFPJ7mwTdE0wsArMLgV9PQi/e8DMsu+pPG MG00vIEZBdK4l1RcQSqN+UH6tSV9zry5Z++1Lk92RkyxWBQ/3giJznvo5K855U1c+L+0 Qgwwd1LmsUJqLolGTR5hizyghMOw2KTntC6I1rYWsGyg9GSl0icwfCzsoCJBgltbX2pO ZB6g== X-Forwarded-Encrypted: i=1; AJvYcCXUMDnPUuL8deja39qWvmPPw05Ewh7aRwWNCVGA/4yO+gv9eoojsWQOzRCTxQZ75Ccpx5k=@lists.linux.dev X-Gm-Message-State: AOJu0YypsZKqGYoQOlsPPFNAmcCN2tKwiNn0RY6c+Fo45VfwcRPP1byn JXL+3+zdr5pWpT82ZBM30ix6MN2JEDGd3rX3i72FwmqQTIatrY6C X-Gm-Gg: ASbGncszP179mIXhj5VeEJwmfUfw4/MNgZceZQfDi26jbk+h7PcVZOd+eYgx4WZcHAp rpiSMbYQl8Q41qSvJd5exVZLTgHmezqWrZo7lkO3NK2Vzvgh3Z9teXpAyjeYy0WELFjsTrAEXvX m0JsBaURflBQw6slmubmUIOgX5dU1MPgTn2lXJ7z/hNuildCxMgJ3QdNfcrn7l7WP4uPLVgeln5 c6LywCNcfzJzC6ujEDRqJ1oL15gGKrV6xKYRTxzp1WAZb/1K37PX8ds+0RieM4IrUxvvMZr5tJv sOB6zLwh4GCMu2UJFw3mFyEET3Jyjhp5CLR2PWmBlPXQVWGJMJh1Fg8CBUJZJQynTX9xBD/1TXI 38rxOwbJfraXZa9ZjjK4= X-Google-Smtp-Source: AGHT+IEYDMPTAVgdmlNNu9P4Oui1LjNbVBOfvMZvnfG/4JzHe+Ej8lmr2fDQnm8jtO40TBJR4xN3QQ== X-Received: by 2002:a17:907:3e03:b0:ac8:16fb:7c85 with SMTP id a640c23a62f3a-acb42bffb7fmr219117566b.41.1744816520410; Wed, 16 Apr 2025 08:15:20 -0700 (PDT) Received: from toolbox.int.toradex.com (31-10-206-125.static.upc.ch. [31.10.206.125]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-acb3ce5dbaesm143286166b.85.2025.04.16.08.15.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Apr 2025 08:15:20 -0700 (PDT) From: max.oss.09@gmail.com To: max.krummenacher@toradex.com Cc: Conor Dooley , Fabio Estevam , Krzysztof Kozlowski , Pengutronix Kernel Team , Rob Herring , Sascha Hauer , Shawn Guo , devicetree@vger.kernel.org, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v1] arm64: dts: imx8-apalis: Add PCIe and SATA support Date: Wed, 16 Apr 2025 17:13:41 +0200 Message-ID: <20250416151353.1692373-1-max.oss.09@gmail.com> X-Mailer: git-send-email 2.42.0 Precedence: bulk X-Mailing-List: imx@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Max Krummenacher The needed drivers to support PCIe and SATA for i.MX 8QM have been added. Configure them for the Apalis iMX8 SoM. The pciea and pcieb blocks each get a single PCIe lane, pciea is available on the carrier boards while pcieb is connected to the on module Wi-Fi/BT module. The SATA lane is available on the carrier boards. Signed-off-by: Max Krummenacher --- .../boot/dts/freescale/imx8-apalis-eval.dtsi | 10 ++- .../dts/freescale/imx8-apalis-ixora-v1.1.dtsi | 10 ++- .../dts/freescale/imx8-apalis-ixora-v1.2.dtsi | 10 ++- .../boot/dts/freescale/imx8-apalis-v1.1.dtsi | 70 ++++++++++++------- .../boot/dts/freescale/imx8qm-apalis.dtsi | 10 ++- 5 files changed, 74 insertions(+), 36 deletions(-) diff --git a/arch/arm64/boot/dts/freescale/imx8-apalis-eval.dtsi b/arch/arm64/boot/dts/freescale/imx8-apalis-eval.dtsi index dc127298715b..311d4950793c 100644 --- a/arch/arm64/boot/dts/freescale/imx8-apalis-eval.dtsi +++ b/arch/arm64/boot/dts/freescale/imx8-apalis-eval.dtsi @@ -104,7 +104,10 @@ &lsio_pwm3 { status = "okay"; }; -/* TODO: Apalis PCIE1 */ +/* Apalis PCIE1 */ +&pciea { + status = "okay"; +}; /* TODO: Apalis BKL1_PWM */ @@ -121,7 +124,10 @@ &sai5_lpcg { status = "okay"; }; -/* TODO: Apalis SATA1 */ +/* Apalis SATA1 */ +&sata { + status = "okay"; +}; /* Apalis SPDIF1 */ &spdif0 { diff --git a/arch/arm64/boot/dts/freescale/imx8-apalis-ixora-v1.1.dtsi b/arch/arm64/boot/dts/freescale/imx8-apalis-ixora-v1.1.dtsi index d4a1ad528f65..3d8731504ce1 100644 --- a/arch/arm64/boot/dts/freescale/imx8-apalis-ixora-v1.1.dtsi +++ b/arch/arm64/boot/dts/freescale/imx8-apalis-ixora-v1.1.dtsi @@ -191,7 +191,10 @@ &lsio_pwm3 { status = "okay"; }; -/* TODO: Apalis PCIE1 */ +/* Apalis PCIE1 */ +&pciea { + status = "okay"; +}; /* TODO: Apalis BKL1_PWM */ @@ -208,7 +211,10 @@ &sai5_lpcg { status = "okay"; }; -/* TODO: Apalis SATA1 */ +/* Apalis SATA1 */ +&sata { + status = "okay"; +}; /* Apalis SPDIF1 */ &spdif0 { diff --git a/arch/arm64/boot/dts/freescale/imx8-apalis-ixora-v1.2.dtsi b/arch/arm64/boot/dts/freescale/imx8-apalis-ixora-v1.2.dtsi index 5e132c83e1b2..106e802a68ba 100644 --- a/arch/arm64/boot/dts/freescale/imx8-apalis-ixora-v1.2.dtsi +++ b/arch/arm64/boot/dts/freescale/imx8-apalis-ixora-v1.2.dtsi @@ -240,7 +240,10 @@ &lsio_pwm3 { status = "okay"; }; -/* TODO: Apalis PCIE1 */ +/* Apalis PCIE1 */ +&pciea { + status = "okay"; +}; /* TODO: Apalis BKL1_PWM */ @@ -257,7 +260,10 @@ &sai5_lpcg { status = "okay"; }; -/* TODO: Apalis SATA1 */ +/* Apalis SATA1 */ +&sata { + status = "okay"; +}; /* Apalis SPDIF1 */ &spdif0 { diff --git a/arch/arm64/boot/dts/freescale/imx8-apalis-v1.1.dtsi b/arch/arm64/boot/dts/freescale/imx8-apalis-v1.1.dtsi index dbea1eefdeec..6f27a9cc2494 100644 --- a/arch/arm64/boot/dts/freescale/imx8-apalis-v1.1.dtsi +++ b/arch/arm64/boot/dts/freescale/imx8-apalis-v1.1.dtsi @@ -339,6 +339,25 @@ &flexcan3 { pinctrl-0 = <&pinctrl_flexcan3>; }; +&hsio_phy { + fsl,hsio-cfg = "pciea-pcieb-sata"; + fsl,refclk-pad-mode = "input"; + status = "okay"; +}; + +&hsio_refa_clk { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_pcie_sata_refclk>; + enable-gpios = <&lsio_gpio4 11 GPIO_ACTIVE_HIGH>; +}; + +&hsio_refb_clk { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_pcie_wifi_refclk>; + clocks = <&hsio_refa_clk>; + enable-gpios = <&lsio_gpio2 11 GPIO_ACTIVE_HIGH>; +}; + /* TODO: Apalis HDMI1 */ &gpu_alert0 { @@ -514,7 +533,10 @@ &lsio_gpio0 { "MXM3_112", "MXM3_118", "MXM3_114", - "MXM3_116"; + "MXM3_116", + "", + "", + "MXM3_26"; }; &lsio_gpio1 { @@ -586,15 +608,6 @@ &lsio_gpio2 { "MXM3_183", "MXM3_185", "MXM3_187"; - - pcie-wifi-hog { - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_pcie_wifi_refclk>; - gpio-hog; - gpios = <11 GPIO_ACTIVE_HIGH>; - line-name = "PCIE_WIFI_CLK"; - output-high; - }; }; &lsio_gpio3 { @@ -660,16 +673,6 @@ &lsio_gpio4 { "MXM3_291", "MXM3_289", "MXM3_287"; - - /* Enable pcie root / sata ref clock unconditionally */ - pcie-sata-hog { - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_pcie_sata_refclk>; - gpio-hog; - gpios = <11 GPIO_ACTIVE_HIGH>; - line-name = "PCIE_SATA_CLK"; - output-high; - }; }; &lsio_gpio5 { @@ -771,9 +774,30 @@ &mu2_m0 { status = "okay"; }; -/* TODO: Apalis PCIE1 */ +/* Apalis PCIE1 */ +&pciea { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_reset_moci>; + phys = <&hsio_phy 0 PHY_TYPE_PCIE 0>; + phy-names = "pcie-phy"; + reset-gpio = <&lsio_gpio0 30 GPIO_ACTIVE_LOW>; + vpcie-supply = <®_pcie_switch>; +}; + +/* On-module Wi-Fi */ +&pcieb { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_pcieb>, <&pinctrl_wifi>; + phys = <&hsio_phy 1 PHY_TYPE_PCIE 1>; + phy-names = "pcie-phy"; + reset-gpio = <&lsio_gpio5 0 GPIO_ACTIVE_LOW>; + status = "okay"; +}; -/* TODO: On-module Wi-Fi */ +&phyx2_lpcg { + clocks = <&hsio_refa_clk>, <&hsio_refb_clk>, + <&hsio_refa_clk>, <&hsio_per_clk>; +}; /* TODO: Apalis BKL1_PWM */ @@ -806,8 +830,6 @@ &sai5 { <722534400>, <45158400>, <11289600>, <49152000>; }; -/* TODO: Apalis SATA1 */ - /* Apalis SPDIF1 */ &spdif0 { assigned-clocks = <&clk IMX_SC_R_AUDIO_PLL_0 IMX_SC_PM_CLK_PLL>, diff --git a/arch/arm64/boot/dts/freescale/imx8qm-apalis.dtsi b/arch/arm64/boot/dts/freescale/imx8qm-apalis.dtsi index c18f57039f6e..f97feee52c81 100644 --- a/arch/arm64/boot/dts/freescale/imx8qm-apalis.dtsi +++ b/arch/arm64/boot/dts/freescale/imx8qm-apalis.dtsi @@ -22,6 +22,10 @@ &fec1 { phy-mode = "rgmii-rxid"; }; +&hsio_refa_clk { + enable-gpios = <&lsio_gpio4 27 GPIO_ACTIVE_HIGH>; +}; + /* TODO: Apalis HDMI1 */ /* Apalis I2C2 (DDC) */ @@ -188,12 +192,6 @@ &lsio_gpio4 { "MXM3_291", "MXM3_289", "MXM3_287"; - - /* Enable pcie root / sata ref clock unconditionally */ - pcie-sata-hog { - gpios = <27 GPIO_ACTIVE_HIGH>; - }; - }; &lsio_gpio5 { -- 2.42.0