From mboxrd@z Thu Jan 1 00:00:00 1970 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 C33033446B9 for ; Thu, 11 Jun 2026 05:00:48 +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=1781154061; cv=none; b=k6mmtDixemp4KVDFN2H8WPzOJuWOEXxgQxFpB18IvxpM9mvzIAXW0j2cbNQ2RkS4ZXKeq56tueQyoFEM7RI/pBO77ITbg0qJgZWWCjSlGGvPIz3GQ1jjtrmLd2zWSVlvW+Qgen83As848IkcX7B9wmRr+a4Qn8RdspUX5XV3j2o= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781154061; c=relaxed/simple; bh=mUskJ8SNq079LmNHg6tuDsqQTYd8lGSyihEzvrPy8dY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=XnM500PD4YKBn6ijExqrYcnJekj8RvHmvZb4c3lHV0lU6e5ycbRgSv392zCQ1HJxm0neutSUU7hHuQD7GGrjOy5FQ9dcQpvhO6zp4fihqMwsA40w3BuxWFS8Lt5BB/RC8lalEeaX1uWCRD7qP4Lnxl2F/v/kle9tGq9q6Q33CDg= 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=KYq8bO8H; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=dquY3Gmf; 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="KYq8bO8H"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="dquY3Gmf" Received: from pps.filterd (m0279866.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 65B0O7xR3184393 for ; Thu, 11 Jun 2026 05:00:48 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= xQmMmpwIPQvIOq+S8oQSzNrPYjyqFaWUA0KmsRaonZM=; b=KYq8bO8HOSCsqDj/ KO3KSDmlBODzOyWest/xhIPQbD33qxs9E7BPTrFJDtHbdXljJJNk4J2UeGRViv7U Hygq5NP7Qgz/iSGNFPQ7NcRjRXmdOyVVeidfJFUa1vxTe9PrqlFzWbtySX8v/z36 92FoDt7aSJ+TfHKFWv6agZTcE5MSDmAfmNmzGJJtVJuurnp2BPf4UgwtkFqZXeiH ILi0aqPsrqSYklCDPJ4M+/1jSsknCG17sq2hOJYbUamwXe2V5P79PM6zDVCkLdun y104Lp2yzEbmO0VVG8tVJxJKDhsL08qeoDvEmuevYyUxeAuk6hRWL/6rhZh1PxJ7 lsf7Gw== Received: from mail-pl1-f200.google.com (mail-pl1-f200.google.com [209.85.214.200]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4eqe6u1nq6-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Thu, 11 Jun 2026 05:00:47 +0000 (GMT) Received: by mail-pl1-f200.google.com with SMTP id d9443c01a7336-2c0a99db8dfso80886085ad.3 for ; Wed, 10 Jun 2026 22:00:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1781154047; x=1781758847; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=xQmMmpwIPQvIOq+S8oQSzNrPYjyqFaWUA0KmsRaonZM=; b=dquY3GmflPJWSCgnJPtP2zYFdxDE4NM4oTmzEIOOeni4gUGdC4RuPvkVljoCSRrC/f 9zAuXg3KafwC5x25vaM+lCKJK/Gy14/4j+aoAnwCCH6TJtyGUQxXipgulScSXTsA/mYQ X8Og3JWu8qUnhMvS+zBOwhb6vTrEuaDYtNbb1nSSK6DMktRNax8jMLaYnD+iTQgTNUz2 Vcb00vNc7eOUDpcSpJAGc+f5INgCIn6jHULMQTd6XeeF+Din48iY8PU28wYlcDE9kL3T onaaSYgYJxtgnCJlUBj0H19WobUdE/Izrk9Vye+ODIgXZWPOwtSgFGEYQnzjLzqkdqpD wFSQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781154047; x=1781758847; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=xQmMmpwIPQvIOq+S8oQSzNrPYjyqFaWUA0KmsRaonZM=; b=R0SnJGFV9I203ysAiTliLSL3gFJjp6XunCdXF0ixHMJI5Jjc5ePBLYAWreLVWaRsII ypwBbJFoK1IX2aLM5uJN6GlD0mkXw5wOhgkjJiUth88WPP9EOSpwfsCFYnBYw3/VdW7d QNm+0Kd1Gdq+Qr3u05M/BzUuHlW5wsYTIdekFNMJOivu98EHqGnrc1Nn5bo8FtF0OHyJ 8ZezeObgZ7oKHs5qrNoWLgOGtW/TLIogxF/2G7AqNEd4iyhybjxlNZLItFAAu6pOMieQ oHCcr/12h/XGMfSEvWT5OAz9rv16jBicgqZW6SvUMv3iYvgBKQDN7pEg1XCyTGniN4id 4Trg== X-Forwarded-Encrypted: i=1; AFNElJ/LkUTaqnjHogGjuIiNkeRPDywzyTSboBVECR7uWZKv6p8dKma9v7VDLwbptY9PSp4Zy5eL/3xIFeFmeXo=@vger.kernel.org X-Gm-Message-State: AOJu0YzBBps+h+Sz0sPoscRAsPtFyYNM7tL4dWVOIeYXbCU4pSoGSBc1 bOTMCdCpMY8fXRlFh3GoW3b6Bfwfq5pIOUMo8m60i2Dq9EW6gQ1FegrKG9aQ2VPqm65GPA7wNVI frOS6cSqkwOhfH4a0A/KOw6OmD9ApogSHUio5Z2dUhKw2oTIMZGYCHJScw8Sn7/pZ6vo= X-Gm-Gg: Acq92OEALzWywRTDhbMCyDRgKv9tzmOC2RXPnWBWHpJ9y/azhgLql/w1fztec6ge1Ci x134pGBphnR6z5k6WYkEjpQvLulbxiDTX1rKHpA9XYSWdwnaQ9B1+JugaRdvuhcYYu0e34uXtRv CdM5y+q+84zgMJNkF4qqx7/eGywRf3GZS85cdZ/2Pk9MjDY4aaEEhop/FwFp8pBwjNLSrzPLtta EljtX3CfospZyRyynhsWEVwDD8yLcBbmvhyy2DYF+af5M3yVs/9f29pG0sChXmUGrkLr4a+VyzO 9V4C76jPvxn3P2iuLOmW7uDSFYuEUQGKN2VpNNa7dcVceqPCgdlEuQlTu1I+nLNZBS2aiZmuEUl FMRfxDPL2bayGcGu1wZ0Hf/G/GK1jRBcep+pmuN3oYurkkIYTRnBegm/B7jw69iTmmP4= X-Received: by 2002:a17:902:d4c7:b0:2bc:b80f:677e with SMTP id d9443c01a7336-2c2f24a1843mr11523825ad.25.1781154042219; Wed, 10 Jun 2026 22:00:42 -0700 (PDT) X-Received: by 2002:a17:902:d4c7:b0:2bc:b80f:677e with SMTP id d9443c01a7336-2c2f24a1843mr11523415ad.25.1781154041664; Wed, 10 Jun 2026 22:00:41 -0700 (PDT) Received: from hu-krichai-hyd.qualcomm.com ([202.46.23.25]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2c164f8bc5asm276188335ad.27.2026.06.10.22.00.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Jun 2026 22:00:41 -0700 (PDT) From: Krishna Chaitanya Chundru Date: Thu, 11 Jun 2026 10:29:03 +0530 Subject: [PATCH v2 27/37] arm64: dts: qcom: sc8280xp: Move PCIe phy and GPIOs to root port node Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260611-wake-v2-27-2744251b1181@oss.qualcomm.com> References: <20260611-wake-v2-0-2744251b1181@oss.qualcomm.com> In-Reply-To: <20260611-wake-v2-0-2744251b1181@oss.qualcomm.com> To: Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , cros-qcom-dts-watchers@chromium.org, Conor Dooley Cc: linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Krishna Chaitanya Chundru , Krishna Chaitanya Chundru X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1781153928; l=11032; i=krishna.chundru@oss.qualcomm.com; s=20230907; h=from:subject:message-id; bh=mUskJ8SNq079LmNHg6tuDsqQTYd8lGSyihEzvrPy8dY=; b=fFDsuKVpLhciftRUNpJi7oTKzck93kHrkr0eGmuL6mVrCRPymMbG4OJ9xmSkxYHpj3OAp1HK5 0/F4Y1Vwoj0DM5ySm7zQSifRr2oTk7gWDFDCke+BY7NQbFvIPx8P4+m X-Developer-Key: i=krishna.chundru@oss.qualcomm.com; a=ed25519; pk=10CL2pdAKFyzyOHbfSWHCD0X0my7CXxj8gJScmn1FAg= X-Proofpoint-GUID: YRyn1SQ77AqGbWPuszq9Ni4cGWz98zEe X-Proofpoint-Spam-Info: AW1haW4tMjYwNjExMDA0NiBTYWx0ZWRfX1uOeYYFPxNPf eirAXz3tbZnKdseLfdsoVuR5O9hUSS39Sunai45qi73e7b7zyh+O5wa+UZ4BvWIg3gT8txtUYmZ xBzu8J6/fsIYm6PrtJ9zzi3PFXcWz9M= X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNjExMDA0NiBTYWx0ZWRfX824Hh5ad1I9C PKMe++XMEoMNPXf8Zu4pXOJV5fl8Vne417hQTICUAX2oqYMJnCBpyF7rR1ttflXaAt7soLDbh6j ZGVgfyko6YAQwryKSRrUA9pb2dkqQ8QQiMeSduq+D/k973SySfTrxifmyQZUgtRz95h08Iu67Vn SU6eToimhMdIqRVuQSCul11rX4fPJ5LHpDohyN0akRFcO+/Jw/OeVqmEBVG24XwL1D5qEsTU1f2 7t7nsPNGaerZ7jBzRv8WHWMLMmgVtMj3rMg7jH/kTtNqqHAQqxgh1tqhwqG+FVXutEFfNLBb5iL NR6bzZGzo9dLKw90OcCYTJrI6m1b7zvevwW/LYR0C60bc7IqtwCjq01qlRS6jAzuljs8uRMf5i+ G8VFgsmiW68qV+unDSsXTlTwL1+N+yXagPMEq0em7qI6+TTcVwPSc287x1wsUg+ENvDNHn/0by7 I06G1skFwN6H2lxCCNw== X-Authority-Analysis: v=2.4 cv=F5lnsKhN c=1 sm=1 tr=0 ts=6a2a40ff cx=c_pps a=IZJwPbhc+fLeJZngyXXI0A==:117 a=ZePRamnt/+rB5gQjfz0u9A==:17 a=IkcTkHD0fZMA:10 a=FelO9ux0wxsA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=YMgV9FUhrdKAYTUUvYB2:22 a=EUspDBNiAAAA:8 a=xdgaKNo_m9sR3IVs-GIA:9 a=QEXdDO2ut3YA:10 a=uG9DUKGECoFWVXl0Dc02:22 X-Proofpoint-ORIG-GUID: YRyn1SQ77AqGbWPuszq9Ni4cGWz98zEe X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.125,FMLib:17.12.100.49 definitions=2026-06-11_01,2026-06-09_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 malwarescore=0 clxscore=1015 adultscore=0 bulkscore=0 suspectscore=0 impostorscore=0 priorityscore=1501 spamscore=0 phishscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606040000 definitions=main-2606110046 The PCIe phy reference and the perst/wake GPIO properties are per root port and belong in the root port node (pcie@0), not in the RC controller node. Move phys and phy-names from the controller to the existing pcie2a_port0, pcie2b_port0, pcie3a_port0, pcie3b_port0, and pcie4_port0 nodes. Move perst-gpios/wake-gpios from the controller overrides to the respective port nodes in the board files, renaming perst-gpios to reset-gpios to match the binding used in the root port context. Signed-off-by: Krishna Chaitanya Chundru --- arch/arm64/boot/dts/qcom/sc8280xp-crd.dts | 24 +++++++++++++-------- .../boot/dts/qcom/sc8280xp-huawei-gaokun3.dts | 14 ++++++------ .../dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts | 22 +++++++++++-------- .../boot/dts/qcom/sc8280xp-microsoft-arcata.dts | 22 +++++++++++-------- .../boot/dts/qcom/sc8280xp-microsoft-blackrock.dts | 14 ++++++------ arch/arm64/boot/dts/qcom/sc8280xp.dtsi | 25 +++++++++------------- 6 files changed, 67 insertions(+), 54 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts b/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts index c53e00cae465..4c2700e9b00d 100644 --- a/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts +++ b/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts @@ -628,9 +628,6 @@ keyboard@68 { }; &pcie2a { - perst-gpios = <&tlmm 143 GPIO_ACTIVE_LOW>; - wake-gpios = <&tlmm 145 GPIO_ACTIVE_LOW>; - vddpe-3v3-supply = <&vreg_nvme>; pinctrl-names = "default"; @@ -639,6 +636,11 @@ &pcie2a { status = "okay"; }; +&pcie2a_port0 { + reset-gpios = <&tlmm 143 GPIO_ACTIVE_LOW>; + wake-gpios = <&tlmm 145 GPIO_ACTIVE_LOW>; +}; + &pcie2a_phy { vdda-phy-supply = <&vreg_l6d>; vdda-pll-supply = <&vreg_l4d>; @@ -647,9 +649,6 @@ &pcie2a_phy { }; &pcie3a { - perst-gpios = <&tlmm 151 GPIO_ACTIVE_LOW>; - wake-gpios = <&tlmm 148 GPIO_ACTIVE_LOW>; - vddpe-3v3-supply = <&vreg_wwan>; pinctrl-names = "default"; @@ -658,6 +657,11 @@ &pcie3a { status = "okay"; }; +&pcie3a_port0 { + reset-gpios = <&tlmm 151 GPIO_ACTIVE_LOW>; + wake-gpios = <&tlmm 148 GPIO_ACTIVE_LOW>; +}; + &pcie3a_phy { vdda-phy-supply = <&vreg_l6d>; vdda-pll-supply = <&vreg_l4d>; @@ -668,9 +672,6 @@ &pcie3a_phy { &pcie4 { max-link-speed = <2>; - perst-gpios = <&tlmm 141 GPIO_ACTIVE_LOW>; - wake-gpios = <&tlmm 139 GPIO_ACTIVE_LOW>; - vddpe-3v3-supply = <&vreg_wlan>; pinctrl-names = "default"; @@ -679,6 +680,11 @@ &pcie4 { status = "okay"; }; +&pcie4_port0 { + reset-gpios = <&tlmm 141 GPIO_ACTIVE_LOW>; + wake-gpios = <&tlmm 139 GPIO_ACTIVE_LOW>; +}; + &pcie4_phy { vdda-phy-supply = <&vreg_l6d>; vdda-pll-supply = <&vreg_l4d>; diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-huawei-gaokun3.dts b/arch/arm64/boot/dts/qcom/sc8280xp-huawei-gaokun3.dts index 9819454abe13..1aba18ae301d 100644 --- a/arch/arm64/boot/dts/qcom/sc8280xp-huawei-gaokun3.dts +++ b/arch/arm64/boot/dts/qcom/sc8280xp-huawei-gaokun3.dts @@ -739,9 +739,6 @@ &mdss0_dp1_out { }; &pcie2a { - perst-gpios = <&tlmm 143 GPIO_ACTIVE_LOW>; - wake-gpios = <&tlmm 145 GPIO_ACTIVE_LOW>; - vddpe-3v3-supply = <&vreg_nvme>; pinctrl-0 = <&pcie2a_default>; @@ -750,6 +747,11 @@ &pcie2a { status = "okay"; }; +&pcie2a_port0 { + reset-gpios = <&tlmm 143 GPIO_ACTIVE_LOW>; + wake-gpios = <&tlmm 145 GPIO_ACTIVE_LOW>; +}; + &pcie2a_phy { vdda-phy-supply = <&vreg_l6d>; vdda-pll-supply = <&vreg_l4d>; @@ -760,9 +762,6 @@ &pcie2a_phy { &pcie4 { max-link-speed = <2>; - perst-gpios = <&tlmm 141 GPIO_ACTIVE_LOW>; - wake-gpios = <&tlmm 139 GPIO_ACTIVE_LOW>; - vddpe-3v3-supply = <&vreg_wlan>; pinctrl-0 = <&pcie4_default>; @@ -772,6 +771,9 @@ &pcie4 { }; &pcie4_port0 { + reset-gpios = <&tlmm 141 GPIO_ACTIVE_LOW>; + wake-gpios = <&tlmm 139 GPIO_ACTIVE_LOW>; + wifi@0 { compatible = "pci17cb,1103"; reg = <0x10000 0x0 0x0 0x0 0x0>; diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts b/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts index d84ca010ab9d..603184a7c06c 100644 --- a/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts +++ b/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts @@ -933,9 +933,6 @@ keyboard@68 { }; &pcie2a { - perst-gpios = <&tlmm 143 GPIO_ACTIVE_LOW>; - wake-gpios = <&tlmm 145 GPIO_ACTIVE_LOW>; - vddpe-3v3-supply = <&vreg_nvme>; pinctrl-names = "default"; @@ -944,6 +941,11 @@ &pcie2a { status = "okay"; }; +&pcie2a_port0 { + reset-gpios = <&tlmm 143 GPIO_ACTIVE_LOW>; + wake-gpios = <&tlmm 145 GPIO_ACTIVE_LOW>; +}; + &pcie2a_phy { vdda-phy-supply = <&vreg_l6d>; vdda-pll-supply = <&vreg_l4d>; @@ -952,9 +954,6 @@ &pcie2a_phy { }; &pcie3a { - perst-gpios = <&tlmm 151 GPIO_ACTIVE_LOW>; - wake-gpios = <&tlmm 148 GPIO_ACTIVE_LOW>; - vddpe-3v3-supply = <&vreg_wwan>; pinctrl-names = "default"; @@ -963,6 +962,11 @@ &pcie3a { status = "okay"; }; +&pcie3a_port0 { + reset-gpios = <&tlmm 151 GPIO_ACTIVE_LOW>; + wake-gpios = <&tlmm 148 GPIO_ACTIVE_LOW>; +}; + &pcie3a_phy { vdda-phy-supply = <&vreg_l6d>; vdda-pll-supply = <&vreg_l4d>; @@ -973,9 +977,6 @@ &pcie3a_phy { &pcie4 { max-link-speed = <2>; - perst-gpios = <&tlmm 141 GPIO_ACTIVE_LOW>; - wake-gpios = <&tlmm 139 GPIO_ACTIVE_LOW>; - vddpe-3v3-supply = <&vreg_wlan>; pinctrl-names = "default"; @@ -985,6 +986,9 @@ &pcie4 { }; &pcie4_port0 { + reset-gpios = <&tlmm 141 GPIO_ACTIVE_LOW>; + wake-gpios = <&tlmm 139 GPIO_ACTIVE_LOW>; + wifi@0 { compatible = "pci17cb,1103"; reg = <0x10000 0x0 0x0 0x0 0x0>; diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-microsoft-arcata.dts b/arch/arm64/boot/dts/qcom/sc8280xp-microsoft-arcata.dts index f2b4470d4407..4dd287e6fb95 100644 --- a/arch/arm64/boot/dts/qcom/sc8280xp-microsoft-arcata.dts +++ b/arch/arm64/boot/dts/qcom/sc8280xp-microsoft-arcata.dts @@ -486,9 +486,6 @@ &mdss0_dp1_out { }; &pcie2a { - perst-gpios = <&tlmm 143 GPIO_ACTIVE_LOW>; - wake-gpios = <&tlmm 145 GPIO_ACTIVE_LOW>; - vddpe-3v3-supply = <&vreg_nvme>; pinctrl-0 = <&pcie2a_default>; @@ -497,6 +494,11 @@ &pcie2a { status = "okay"; }; +&pcie2a_port0 { + reset-gpios = <&tlmm 143 GPIO_ACTIVE_LOW>; + wake-gpios = <&tlmm 145 GPIO_ACTIVE_LOW>; +}; + &pcie2a_phy { vdda-phy-supply = <&vreg_l6d>; vdda-pll-supply = <&vreg_l4d>; @@ -505,9 +507,6 @@ &pcie2a_phy { }; &pcie3a { - perst-gpios = <&tlmm 151 GPIO_ACTIVE_LOW>; - wake-gpios = <&tlmm 148 GPIO_ACTIVE_LOW>; - vddpe-3v3-supply = <&vreg_wwan>; pinctrl-0 = <&pcie3a_default>; @@ -516,6 +515,11 @@ &pcie3a { status = "okay"; }; +&pcie3a_port0 { + reset-gpios = <&tlmm 151 GPIO_ACTIVE_LOW>; + wake-gpios = <&tlmm 148 GPIO_ACTIVE_LOW>; +}; + &pcie3a_phy { vdda-phy-supply = <&vreg_l6d>; vdda-pll-supply = <&vreg_l4d>; @@ -526,9 +530,6 @@ &pcie3a_phy { &pcie4 { max-link-speed = <2>; - perst-gpios = <&tlmm 141 GPIO_ACTIVE_LOW>; - wake-gpios = <&tlmm 139 GPIO_ACTIVE_LOW>; - vddpe-3v3-supply = <&vreg_wlan>; pinctrl-0 = <&pcie4_default>; @@ -538,6 +539,9 @@ &pcie4 { }; &pcie4_port0 { + reset-gpios = <&tlmm 141 GPIO_ACTIVE_LOW>; + wake-gpios = <&tlmm 139 GPIO_ACTIVE_LOW>; + wifi@0 { compatible = "pci17cb,1103"; reg = <0x10000 0x0 0x0 0x0 0x0>; diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-microsoft-blackrock.dts b/arch/arm64/boot/dts/qcom/sc8280xp-microsoft-blackrock.dts index 00bbeeef6f14..21438e638da6 100644 --- a/arch/arm64/boot/dts/qcom/sc8280xp-microsoft-blackrock.dts +++ b/arch/arm64/boot/dts/qcom/sc8280xp-microsoft-blackrock.dts @@ -624,9 +624,6 @@ &mdss0_dp2_phy { }; &pcie2a { - perst-gpios = <&tlmm 143 GPIO_ACTIVE_LOW>; - wake-gpios = <&tlmm 145 GPIO_ACTIVE_LOW>; - vddpe-3v3-supply = <&vreg_nvme>; pinctrl-0 = <&pcie2a_default>; @@ -635,6 +632,11 @@ &pcie2a { status = "okay"; }; +&pcie2a_port0 { + reset-gpios = <&tlmm 143 GPIO_ACTIVE_LOW>; + wake-gpios = <&tlmm 145 GPIO_ACTIVE_LOW>; +}; + &pcie2a_phy { vdda-phy-supply = <&vreg_l4d>; vdda-pll-supply = <&vreg_l6d>; @@ -645,9 +647,6 @@ &pcie2a_phy { &pcie4 { max-link-speed = <2>; - perst-gpios = <&tlmm 141 GPIO_ACTIVE_LOW>; - wake-gpios = <&tlmm 139 GPIO_ACTIVE_LOW>; - vddpe-3v3-supply = <&vreg_wlan>; pinctrl-0 = <&pcie4_default>; @@ -657,6 +656,9 @@ &pcie4 { }; &pcie4_port0 { + reset-gpios = <&tlmm 141 GPIO_ACTIVE_LOW>; + wake-gpios = <&tlmm 139 GPIO_ACTIVE_LOW>; + wifi@0 { compatible = "pci17cb,1103"; reg = <0x10000 0x0 0x0 0x0 0x0>; diff --git a/arch/arm64/boot/dts/qcom/sc8280xp.dtsi b/arch/arm64/boot/dts/qcom/sc8280xp.dtsi index 761f229e8f47..c59d7b499008 100644 --- a/arch/arm64/boot/dts/qcom/sc8280xp.dtsi +++ b/arch/arm64/boot/dts/qcom/sc8280xp.dtsi @@ -2220,9 +2220,6 @@ pcie4: pcie@1c00000 { power-domains = <&gcc PCIE_4_GDSC>; required-opps = <&rpmhpd_opp_nom>; - phys = <&pcie4_phy>; - phy-names = "pciephy"; - status = "disabled"; pcie4_port0: pcie@0 { @@ -2233,6 +2230,8 @@ pcie4_port0: pcie@0 { #address-cells = <3>; #size-cells = <2>; ranges; + + phys = <&pcie4_phy>; }; }; @@ -2331,9 +2330,6 @@ pcie3b: pcie@1c08000 { power-domains = <&gcc PCIE_3B_GDSC>; required-opps = <&rpmhpd_opp_nom>; - phys = <&pcie3b_phy>; - phy-names = "pciephy"; - status = "disabled"; pcie3b_port0: pcie@0 { @@ -2344,6 +2340,8 @@ pcie3b_port0: pcie@0 { #address-cells = <3>; #size-cells = <2>; ranges; + + phys = <&pcie3b_phy>; }; }; @@ -2442,9 +2440,6 @@ pcie3a: pcie@1c10000 { power-domains = <&gcc PCIE_3A_GDSC>; required-opps = <&rpmhpd_opp_nom>; - phys = <&pcie3a_phy>; - phy-names = "pciephy"; - status = "disabled"; pcie3a_port0: pcie@0 { @@ -2455,6 +2450,8 @@ pcie3a_port0: pcie@0 { #address-cells = <3>; #size-cells = <2>; ranges; + + phys = <&pcie3a_phy>; }; }; @@ -2556,9 +2553,6 @@ pcie2b: pcie@1c18000 { power-domains = <&gcc PCIE_2B_GDSC>; required-opps = <&rpmhpd_opp_nom>; - phys = <&pcie2b_phy>; - phy-names = "pciephy"; - status = "disabled"; pcie2b_port0: pcie@0 { @@ -2569,6 +2563,8 @@ pcie2b_port0: pcie@0 { #address-cells = <3>; #size-cells = <2>; ranges; + + phys = <&pcie2b_phy>; }; }; @@ -2667,9 +2663,6 @@ pcie2a: pcie@1c20000 { power-domains = <&gcc PCIE_2A_GDSC>; required-opps = <&rpmhpd_opp_nom>; - phys = <&pcie2a_phy>; - phy-names = "pciephy"; - status = "disabled"; pcie2a_port0: pcie@0 { @@ -2680,6 +2673,8 @@ pcie2a_port0: pcie@0 { #address-cells = <3>; #size-cells = <2>; ranges; + + phys = <&pcie2a_phy>; }; }; -- 2.34.1