From nobody Mon Oct 6 03:14:00 2025 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.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 882F04A08 for ; Fri, 25 Jul 2025 05:02:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.180.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753419748; cv=none; b=nca+ByIr24ptsuGaS3dm25ixO/5WVzIQ68crybleRgEFdqK3cH35kz70U/few1i8k8k5ACYS8BDF5sTJLs7oyNXkFPuOIgqiKy6xOWEX7r43NV8kHW05i8nSrz78nhuPdU6ZKJsFFl4bTAJzfvBwNxsH85oJq0rAovbYpZAZuFw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753419748; c=relaxed/simple; bh=xyaX7sPRxbcvMbz8Gwmcp5himgrSC7gWCkflcU+evMk=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=PcEC6yUVqEuXPnbQ3OUpdOFNQ3WCRvTMIRn1vh+sATYE0Rb6oZDCJXBrl4lEpK41SXtj8A+AbLgxXygVaYf48fPYoPXzPcy5cfRfQB+NqiH0x492Jd2Zg+WktvFuJE9mKTpwF7vhrBK4+CUkextChwSCifS058ZL1qpYY0phCME= 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=IL9C0Sbm; arc=none smtp.client-ip=205.220.180.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="IL9C0Sbm" Received: from pps.filterd (m0279868.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 56OLrQgV004564 for ; Fri, 25 Jul 2025 05:02:25 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=Cucr9aIodQKI3p6Ea2Q4sx2QPPEF0oJx2o8 EAi6JqoU=; b=IL9C0Sbm3j2hvzwAjTvsqbF6TJt1b23BbiJrumtFgxYKWW7WaDM bWYfukSAepCAoRaCDDzqamiBz6tzBedIS7OQFuAkjx6E/s7ASxlAx7HfKeCFNEhu jWMszyl/L/Nf9QCKrjIPdYYiwWgKZxN1V3l/ovTXnaQ3XAXddaINrsewgTOzYLkN iy5qeTU0PNNBJyBEmG+RG/0HtPM/zj9rVl2PoQUHByP+Da8jByBi6l3dfewwdEls R/+ASv02QS1MQrT3MbOHPr2M2t9dzh7g509NTHUUjqlMyvhb/cSlAriEaPN78FVA p/D1bCJ98zxxVi+X1ELcJlnPxl1LlMPJNrw== Received: from mail-pf1-f198.google.com (mail-pf1-f198.google.com [209.85.210.198]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 483w538ub7-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Fri, 25 Jul 2025 05:02:25 +0000 (GMT) Received: by mail-pf1-f198.google.com with SMTP id d2e1a72fcca58-75494e5417bso1865453b3a.0 for ; Thu, 24 Jul 2025 22:02:25 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1753419744; x=1754024544; 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=Cucr9aIodQKI3p6Ea2Q4sx2QPPEF0oJx2o8EAi6JqoU=; b=aLMp3PVWlyWCvZV5X6CiifpXbyj39/z0rAQFwoEGzQGSb2IrCf4URMP2oZPlZK4FsY udK0vmd0mkvTMTvMhUAcj8xru9bUykfP7fRh9X1IwZAbIaLFzQ4E2+JHjGf4m48AMck/ VYTGol8JRvhXTNymtqayEeB8PQjaMHmyuFtFIClk5cXlVCIb9hWIKCc3N6KqCAva9Xxl KS3oevqOsQ15kT6rLMyPTjjpxl8pOoOtI9UeAy5pU+QLz3AO8PpcqQU8ibrWXfu2H/PH TX3oY8K1X4AGuazqC6UdurxfcXQZkS41BP4rq2rttSR0gDcYI096v9+3doQlccshLOK5 tR2g== X-Forwarded-Encrypted: i=1; AJvYcCVKonVjCDJCB2t03RIwmfYe6qtNEvw6pxorzzFwuxWknvPO/D7i/lxtHNqwI5DDkCs7FMZVDe3C1P2fF2E=@vger.kernel.org X-Gm-Message-State: AOJu0YxhqATbtSCBhi0RN4L8dF56tMf4KTCSEaHtGKby0/t9Re/ibcjT wPwA1YeXUtu/rCBJ7bP5379d21BERrkeGomuBv7iVl+AQEROVnnL4+glrU96ghZyxBJAqHalQ3U u/mUWxrBLbuUNbmDdRCxM+lFudi0W+kX0+1W62H/bGWZOsWh1dpP3kLdvjRx9xnngMqA= X-Gm-Gg: ASbGncvVcWGwxUcnFGctt0zbOHYsJUJlO8IhbIrPJEJgCznVs6YXfnLGLGBkpMJbD2S CHzOOSAcIju3XCUQxQ2mFgEe+UDDpjGeMyHE7yNjgwtDVFFT8+kdRS8UQrkI0fyKCjLoGltyxeM dquvo14N3xiggPagfPJZBLLXokcKL2NX7vwPmJlQNDoNr0GYFuEh4ZKuDnJOZgk6vPRuBhNgEzE HEXX4NKkupAPE+ABoDeiBmcmxHSdDxtI5fq6eRzJNQJ5n/lF9vkdbyPcmlYEYuCfaSV2Lt6pZZW HPxD4v/T84yXzzbsfrJPy6CVqJt+7P5ELChrl9hkGO5nxLUJKd5P50201t68YXlzuu5ur/OxtiU MXA== X-Received: by 2002:a05:6a00:2d95:b0:748:e289:6bc with SMTP id d2e1a72fcca58-7633227a158mr977818b3a.1.1753419743843; Thu, 24 Jul 2025 22:02:23 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGVX8kdGfAvKbG/ix1bcwXvv6YJurQ78PxM/uyH7DMmfCUl05Nd7oMW2HQlac9y+oXeRCZvkQ== X-Received: by 2002:a05:6a00:2d95:b0:748:e289:6bc with SMTP id d2e1a72fcca58-7633227a158mr977789b3a.1.1753419743316; Thu, 24 Jul 2025 22:02:23 -0700 (PDT) Received: from hu-kriskura-hyd.qualcomm.com ([202.46.22.19]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-761b0629cbasm2916604b3a.129.2025.07.24.22.02.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Jul 2025 22:02:22 -0700 (PDT) From: Krishna Kurapati To: Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , Conor Dooley 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 v2] arm64: dts: qcom: sc7280: Flatten primary usb controller node Date: Fri, 25 Jul 2025 10:32:16 +0530 Message-Id: <20250725050216.526327-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-Authority-Analysis: v=2.4 cv=AfKxH2XG c=1 sm=1 tr=0 ts=68830fe1 cx=c_pps a=m5Vt/hrsBiPMCU0y4gIsQw==:117 a=fChuTYTh2wq5r3m49p7fHw==:17 a=Wb1JkmetP80A:10 a=VwQbUJbxAAAA:8 a=EUspDBNiAAAA:8 a=F1BopdVJQ9INZIdvojUA:9 a=IoOABgeZipijB_acs4fv:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNzI1MDAzOSBTYWx0ZWRfXwxzAFo7w9yrG kxW09ieZiqr3yd/vgAvsInvvoyNffkNQk8G0g/OmTo2Y67xzWbsZ9tvBzVALqas5WEu3rAJZlQR lrcNUVJlQSJTz+62NzF4hd5DgGPc7n1FbG/4/03pYKbB12Zmlcb6+WWDetCv99cGp2FVxZmcUd+ ibXQSeEjxx3SyweQLWShzns70Js9D3QWZneGvkeE0nQ5HV7og03NRZujV6wh7R3OqwTxqjomLRD B+7vepb1GmzNEZwavxHvVB6JMj2pG7NLiCcAlULZxqEFakXKfFlujva4rbb3bADcFb8U0LWuP1B Rf9bzm4eMaWWRn50IFo51BB1qcRQpAT3uTu4pvH1xiQ6rF/A5d9+g+Qg3BE7hrW+z2Ve1HQKIVt YAYcoE1yYbizAcC9pXyuIv1rcBzR7lwqo+XEcct4DkFCc3xV9Va58ZKR83nFPxV7FRuSFEuA X-Proofpoint-GUID: iLF1plXpkS4_jdv-p0k-MN0eiHIqtD2Z X-Proofpoint-ORIG-GUID: iLF1plXpkS4_jdv-p0k-MN0eiHIqtD2Z 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-25_01,2025-07-24_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 phishscore=0 bulkscore=0 malwarescore=0 lowpriorityscore=0 adultscore=0 mlxscore=0 mlxlogscore=999 suspectscore=0 spamscore=0 impostorscore=0 clxscore=1015 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505280000 definitions=main-2507250039 Content-Type: text/plain; charset="utf-8" Flatten primary usb controller node and update to using latest bindings and flattened driver approach. Signed-off-by: Krishna Kurapati --- Link to RFC: https://lore.kernel.org/all/20250720072125.1514823-1-krishna.kurapati@oss.q= ualcomm.com/ Changes in v2: Fixed base address. .../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 | 59 ++++++++----------- .../boot/dts/qcom/sm7325-nothing-spacewar.dts | 6 +- 9 files changed, 42 insertions(+), 66 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..6fd502df9c7a 100644 --- a/arch/arm64/boot/dts/qcom/sc7280.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7280.dtsi @@ -4253,13 +4253,9 @@ compute-cb@14 { }; =20 usb_1: usb@a6f8800 { - compatible =3D "qcom,sc7280-dwc3", "qcom,dwc3"; - reg =3D <0 0x0a6f8800 0 0x400>; + 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 +4272,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 +4296,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