From nobody Mon Feb 9 04:56:42 2026 Received: from mail-io1-f41.google.com (mail-io1-f41.google.com [209.85.166.41]) (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 40C98303A2D for ; Fri, 7 Nov 2025 19:16:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.166.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762542977; cv=none; b=VzGWu7paiqbZiTkruAu7xty3dyAwvgRYWFNKAryr4HTqTd5gdKKrMp9JM8QlQX7sv+yJYob3dEIzep/g2H03fgocImO2HDiwf96tKHtdRkkVHPu2SSwEdaaAsnGugb/L9rU6z941ckV8Jh9xx/t1tlqtXRSS36OoIAEz1ix8IZI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762542977; c=relaxed/simple; bh=Wu2Sm53QA+jpTycaZrWNmjrOzNnxjiLndCj6qBa4kng=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=EBaQ5ef9cGfmQknY6A6E0tY2YHrTnWMRy/sys0bCA+BntuX5JtmgHXpsd5Ch9zEtePvWICqtYf/Dc8S7NBFllrzPKx+3TS5PSxd8kBhd+QDKNUpgyMea/Vdj9+hcuY+JuB5RpliySOcLGczBJX+hBoH7Gx20u7mXPzkevUZJaT8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=riscstar.com; spf=pass smtp.mailfrom=riscstar.com; dkim=pass (2048-bit key) header.d=riscstar-com.20230601.gappssmtp.com header.i=@riscstar-com.20230601.gappssmtp.com header.b=quW5hTo4; arc=none smtp.client-ip=209.85.166.41 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=riscstar.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=riscstar.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=riscstar-com.20230601.gappssmtp.com header.i=@riscstar-com.20230601.gappssmtp.com header.b="quW5hTo4" Received: by mail-io1-f41.google.com with SMTP id ca18e2360f4ac-948640d425aso85506639f.0 for ; Fri, 07 Nov 2025 11:16:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=riscstar-com.20230601.gappssmtp.com; s=20230601; t=1762542974; x=1763147774; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=8jxQ2ZdtZCYOQIv/UAQFdIKdJK3+w+n0jdT7aG93hs0=; b=quW5hTo4UNH6qiDAAjS+/yMQ2GpsUt66ecRlupsXLr7lv1vO6azRhYODhB/5RIhpvV ZpRbGtmJBMYRmB2fqPldj3sqiJilbhsF6bn6xAznQbixh0JTI7G71zrtwCgQSjinxm9m xo1kU94D3gq5smzpshq2xjqVcDjYLRi2wZTkK+vlVnKaIa0S38dtbP+mCGFraPBhsnem cOxKFEHYRZCRf2OhyiBvsmG1g8erSWI0QjqPzr8WckUdG14a3eyFrHjDRj+I7gB4FivU prW+yl++PqF1rv/Aw7l+eEUSfIobXbDunChBHrd2ViUs2/shh8RMbg0swmFlFIchiKLR o5/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1762542974; x=1763147774; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=8jxQ2ZdtZCYOQIv/UAQFdIKdJK3+w+n0jdT7aG93hs0=; b=PZUdVH3knguQO6JP6c1MDe55ZzQmRCG4al68A5RPyO3lwARJaOiUP5fpBAxvFgoI2l FMtnNtLjdcBwiV6ak8CxOzk6pOeWlVqFzKmfL1KVB6YKTzo1kpJMghtye2i7UxBRfDMd +Zx36zl0ilakp6AxHe5iuTsuVZR3rW85Dd5kt+RhZ3FEXPWhYbciZ8Yexg8zqm7kmNcn pJeNjdMcT5/bRcYByY8m64RbB7y5XF4gWA2hHmXkzqsbK9S6Jd9gMCX+c2Srl47KKoTw l+zL7gSKz5euPwQ4Wrwqqc7rPQeBCngLTml1xccmh5C/xrP7VQQmdqQp9h+6ndGcKyZP 3OIg== X-Forwarded-Encrypted: i=1; AJvYcCUwTfBsa5YsvA7Z63UCyMITZ2w+b8MCrjEBOd7nmI2nSQFKd1H1k0+DXRI08DbXZdv0Q1x8q3UeNny0oOA=@vger.kernel.org X-Gm-Message-State: AOJu0YynY1Y1g07yzSMRzUEmdYYZDK1NlJcEzMpcELhXAK8iadmqL/H8 a9CfzU0wXciN7YdmJUNhx+6yqJ2d6MplkJW7yD6e/BdGkjCxe3VGMXRBeG9SjrbvMB4= X-Gm-Gg: ASbGncsWLlRzYYXeQ761Oak88WXAZZvMUq2axejAlOEOPYdV9mkwGzpPgHXPkDMkHZ8 Cc06Tgbp5PDB7Ykkt93PuVCvps6sQx4b+EMOZ1NSAmGYJobwwhXH/z8gQ93i5d5PWIrMBYtQ+Oy Fs1RplEwNuZJMhFFWjC82BcGeBVtG1UIQQBUnyNpcphcqHrg2G/0ksHoEA+5SfEWUgz3OYSiskg Gh0271ysdDpKPQnxitnjaKRT+Q518z3ITM9HQfhZlNXG/bNo6m9jdEBp6M+KzENTphLrXELBW7m K0iI4eNSvIKyMgDctdJfZ64QIbxNR07rpOqu/CHFKwGiohbcNoyUjblv4iagiBY1q9TLiP6Gv2w iF+YzNFYB1IEuWWQv07q3RZClf2IrM/CoXZ8/OggVyFuhgUmM9mwG7TrVErzJ2cTV6wqifppCdH r80cWW6xcWJ/644kdS/PkhxwQo+kl/PhiVbAK8ZBSui939PFRAWTNNuA== X-Google-Smtp-Source: AGHT+IEIFqf72Uw7lXpnK7z2vlHsr603Sf+gE4ADuvndF3WZpiJLFRzDUOtpTTOcWimjOtUmXNv9qg== X-Received: by 2002:a92:cd8d:0:b0:433:2a39:1b92 with SMTP id e9e14a558f8ab-43367deab6cmr10145175ab.11.1762542974129; Fri, 07 Nov 2025 11:16:14 -0800 (PST) Received: from zippy.localdomain (c-75-72-117-212.hsd1.mn.comcast.net. [75.72.117.212]) by smtp.gmail.com with ESMTPSA id ca18e2360f4ac-94888c34c6asm118772939f.10.2025.11.07.11.16.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Nov 2025 11:16:13 -0800 (PST) From: Alex Elder To: dlan@gentoo.org, robh@kernel.org, krzk+dt@kernel.org, conor+dt@kernel.org Cc: pjw@kernel.org, palmer@dabbelt.com, aou@eecs.berkeley.edu, alex@ghiti.fr, guodong@riscstar.com, devicetree@vger.kernel.org, linux-riscv@lists.infradead.org, spacemit@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH v5 7/7] riscv: dts: spacemit: PCIe and PHY-related updates Date: Fri, 7 Nov 2025 13:15:56 -0600 Message-ID: <20251107191557.1827677-8-elder@riscstar.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20251107191557.1827677-1-elder@riscstar.com> References: <20251107191557.1827677-1-elder@riscstar.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Define PCIe and PHY-related Device Tree nodes for the SpacemiT K1 SoC. Enable the combo PHY and the two PCIe-only PHYs on the Banana Pi BPI-F3 board. The combo PHY is used for USB on this board, and that will be enabled when USB 3 support is accepted. The combo PHY must perform a calibration step to determine configuration values used by the PCIe-only PHYs. As a result, it must be enabled if either of the other two PHYs is enabled. Signed-off-by: Alex Elder --- v5: - Regulators defined in the PCIe controller nodes rather than in their root port sub-nodes (in "k1-bananapi-f3.dts") .../boot/dts/spacemit/k1-bananapi-f3.dts | 36 ++++ arch/riscv/boot/dts/spacemit/k1-pinctrl.dtsi | 33 ++++ arch/riscv/boot/dts/spacemit/k1.dtsi | 176 ++++++++++++++++++ 3 files changed, 245 insertions(+) diff --git a/arch/riscv/boot/dts/spacemit/k1-bananapi-f3.dts b/arch/riscv/b= oot/dts/spacemit/k1-bananapi-f3.dts index a269c2cca3ac9..79ab40d53a4b5 100644 --- a/arch/riscv/boot/dts/spacemit/k1-bananapi-f3.dts +++ b/arch/riscv/boot/dts/spacemit/k1-bananapi-f3.dts @@ -61,6 +61,12 @@ reg_vcc_4v: vcc-4v { }; }; =20 +&combo_phy { + pinctrl-names =3D "default"; + pinctrl-0 =3D <&pcie0_3_cfg>; + status =3D "okay"; +}; + &emmc { bus-width =3D <8>; mmc-hs400-1_8v; @@ -266,6 +272,36 @@ dldo7 { }; }; =20 +&pcie1_phy { + pinctrl-names =3D "default"; + pinctrl-0 =3D <&pcie1_3_cfg>; + status =3D "okay"; +}; + +&pcie1_port { + phys =3D <&pcie1_phy>; +}; + +&pcie1 { + vpcie3v3-supply =3D <&pcie_vcc_3v3>; + status =3D "okay"; +}; + +&pcie2_phy { + pinctrl-names =3D "default"; + pinctrl-0 =3D <&pcie2_4_cfg>; + status =3D "okay"; +}; + +&pcie2_port { + phys =3D <&pcie2_phy>; +}; + +&pcie2 { + vpcie3v3-supply =3D <&pcie_vcc_3v3>; + status =3D "okay"; +}; + &uart0 { pinctrl-names =3D "default"; pinctrl-0 =3D <&uart0_2_cfg>; diff --git a/arch/riscv/boot/dts/spacemit/k1-pinctrl.dtsi b/arch/riscv/boot= /dts/spacemit/k1-pinctrl.dtsi index 4eef81d583f3d..d456dea7bd32a 100644 --- a/arch/riscv/boot/dts/spacemit/k1-pinctrl.dtsi +++ b/arch/riscv/boot/dts/spacemit/k1-pinctrl.dtsi @@ -509,6 +509,39 @@ uart9-2-pins { }; }; =20 + pcie0_3_cfg: pcie0-3-cfg { + pcie0-3-pins { + pinmux =3D , /* PERST# */ + , /* WAKE# */ + ; /* CLKREQ# */ + + bias-pull-up =3D <0>; + drive-strength =3D <21>; + }; + }; + + pcie1_3_cfg: pcie1-3-cfg { + pcie1-3-pins { + pinmux =3D , /* PERST# */ + , /* WAKE# */ + ; /* CLKREQ# */ + + bias-pull-up =3D <0>; + drive-strength =3D <21>; + }; + }; + + pcie2_4_cfg: pcie2-4-cfg { + pcie2-4-pins { + pinmux =3D , /* PERST# */ + , /* WAKE# */ + ; /* CLKREQ# */ + + bias-pull-up =3D <0>; + drive-strength =3D <21>; + }; + }; + pwm14_1_cfg: pwm14-1-cfg { pwm14-1-pins { pinmux =3D ; diff --git a/arch/riscv/boot/dts/spacemit/k1.dtsi b/arch/riscv/boot/dts/spa= cemit/k1.dtsi index af35f9cd64351..a20422db101ee 100644 --- a/arch/riscv/boot/dts/spacemit/k1.dtsi +++ b/arch/riscv/boot/dts/spacemit/k1.dtsi @@ -4,6 +4,7 @@ */ =20 #include +#include =20 /dts-v1/; / { @@ -358,6 +359,52 @@ syscon_rcpu2: system-controller@c0888000 { #reset-cells =3D <1>; }; =20 + combo_phy: phy@c0b10000 { + compatible =3D "spacemit,k1-combo-phy"; + reg =3D <0x0 0xc0b10000 0x0 0x1000>; + clocks =3D <&vctcxo_24m>, + <&syscon_apmu CLK_PCIE0_DBI>, + <&syscon_apmu CLK_PCIE0_MASTER>, + <&syscon_apmu CLK_PCIE0_SLAVE>; + clock-names =3D "refclk", + "dbi", + "mstr", + "slv"; + resets =3D <&syscon_apmu RESET_PCIE0_GLOBAL>, + <&syscon_apmu RESET_PCIE0_DBI>, + <&syscon_apmu RESET_PCIE0_MASTER>, + <&syscon_apmu RESET_PCIE0_SLAVE>; + reset-names =3D "phy", + "dbi", + "mstr", + "slv"; + #phy-cells =3D <1>; + spacemit,apmu =3D <&syscon_apmu>; + status =3D "disabled"; + }; + + pcie1_phy: phy@c0c10000 { + compatible =3D "spacemit,k1-pcie-phy"; + reg =3D <0x0 0xc0c10000 0x0 0x1000>; + clocks =3D <&vctcxo_24m>; + clock-names =3D "refclk"; + resets =3D <&syscon_apmu RESET_PCIE1_GLOBAL>; + reset-names =3D "phy"; + #phy-cells =3D <0>; + status =3D "disabled"; + }; + + pcie2_phy: phy@c0d10000 { + compatible =3D "spacemit,k1-pcie-phy"; + reg =3D <0x0 0xc0d10000 0x0 0x1000>; + clocks =3D <&vctcxo_24m>; + clock-names =3D "refclk"; + resets =3D <&syscon_apmu RESET_PCIE2_GLOBAL>; + reset-names =3D "phy"; + #phy-cells =3D <0>; + status =3D "disabled"; + }; + syscon_apbc: system-controller@d4015000 { compatible =3D "spacemit,k1-syscon-apbc"; reg =3D <0x0 0xd4015000 0x0 0x1000>; @@ -873,6 +920,135 @@ pcie-bus { #size-cells =3D <2>; dma-ranges =3D <0x0 0x00000000 0x0 0x00000000 0x0 0x80000000>, <0x0 0xb8000000 0x1 0x38000000 0x3 0x48000000>; + pcie0: pcie@ca000000 { + device_type =3D "pci"; + compatible =3D "spacemit,k1-pcie"; + reg =3D <0x0 0xca000000 0x0 0x00001000>, + <0x0 0xca300000 0x0 0x0001ff24>, + <0x0 0x8f000000 0x0 0x00002000>, + <0x0 0xc0b20000 0x0 0x00001000>; + reg-names =3D "dbi", + "atu", + "config", + "link"; + #address-cells =3D <3>; + #size-cells =3D <2>; + ranges =3D <0x01000000 0x0 0x00000000 0x0 0x8f002000 0x0 0x00100000>, + <0x02000000 0x0 0x80000000 0x0 0x80000000 0x0 0x0f000000>; + interrupts =3D <141>; + interrupt-names =3D "msi"; + clocks =3D <&syscon_apmu CLK_PCIE0_DBI>, + <&syscon_apmu CLK_PCIE0_MASTER>, + <&syscon_apmu CLK_PCIE0_SLAVE>; + clock-names =3D "dbi", + "mstr", + "slv"; + resets =3D <&syscon_apmu RESET_PCIE0_DBI>, + <&syscon_apmu RESET_PCIE0_MASTER>, + <&syscon_apmu RESET_PCIE0_SLAVE>; + reset-names =3D "dbi", + "mstr", + "slv"; + spacemit,apmu =3D <&syscon_apmu 0x03cc>; + status =3D "disabled"; + + pcie0_port: pcie@0 { + device_type =3D "pci"; + compatible =3D "pciclass,0604"; + reg =3D <0x0 0x0 0x0 0x0 0x0>; + bus-range =3D <0x01 0xff>; + #address-cells =3D <3>; + #size-cells =3D <2>; + ranges; + }; + }; + + pcie1: pcie@ca400000 { + device_type =3D "pci"; + compatible =3D "spacemit,k1-pcie"; + reg =3D <0x0 0xca400000 0x0 0x00001000>, + <0x0 0xca700000 0x0 0x0001ff24>, + <0x0 0x9f000000 0x0 0x00002000>, + <0x0 0xc0c20000 0x0 0x00001000>; + reg-names =3D "dbi", + "atu", + "config", + "link"; + #address-cells =3D <3>; + #size-cells =3D <2>; + ranges =3D <0x01000000 0x0 0x00000000 0x0 0x9f002000 0x0 0x00100000>, + <0x02000000 0x0 0x90000000 0x0 0x90000000 0x0 0x0f000000>; + interrupts =3D <142>; + interrupt-names =3D "msi"; + clocks =3D <&syscon_apmu CLK_PCIE1_DBI>, + <&syscon_apmu CLK_PCIE1_MASTER>, + <&syscon_apmu CLK_PCIE1_SLAVE>; + clock-names =3D "dbi", + "mstr", + "slv"; + resets =3D <&syscon_apmu RESET_PCIE1_DBI>, + <&syscon_apmu RESET_PCIE1_MASTER>, + <&syscon_apmu RESET_PCIE1_SLAVE>; + reset-names =3D "dbi", + "mstr", + "slv"; + spacemit,apmu =3D <&syscon_apmu 0x3d4>; + status =3D "disabled"; + + pcie1_port: pcie@0 { + device_type =3D "pci"; + compatible =3D "pciclass,0604"; + reg =3D <0x0 0x0 0x0 0x0 0x0>; + bus-range =3D <0x01 0xff>; + #address-cells =3D <3>; + #size-cells =3D <2>; + ranges; + }; + }; + + pcie2: pcie@ca800000 { + device_type =3D "pci"; + compatible =3D "spacemit,k1-pcie"; + reg =3D <0x0 0xca800000 0x0 0x00001000>, + <0x0 0xcab00000 0x0 0x0001ff24>, + <0x0 0xb7000000 0x0 0x00002000>, + <0x0 0xc0d20000 0x0 0x00001000>; + reg-names =3D "dbi", + "atu", + "config", + "link"; + #address-cells =3D <3>; + #size-cells =3D <2>; + ranges =3D <0x01000000 0x0 0x00000000 0x0 0xb7002000 0x0 0x00100000>, + <0x42000000 0x0 0xa0000000 0x0 0xa0000000 0x0 0x10000000>, + <0x02000000 0x0 0xb0000000 0x0 0xb0000000 0x0 0x07000000>; + interrupts =3D <143>; + interrupt-names =3D "msi"; + clocks =3D <&syscon_apmu CLK_PCIE2_DBI>, + <&syscon_apmu CLK_PCIE2_MASTER>, + <&syscon_apmu CLK_PCIE2_SLAVE>; + clock-names =3D "dbi", + "mstr", + "slv"; + resets =3D <&syscon_apmu RESET_PCIE2_DBI>, + <&syscon_apmu RESET_PCIE2_MASTER>, + <&syscon_apmu RESET_PCIE2_SLAVE>; + reset-names =3D "dbi", + "mstr", + "slv"; + spacemit,apmu =3D <&syscon_apmu 0x3dc>; + status =3D "disabled"; + + pcie2_port: pcie@0 { + device_type =3D "pci"; + compatible =3D "pciclass,0604"; + reg =3D <0x0 0x0 0x0 0x0 0x0>; + bus-range =3D <0x01 0xff>; + #address-cells =3D <3>; + #size-cells =3D <2>; + ranges; + }; + }; }; =20 storage-bus { --=20 2.48.1