Received-SPF: pass (google.com: domain of linux-kernel+bounces-213950-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249;
From: Nathan Morrisson <nmorrisson@phytec.com>
To: nm@ti.com,
	vigneshr@ti.com,
	kristo@kernel.org,
	robh@kernel.org,
	krzk+dt@kernel.org,
	conor+dt@kernel.org
Cc: linux-arm-kernel@lists.infradead.org,
	devicetree@vger.kernel.org,
	linux-kernel@vger.kernel.org,
	upstream@lists.phytec.de,
	w.egorov@phytec.de
Subject: [PATCH v4 2/2] arm64: dts: ti: am642-phyboard-electra: Add overlay to enable PCIe
Date: Thu, 13 Jun 2024 12:50:12 -0700
Message-Id: <20240613195012.1925920-3-nmorrisson@phytec.com>
In-Reply-To: <20240613195012.1925920-1-nmorrisson@phytec.com>
References: <20240613195012.1925920-1-nmorrisson@phytec.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0:
	=?us-ascii?Q?k2Z6SDee3yb4C93c1Y3sf5tPCEMnR9vYn267sBABpZzHRPo8zJGFKt/Ftp5u?=
 =?us-ascii?Q?rzBfbq7MKVg4xHc8J0KX5XqDZGbNnJnlPO/5bjU/mKLNQQjvWHNUB8MLcWYL?=
 =?us-ascii?Q?CHxuvb9JxwP0TpCfN3DuhBs3lYFGTOXzNFusksNxY3RpQR54bkMXUzXyiccI?=
 =?us-ascii?Q?V0WwkePgtPh6OAaszJvpltLjskvgHZtEK1VYZWCJrOZIxhl2vcS8wyLeL/0P?=
 =?us-ascii?Q?+J/irrFjHs3TjDyyX3DE3dvjuMzfe8Slc2An4N2Vf+XrlS5fbxi0uREjO6Z3?=
 =?us-ascii?Q?3R2BSu9R3wY8F5D6vIlqlOQXOkioSGFd/BdVjuAAg3Q1qnmhQlrInh+2BNFM?=
 =?us-ascii?Q?YMZzpMl5TFJEBIZXHBQw9hKGrRutis7Qt3j6jerS7KzBSzUCHJHaCDGjyPJM?=
 =?us-ascii?Q?V+a1CiFeu2XFAIXow777IZqhRHvPwz3FiP2mFcS6puwi25eh2yQQTI07dpUN?=
 =?us-ascii?Q?oVHn1geyckvV2Pufjp94moJgxJaMgaKDRJjwPZ7ld8piuLm3GzsxGTOteDeL?=
 =?us-ascii?Q?dDQ4We61Ecv1FIkDyFmQhQmX8M/fhpJh3hIimCEHgqvJZhjJzhOZY8TeeX5l?=
 =?us-ascii?Q?MSYGWT9xT0qNFxowVwN7tC7q0d/iTPT7wJyHTLjmMWTBdxBouSI0XjO1BKao?=
 =?us-ascii?Q?Zxawh2U+vkiix6pq1EHN3tBe6OU+7jm6ZRQXJpZs1R80SyQj5a2p1CetKB8t?=
 =?us-ascii?Q?T4K2y6K4KH88Me8ws2Ackhh4KShBT12DTjQ6K9+MTN2Z5lMqM9w741vW/WpD?=
 =?us-ascii?Q?3FT+Kztj+hGYZSlxo05f8zhvymSs56KHqu/zTLvZQq2aKJbmJGVatX9g0LAY?=
 =?us-ascii?Q?vfGMXZeTXqkeIZ8D54bFY21DFOx5tN2WVUepuiYS1cUXXkHv/FQ6dpBrT6Cp?=
 =?us-ascii?Q?OSjra+zOd2sr268QSIo1Pkyj6f5v5DtDd7SegYTRujzNjvPN6d+R/V1YYVQ3?=
 =?us-ascii?Q?l3CrB9lL4WwUJAXWfQZM9Z9ew6ND5OJFg9P6n4pCTC1QnEMDDIbC5VyYu2ys?=
 =?us-ascii?Q?fuuIcSZKE44awaUJkkl0LdkM8JlpDl4dsXJy6R0UA1ra/NZQo30MSxz9Ej5L?=
 =?us-ascii?Q?7CrpMGQaSNDkzas0Pu2vVstYVhYbxj1W0tpGxqzd171GWHRRYVLqXTmDHZrs?=
 =?us-ascii?Q?qw1dq+DgSQ8OpCSQ9Jf70U9WXkiN3iVWUPPchsk+D7CFr17TUBeJ7sfD/XVm?=
 =?us-ascii?Q?h9KtLl94eXALrNG8/rKqPPibQR+0O42MJcaIdzq1C9Cmeejrh9LV2aBT8jN4?=
 =?us-ascii?Q?bxp14k14SCNt7+SvlFbSBigLjQwvExfCLzXxM2f0jNClkv78T3TV0fXR6NsO?=
 =?us-ascii?Q?s2trhVw72i65TCQMMa6udVL3VtgtAjtEUQUf3fX1zA1QM3Q6QIvfeAxYCcqz?=
 =?us-ascii?Q?KTugAKKFlSF0Lj4NlsSQbl2eAaOfv3iLrkmduCC+N21/tPGBDQy+N0JLvlp5?=
 =?us-ascii?Q?C535FlWYgdqjOTSFNOK41d+9dBllHz3aQ7QsixxsTQx9MGjDUEc2gdOR5t1z?=
 =?us-ascii?Q?+eKC+d+k1p76ed2XJTaiDBWwN2+7rWKRAucECri5Li69HCVP1DBwrxAWEbsg?=
 =?us-ascii?Q?Sxee48eVnef4nN2fcQrZEQNBV2+7uMzAowR1Gx2o?=
X-OriginatorOrg: phytec.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 81e9a4d6-74ef-48a0-3b81-08dc8be211fe
X-MS-Exchange-CrossTenant-AuthSource: SA1PR22MB5636.namprd22.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Jun 2024 19:50:26.2129
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 67bcab1a-5db0-4ee8-86f4-1533d0b4b5c7
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: XEtk3WBCtd1Zio21+YwZ5dTPHrYeDc0w0zaVVysXb9ZAuAthfW8ZtK1zMPjhPLF7/+STtNXy8Fu95TJNdmkh4w==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: LV3PR22MB5145

Add an overlay to enable PCIe on the am642-phyboard-electra. The
serdes is muxed from USB to PCIe, so we are restricted to USB2 while
using this overlay.

Signed-off-by: Nathan Morrisson <nmorrisson@phytec.com>
Reviewed-by: Wadim Egorov <w.egorov@phytec.de>
---
v4:
  - Add explanation for disabling usb3 to commit message

v3:
  - Fix typo from .dtbs to -dtbs in Makefile for overlay testing

v2:
  - Fix double space typo
  - Remove redundant status = okay

 arch/arm64/boot/dts/ti/Makefile               |  3 +
 .../k3-am642-phyboard-electra-pcie-usb2.dtso  | 87 +++++++++++++++++++
 2 files changed, 90 insertions(+)
 create mode 100644 arch/arm64/boot/dts/ti/k3-am642-phyboard-electra-pcie-usb2.dtso

diff --git a/arch/arm64/boot/dts/ti/Makefile b/arch/arm64/boot/dts/ti/Makefile
index 2c327cc320cf..1906711b9b77 100644
--- a/arch/arm64/boot/dts/ti/Makefile
+++ b/arch/arm64/boot/dts/ti/Makefile
@@ -49,6 +49,7 @@ dtb-$(CONFIG_ARCH_K3) += k3-am642-hummingboard-t-pcie.dtb
 dtb-$(CONFIG_ARCH_K3) += k3-am642-hummingboard-t-usb3.dtb
 dtb-$(CONFIG_ARCH_K3) += k3-am642-phyboard-electra-rdk.dtb
 dtb-$(CONFIG_ARCH_K3) += k3-am642-phyboard-electra-gpio-fan.dtbo
+dtb-$(CONFIG_ARCH_K3) += k3-am642-phyboard-electra-pcie-usb2.dtbo
 dtb-$(CONFIG_ARCH_K3) += k3-am642-sk.dtb
 dtb-$(CONFIG_ARCH_K3) += k3-am642-tqma64xxl-mbax4xxl.dtb
 dtb-$(CONFIG_ARCH_K3) += k3-am64-tqma64xxl-mbax4xxl-sdcard.dtbo
@@ -134,6 +135,8 @@ k3-am642-evm-icssg1-dualemac-dtbs := \
 	k3-am642-evm.dtb k3-am642-evm-icssg1-dualemac.dtbo
 k3-am642-phyboard-electra-gpio-fan-dtbs := \
 	k3-am642-phyboard-electra-rdk.dtb k3-am642-phyboard-electra-gpio-fan.dtbo
+k3-am642-phyboard-electra-pcie-usb2-dtbs := \
+	k3-am642-phyboard-electra-rdk.dtb k3-am642-phyboard-electra-pcie-usb2.dtbo
 k3-am642-tqma64xxl-mbax4xxl-sdcard-dtbs := \
 	k3-am642-tqma64xxl-mbax4xxl.dtb k3-am64-tqma64xxl-mbax4xxl-sdcard.dtbo
 k3-am642-tqma64xxl-mbax4xxl-wlan-dtbs := \
diff --git a/arch/arm64/boot/dts/ti/k3-am642-phyboard-electra-pcie-usb2.dtso b/arch/arm64/boot/dts/ti/k3-am642-phyboard-electra-pcie-usb2.dtso
new file mode 100644
index 000000000000..7a5ce4bc02f3
--- /dev/null
+++ b/arch/arm64/boot/dts/ti/k3-am642-phyboard-electra-pcie-usb2.dtso
@@ -0,0 +1,87 @@
+// SPDX-License-Identifier: GPL-2.0-only OR MIT
+/*
+ * DT overlay for PCIe support (limits USB to 2.0/high-speed)
+ *
+ * Copyright (C) 2021 PHYTEC America, LLC - https://www.phytec.com
+ * Author: Matt McKee <mmckee@phytec.com>
+ *
+ * Copyright (C) 2024 PHYTEC America, LLC - https://www.phytec.com
+ * Author: Nathan Morrisson <nmorrisson@phytec.com>
+ */
+
+/dts-v1/;
+/plugin/;
+
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/phy/phy.h>
+#include <dt-bindings/phy/phy-cadence.h>
+
+#include "k3-pinctrl.h"
+#include "k3-serdes.h"
+
+&{/} {
+	pcie_refclk0: pcie-refclk0 {
+		compatible = "gpio-gate-clock";
+		pinctrl-names = "default";
+		pinctrl-0 = <&pcie_usb_sel_pins_default>;
+		clocks = <&serdes_refclk>;
+		#clock-cells = <0>;
+		enable-gpios = <&main_gpio1 7 GPIO_ACTIVE_HIGH>;
+	};
+};
+
+&main_pmx0 {
+	pcie_usb_sel_pins_default: pcie-usb-sel-default-pins {
+		pinctrl-single,pins = <
+			AM64X_IOPAD(0x017c, PIN_OUTPUT, 7)	/* (T1) PRG0_PRU0_GPO7.GPIO1_7 */
+		>;
+	};
+
+	pcie_pins_default: pcie-default-pins {
+		pinctrl-single,pins = <
+			AM64X_IOPAD(0x0098, PIN_OUTPUT, 7)	/* (W19) GPMC0_WAIT0.GPIO0_37 */
+		>;
+	};
+};
+
+&pcie0_rc {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pcie_pins_default>;
+	reset-gpios = <&main_gpio0 37 GPIO_ACTIVE_HIGH>;
+	phys = <&serdes0_pcie_usb_link>;
+	phy-names = "pcie-phy";
+	num-lanes = <1>;
+	status = "okay";
+};
+
+&serdes0_pcie_usb_link {
+	cdns,phy-type = <PHY_TYPE_PCIE>;
+};
+
+&serdes_ln_ctrl {
+	idle-states = <AM64_SERDES0_LANE0_PCIE0>;
+};
+
+&serdes0 {
+	assigned-clock-parents = <&pcie_refclk0>, <&pcie_refclk0>, <&pcie_refclk0>;
+};
+
+&serdes_refclk {
+	clock-frequency = <100000000>;
+};
+
+/*
+ * Assign pcie_refclk0 to serdes_wiz0 as ext_ref_clk.
+ * This makes sure that the clock generator gets enabled at the right time.
+ */
+&serdes_wiz0 {
+	clocks = <&k3_clks 162 0>, <&k3_clks 162 1>, <&pcie_refclk0>;
+};
+
+&usbss0 {
+	ti,usb2-only;
+};
+
+&usb0 {
+	maximum-speed = "high-speed";
+};
-- 
2.25.1