From nobody Sun Oct 5 23:45:02 2025 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) (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 285421AB52D for ; Mon, 28 Jul 2025 03:58:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.168.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753675103; cv=none; b=tAUKE4/xMfP6DVCA+OqWyAVcNJQQn7FoT6ULUIjCnHRZVSf9fQmt7Gen6VuuvbYEXQEarpy1pOB8Nx6ike3JNlGHTd2NHBlpUdmN4yvuHHyVm7qzLybNx5slmZe78Py1OLlBL25k66FjeK1+6ktfE+uSSOPrS7gjFvq1BXUS2CY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753675103; c=relaxed/simple; bh=Ej6/Hn+dFu5p/Yn/78OA+qJgtWDOEmZYCQaGRZjKC9k=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=Z+vYHiKMPW6FZFVHWtot2lnFLwuoh4TTvudGkAFwJdkFkuoj0gxJdD4FNzl5e8xpjLRAI991XJjs1qpsFJdNEzw/M574RTmDp13w8LiyJc8HESFnRIYrjlYEnxm2jq3GJiGNfk98buPcrx1qQtoPVAn1tlW0loapjamOSsL5F38= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com; spf=pass smtp.mailfrom=oss.qualcomm.com; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b=hpRxMg6p; arc=none smtp.client-ip=205.220.168.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b="hpRxMg6p" Received: from pps.filterd (m0279867.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 56RNdTsw003593 for ; Mon, 28 Jul 2025 03:58:21 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:date:from:message-id:mime-version :subject:to; s=qcppdkim1; bh=iY7bTL5QACvfY2kxIWT6SIlQBlkz7nRT42z 4/XX8V+Q=; b=hpRxMg6pk2ZZbz/sUTxtcVcFQ/O/KP+qmzFylqK+gjLY6a1/h3o mQ1x+08nhd4Dq2xVZObUNd14FkAQjRT6/oFj+6tj2/pnool4tavxGk3/EyM0Z9Re CdxT4/2jTu5WPiXo5ObUapzRTLChFvsBo/i29BhfEVou1BL+ISC0v+3anPKXEkPf /by33tZgbj+E7k8V113WFO9qn+mi6fllH0KUeCZqml78MbNvGuBm/xyj5il/IZOc 9dOvh+A9f8WDimTgTO3X4RgIBm4rLoa8n7aOwnSN68PS1dkMB6R30LvINUeZZaFO 7mML8QRmgyjmwS4ZMjZTZ5CtxFGpvj+xq5A== Received: from mail-pg1-f200.google.com (mail-pg1-f200.google.com [209.85.215.200]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 485v1x8fs5-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Mon, 28 Jul 2025 03:58:21 +0000 (GMT) Received: by mail-pg1-f200.google.com with SMTP id 41be03b00d2f7-b38ec062983so2783233a12.3 for ; Sun, 27 Jul 2025 20:58:21 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1753675100; x=1754279900; 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=iY7bTL5QACvfY2kxIWT6SIlQBlkz7nRT42z4/XX8V+Q=; b=VgvRt1QusUZzj0otbvGhzrRrrolbCpN/+UvAmuw36HFljSmlTeA7LnqWnE2O7N0osA wQL0uV+WukPqlg1PC656gJyhp2691s2YjJv9FYFS5aWcjEOkXeWUlqry3nQJC7vUruDq +f2oeZAfGxf7hAGw7E1EfTy6zbxVISfzS503ij86enfp+2f0f7Svcz51ahW3teTw67l8 jbybDsgpdeM6/zsbSG1T0jX33VJV70QwLvfL+PufTdYuygbtThGTvfa+TwPe9Z0RaW4f Ely7UqKaWXuy+knZ0TzSPhRQ3uadS6h7AINsk0pb6ijCSf3YSpvHRQiiDVDNCj3csPT/ 753w== X-Forwarded-Encrypted: i=1; AJvYcCWZf+NsxWQ96CbTZsBGBbi/33M1KRabZF+TxU8Mu2gNk7mGaE/FrdLdbWYGeulsYCuwsrtAP8E23smPEjA=@vger.kernel.org X-Gm-Message-State: AOJu0YzTIv+TCQsz/I47mwjeRBuKPQXaURa+dH6uAe//sUx3+NzSXwNd PryanY45o+3PpiAM0XEY4CGZBHtX/UG8jyoRchoWFpXCfn5jKdFVcw3l4aEgWv3QjTJkbdP3lwP 0WelscZl65orBxRJFeYFam+1Ge8puCHcrBz9JuYLMprEcAT+D90COOBRP1sv5ca+Zu+Q= X-Gm-Gg: ASbGnctfVPcx+wZokhtw4TmoCT2xEvCw637nJbFIOcyI84xybg1wD/KYzDuB6jZ3FXL sCB2T7eP2Wg9EVyx2Av4qOlEOy5S2Xr9bnH/bsHz+YT7Ms2iKQvnW8QPQ7ps9BxK2IJIkGDe+GF Z7jVdHBbkIJ0nvjU4MeMoS3eNcqBlsWkParFqlk7xuOx8gSAltdUSDClOI+fHXEWUYC1xJo800q KGb0iM4JXjImrOxqd587dBB37PCEBpeer4RhSKlfaNA+tmlQYGGQKfLQ20ucL8xeZ5RIpbjBBEF oVl1v54+lbPMpKIe5qzs236W3p0/gSDMm2E2KZjTpUzpW8X90FnTOXh1x3K7H1ivEuwAbmCcT/a iog== X-Received: by 2002:a05:6a20:9187:b0:234:10b7:f0ae with SMTP id adf61e73a8af0-23d701899a2mr18530767637.35.1753675100228; Sun, 27 Jul 2025 20:58:20 -0700 (PDT) X-Google-Smtp-Source: AGHT+IERMdKqXTnrzWgb+0vXhBc4oT7OKMgeCAgen3c1SexlRH+N3LpLutoekZazfyk03ulD0j6B6A== X-Received: by 2002:a05:6a20:9187:b0:234:10b7:f0ae with SMTP id adf61e73a8af0-23d701899a2mr18530733637.35.1753675099679; Sun, 27 Jul 2025 20:58:19 -0700 (PDT) Received: from hu-kriskura-hyd.qualcomm.com ([202.46.22.19]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-31e8d2abea1sm4141607a91.19.2025.07.27.20.58.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 27 Jul 2025 20:58:19 -0700 (PDT) From: Krishna Kurapati To: Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Dmitry Baryshkov Cc: cros-qcom-dts-watchers@chromium.org, linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Krishna Kurapati Subject: [PATCH v3] arm64: dts: qcom: sc7280: Flatten usb controller nodes Date: Mon, 28 Jul 2025 09:28:12 +0530 Message-Id: <20250728035812.2762957-1-krishna.kurapati@oss.qualcomm.com> X-Mailer: git-send-email 2.34.1 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 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNzI4MDAyOCBTYWx0ZWRfX1YMxsn9CgIjI M6X0M8qss0WT0Y4dDbPVdoFyAdlodqB+1lCoRvEQXqeEpT5tG/VONEbj7Pd4DAZ4Z5G70nuxerc UwumhK0v4rFlJRGOrlN9cKBgEZDiho2g67v0zgPpBdfpCrP0/tsZbDQcLOtYRzPJBk6GZI+UD17 BK/Mox3to7pZSoDA2Ush1Z8me+sKqSIxZ88lvK1TIkT7TTT8661cxprSVMlnGIc/lhuaNz2z+QG JlG4zh5bcevvyvXp0sGP7WK0ts3RwDLw4fhO1c2SOv6DUu5DR8Lv4wTPhoH4u8GBg1akENAYjm9 8BdSl1dzviNIlNyErU5zhgHgls290uco0DuGE9Aj4bR/yP5jliDFCz4RZcWBMmFrQm2umMUIWLN QBm6LzVsIYg7F5ZuwTXEIpBi0PRJfStd2pYateqyCuGglP710uLGF5ODIHlwuBFlXMg9IJSH X-Authority-Analysis: v=2.4 cv=JKw7s9Kb c=1 sm=1 tr=0 ts=6886f55d cx=c_pps a=oF/VQ+ItUULfLr/lQ2/icg==:117 a=fChuTYTh2wq5r3m49p7fHw==:17 a=Wb1JkmetP80A:10 a=VwQbUJbxAAAA:8 a=EUspDBNiAAAA:8 a=B4eZWCRmW58KndMlcVcA:9 a=3WC7DwWrALyhR5TkjVHa:22 X-Proofpoint-ORIG-GUID: gOhcha0FDAqwaprBMcZe-fthpdAGPNKT X-Proofpoint-GUID: gOhcha0FDAqwaprBMcZe-fthpdAGPNKT X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.1.9,FMLib:17.12.80.40 definitions=2025-07-28_02,2025-07-24_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 mlxscore=0 priorityscore=1501 spamscore=0 suspectscore=0 phishscore=0 lowpriorityscore=0 bulkscore=0 malwarescore=0 clxscore=1015 mlxlogscore=999 adultscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505280000 definitions=main-2507280028 Content-Type: text/plain; charset="utf-8" Flatten usb controller nodes and update to using latest bindings and flattened driver approach. Signed-off-by: Krishna Kurapati Reviewed-by: Dmitry Baryshkov Reviewed-by: Konrad Dybcio Tested-by: Konrad Dybcio # FP5 --- This patch has only been compile tested. Changes in v3: Fixed dt labels as pointed by Dmitry. Fixed DTBS warning pointed by Rob's bot in v2. Flattened second controller as well. Link to v2: https://lore.kernel.org/all/20250725050216.526327-1-krishna.kurapati@oss.qu= alcomm.com/ Changes in v2: Fixed reg base address Link to RFC: https://lore.kernel.org/all/20250720072125.1514823-1-krishna.kurapati@oss.q= ualcomm.com/ .../boot/dts/qcom/qcm6490-fairphone-fp5.dts | 6 +- arch/arm64/boot/dts/qcom/qcm6490-idp.dts | 7 +- .../boot/dts/qcom/qcm6490-shift-otter.dts | 6 +- arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts | 6 +- .../arm64/boot/dts/qcom/sc7280-herobrine.dtsi | 6 +- arch/arm64/boot/dts/qcom/sc7280-idp.dts | 6 +- arch/arm64/boot/dts/qcom/sc7280-idp.dtsi | 6 +- arch/arm64/boot/dts/qcom/sc7280.dtsi | 106 ++++++++---------- .../boot/dts/qcom/sm7325-nothing-spacewar.dts | 6 +- 9 files changed, 62 insertions(+), 93 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/qcm6490-fairphone-fp5.dts b/arch/arm6= 4/boot/dts/qcom/qcm6490-fairphone-fp5.dts index e115b6a52b29..f17ac3dc9b06 100644 --- a/arch/arm64/boot/dts/qcom/qcm6490-fairphone-fp5.dts +++ b/arch/arm64/boot/dts/qcom/qcm6490-fairphone-fp5.dts @@ -1364,12 +1364,10 @@ &ufs_mem_phy { }; =20 &usb_1 { - status =3D "okay"; -}; - -&usb_1_dwc3 { dr_mode =3D "otg"; usb-role-switch; + + status =3D "okay"; }; =20 &usb_1_dwc3_hs { diff --git a/arch/arm64/boot/dts/qcom/qcm6490-idp.dts b/arch/arm64/boot/dts= /qcom/qcm6490-idp.dts index 7a155ef6492e..8ed6e28b0c29 100644 --- a/arch/arm64/boot/dts/qcom/qcm6490-idp.dts +++ b/arch/arm64/boot/dts/qcom/qcm6490-idp.dts @@ -751,12 +751,9 @@ &ufs_mem_phy { }; =20 &usb_1 { - status =3D "okay"; -}; - -&usb_1_dwc3 { - /delete-property/ usb-role-switch; dr_mode =3D "peripheral"; + + status =3D "okay"; }; =20 &usb_1_hsphy { diff --git a/arch/arm64/boot/dts/qcom/qcm6490-shift-otter.dts b/arch/arm64/= boot/dts/qcom/qcm6490-shift-otter.dts index b9a0f7ac4d9c..eb8efba1b9dd 100644 --- a/arch/arm64/boot/dts/qcom/qcm6490-shift-otter.dts +++ b/arch/arm64/boot/dts/qcom/qcm6490-shift-otter.dts @@ -910,12 +910,10 @@ &ufs_mem_phy { }; =20 &usb_1 { - status =3D "okay"; -}; - -&usb_1_dwc3 { dr_mode =3D "otg"; usb-role-switch; + + status =3D "okay"; }; =20 &usb_1_dwc3_hs { diff --git a/arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts b/arch/arm64/boot= /dts/qcom/qcs6490-rb3gen2.dts index 5fbcd48f2e2d..01f0b460305c 100644 --- a/arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts +++ b/arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts @@ -1127,12 +1127,10 @@ bluetooth: bluetooth { }; =20 &usb_1 { - status =3D "okay"; -}; - -&usb_1_dwc3 { dr_mode =3D "otg"; usb-role-switch; + + status =3D "okay"; }; =20 &usb_1_dwc3_hs { diff --git a/arch/arm64/boot/dts/qcom/sc7280-herobrine.dtsi b/arch/arm64/bo= ot/dts/qcom/sc7280-herobrine.dtsi index 2ba4ea60cb14..5c5e4f1dd221 100644 --- a/arch/arm64/boot/dts/qcom/sc7280-herobrine.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7280-herobrine.dtsi @@ -621,15 +621,13 @@ CROS_STD_MAIN_KEYMAP }; =20 &usb_1 { - status =3D "okay"; -}; - -&usb_1_dwc3 { dr_mode =3D "host"; =20 #address-cells =3D <1>; #size-cells =3D <0>; =20 + status =3D "okay"; + /* 2.x hub on port 1 */ usb_hub_2_x: hub@1 { compatible =3D "usbbda,5411"; diff --git a/arch/arm64/boot/dts/qcom/sc7280-idp.dts b/arch/arm64/boot/dts/= qcom/sc7280-idp.dts index b5fe7356be48..3103f94cd685 100644 --- a/arch/arm64/boot/dts/qcom/sc7280-idp.dts +++ b/arch/arm64/boot/dts/qcom/sc7280-idp.dts @@ -81,11 +81,9 @@ channel@403 { }; =20 &usb_2 { - status =3D "okay"; -}; - -&usb_2_dwc3 { dr_mode =3D "otg"; + + status =3D "okay"; }; =20 &usb_2_hsphy { diff --git a/arch/arm64/boot/dts/qcom/sc7280-idp.dtsi b/arch/arm64/boot/dts= /qcom/sc7280-idp.dtsi index 90e5b9ab5b84..ccd39a1baeda 100644 --- a/arch/arm64/boot/dts/qcom/sc7280-idp.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7280-idp.dtsi @@ -520,11 +520,9 @@ &ufs_mem_phy { }; =20 &usb_1 { - status =3D "okay"; -}; - -&usb_1_dwc3 { dr_mode =3D "host"; + + status =3D "okay"; }; =20 &usb_1_hsphy { diff --git a/arch/arm64/boot/dts/qcom/sc7280.dtsi b/arch/arm64/boot/dts/qco= m/sc7280.dtsi index 64a2abd30100..0fa8d34999a3 100644 --- a/arch/arm64/boot/dts/qcom/sc7280.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7280.dtsi @@ -3711,14 +3711,10 @@ usb_dp_qmpphy_dp_in: endpoint { }; }; =20 - usb_2: usb@8cf8800 { - compatible =3D "qcom,sc7280-dwc3", "qcom,dwc3"; - reg =3D <0 0x08cf8800 0 0x400>; + usb_2: usb@8c00000 { + compatible =3D "qcom,sc7280-dwc3", "qcom,snps-dwc3"; + reg =3D <0 0x08c00000 0 0xfc100>; status =3D "disabled"; - #address-cells =3D <2>; - #size-cells =3D <2>; - ranges; - dma-ranges; =20 clocks =3D <&gcc GCC_CFG_NOC_USB3_SEC_AXI_CLK>, <&gcc GCC_USB30_SEC_MASTER_CLK>, @@ -3735,11 +3731,13 @@ usb_2: usb@8cf8800 { <&gcc GCC_USB30_SEC_MASTER_CLK>; assigned-clock-rates =3D <19200000>, <200000000>; =20 - interrupts-extended =3D <&intc GIC_SPI 241 IRQ_TYPE_LEVEL_HIGH>, + interrupts-extended =3D <&intc GIC_SPI 242 IRQ_TYPE_LEVEL_HIGH>, + <&intc GIC_SPI 241 IRQ_TYPE_LEVEL_HIGH>, <&intc GIC_SPI 240 IRQ_TYPE_LEVEL_HIGH>, <&pdc 12 IRQ_TYPE_EDGE_BOTH>, <&pdc 13 IRQ_TYPE_EDGE_BOTH>; - interrupt-names =3D "pwr_event", + interrupt-names =3D "dwc_usb3", + "pwr_event", "hs_phy_irq", "dp_hs_phy_irq", "dm_hs_phy_irq"; @@ -3753,24 +3751,19 @@ usb_2: usb@8cf8800 { <&gem_noc MASTER_APPSS_PROC 0 &cnoc2 SLAVE_USB2 0>; interconnect-names =3D "usb-ddr", "apps-usb"; =20 - usb_2_dwc3: usb@8c00000 { - compatible =3D "snps,dwc3"; - reg =3D <0 0x08c00000 0 0xe000>; - interrupts =3D ; - iommus =3D <&apps_smmu 0xa0 0x0>; - snps,dis_u2_susphy_quirk; - snps,dis_enblslpm_quirk; - snps,dis-u1-entry-quirk; - snps,dis-u2-entry-quirk; - phys =3D <&usb_2_hsphy>; - phy-names =3D "usb2-phy"; - maximum-speed =3D "high-speed"; - usb-role-switch; + iommus =3D <&apps_smmu 0xa0 0x0>; + snps,dis_u2_susphy_quirk; + snps,dis_enblslpm_quirk; + snps,dis-u1-entry-quirk; + snps,dis-u2-entry-quirk; + phys =3D <&usb_2_hsphy>; + phy-names =3D "usb2-phy"; + maximum-speed =3D "high-speed"; + usb-role-switch; =20 - port { - usb2_role_switch: endpoint { - remote-endpoint =3D <&eud_ep>; - }; + port { + usb2_role_switch: endpoint { + remote-endpoint =3D <&eud_ep>; }; }; }; @@ -4252,14 +4245,10 @@ compute-cb@14 { }; }; =20 - usb_1: usb@a6f8800 { - compatible =3D "qcom,sc7280-dwc3", "qcom,dwc3"; - reg =3D <0 0x0a6f8800 0 0x400>; + usb_1: usb@a600000 { + compatible =3D "qcom,sc7280-dwc3", "qcom,snps-dwc3"; + reg =3D <0 0x0a600000 0 0xfc100>; status =3D "disabled"; - #address-cells =3D <2>; - #size-cells =3D <2>; - ranges; - dma-ranges; =20 clocks =3D <&gcc GCC_CFG_NOC_USB3_PRIM_AXI_CLK>, <&gcc GCC_USB30_PRIM_MASTER_CLK>, @@ -4276,12 +4265,14 @@ usb_1: usb@a6f8800 { <&gcc GCC_USB30_PRIM_MASTER_CLK>; assigned-clock-rates =3D <19200000>, <200000000>; =20 - interrupts-extended =3D <&intc GIC_SPI 130 IRQ_TYPE_LEVEL_HIGH>, + interrupts-extended =3D <&intc GIC_SPI 133 IRQ_TYPE_LEVEL_HIGH>, + <&intc GIC_SPI 130 IRQ_TYPE_LEVEL_HIGH>, <&intc GIC_SPI 131 IRQ_TYPE_LEVEL_HIGH>, <&pdc 14 IRQ_TYPE_EDGE_BOTH>, <&pdc 15 IRQ_TYPE_EDGE_BOTH>, <&pdc 17 IRQ_TYPE_LEVEL_HIGH>; - interrupt-names =3D "pwr_event", + interrupt-names =3D "dwc_usb3", + "pwr_event", "hs_phy_irq", "dp_hs_phy_irq", "dm_hs_phy_irq", @@ -4298,37 +4289,32 @@ usb_1: usb@a6f8800 { =20 wakeup-source; =20 - usb_1_dwc3: usb@a600000 { - compatible =3D "snps,dwc3"; - reg =3D <0 0x0a600000 0 0xe000>; - interrupts =3D ; - iommus =3D <&apps_smmu 0xe0 0x0>; - snps,dis_u2_susphy_quirk; - snps,dis_enblslpm_quirk; - snps,parkmode-disable-ss-quirk; - snps,dis-u1-entry-quirk; - snps,dis-u2-entry-quirk; - phys =3D <&usb_1_hsphy>, <&usb_1_qmpphy QMP_USB43DP_USB3_PHY>; - phy-names =3D "usb2-phy", "usb3-phy"; - maximum-speed =3D "super-speed"; + iommus =3D <&apps_smmu 0xe0 0x0>; + snps,dis_u2_susphy_quirk; + snps,dis_enblslpm_quirk; + snps,parkmode-disable-ss-quirk; + snps,dis-u1-entry-quirk; + snps,dis-u2-entry-quirk; + phys =3D <&usb_1_hsphy>, <&usb_1_qmpphy QMP_USB43DP_USB3_PHY>; + phy-names =3D "usb2-phy", "usb3-phy"; + maximum-speed =3D "super-speed"; =20 - ports { - #address-cells =3D <1>; - #size-cells =3D <0>; + ports { + #address-cells =3D <1>; + #size-cells =3D <0>; =20 - port@0 { - reg =3D <0>; + port@0 { + reg =3D <0>; =20 - usb_1_dwc3_hs: endpoint { - }; + usb_1_dwc3_hs: endpoint { }; + }; =20 - port@1 { - reg =3D <1>; + port@1 { + reg =3D <1>; =20 - usb_1_dwc3_ss: endpoint { - remote-endpoint =3D <&usb_dp_qmpphy_usb_ss_in>; - }; + usb_1_dwc3_ss: endpoint { + remote-endpoint =3D <&usb_dp_qmpphy_usb_ss_in>; }; }; }; diff --git a/arch/arm64/boot/dts/qcom/sm7325-nothing-spacewar.dts b/arch/ar= m64/boot/dts/qcom/sm7325-nothing-spacewar.dts index befbb40228b5..f16b47b6a74c 100644 --- a/arch/arm64/boot/dts/qcom/sm7325-nothing-spacewar.dts +++ b/arch/arm64/boot/dts/qcom/sm7325-nothing-spacewar.dts @@ -1425,16 +1425,14 @@ &ufs_mem_phy { &usb_1 { /* USB 2.0 only */ qcom,select-utmi-as-pipe-clk; - status =3D "okay"; -}; - -&usb_1_dwc3 { dr_mode =3D "otg"; usb-role-switch; maximum-speed =3D "high-speed"; /* Remove USB3 phy */ phys =3D <&usb_1_hsphy>; phy-names =3D "usb2-phy"; + + status =3D "okay"; }; =20 &usb_1_dwc3_hs { --=20 2.34.1