From patchwork Thu Mar 21 11:16:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Manivannan Sadhasivam X-Patchwork-Id: 782083 Received: from mail-ot1-f53.google.com (mail-ot1-f53.google.com [209.85.210.53]) (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 E124657877 for ; Thu, 21 Mar 2024 11:24:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711020263; cv=none; b=fgQzpP4VcYiTSUgrUtGUqyxB7qCKIlmHFbNQafMAnLIPSUTVPwPg+WI0yej+zwhSKoJxwkbyb9hAHHqnnbtrtbxEzBZniCKxGcgqMWvvQehTldXu9ubiLm9hCakvvqvo/c40ILX/Ra7fVeGw4OKbibgm1Qi5rKRA9qhKLzkcwLM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711020263; c=relaxed/simple; bh=xm+jWg3BgMqQCkkC5ZHr8tW7UJ1z5Sx/tGZleR1ATvE=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=HTN23BBCAY4W1oo6GDIAmQqazzTBIIQ4xDL8Tj3e2IPX4RrCySWzUSBNj0wwj5ctGI6yb5fdRVjCkWeJLToEc6k7mDXaenpJaqjNuKmDK0pj4cBLq5gNPt3VoeNWhsaOa69unmgiSErsgLCnO7GFVx2lr+P19PNEv5fLfpUZ86o= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=kXe2mSVA; arc=none smtp.client-ip=209.85.210.53 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="kXe2mSVA" Received: by mail-ot1-f53.google.com with SMTP id 46e09a7af769-6e673ffbd79so414056a34.2 for ; Thu, 21 Mar 2024 04:24:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1711020261; x=1711625061; 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=OQs2ciOH27/qJex0Nmnn+loYNUnMaA6AX6ZBILiraFg=; b=kXe2mSVA+MAJReB6X8FfEx9zVMD8brwFcBLMla0do9wMcSoD2ZqIMrj6jSnlb3exWd DAT7+ZmrCYKkxp4BLcKExddF4Uiy9cNazIYP5xClYkAAHQVEtEG2bhy1YwqphoAif819 kH0FUQy1/Nt96kpQI3wQEoDXs06XWTUbAcWtO6CAQ2Fuoj/Sh0fmgWVFjl7r2c2o5Cf/ deTjkBDeZxxIlScRqZyvrnj8FlVkojrkBqzIWF3Wi2tTSxNGLMJkqkVeF8k83A8T/7jN 8Alw8+LSRG/VsF6wGyzDJScBKUzccdeDM/LNChLllnzmfSXMQQxRte1YJ2guC88hg7FW XqPA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711020261; x=1711625061; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=OQs2ciOH27/qJex0Nmnn+loYNUnMaA6AX6ZBILiraFg=; b=ar6d11tPXS+PSgSbTjujrWaoeE9lBY6Z1GI8wPTCFqmTWW6dDQlxzuCiw0G1wQ9CXr ds313C70Dx7HeRP+SZhRiii7mLygdzdhaZyeXt8d0tEpTE0mSG+8Nf2et664rV+2QuVA E+3dL2wiJQ43JzVswEUG3LUgjNzjwSSoWObHtq/LtxWl3i04qo0haC9QS9L0LSbpwcVM qLg5QL+gugPV60Ol/MJNyiU9S7jIvL1gO96DpKX5+zpGYsnUWBpszCifbnfrAKe9Z/wh ogK+r27NZxtd7WR4EHOKRtPhkdiNv+nvLg7dJgJy+pGG+5Ob/PpCmIp7XM4MCpny0pxu nIow== X-Gm-Message-State: AOJu0YyG0aRLHuS7B69qtYDG/2T/ymEu2MxHRoYLC2KIbc6lEFVVjI77 10aiRzBFmtaEEHJui23q8WGJBblEXzFqZuMpLNL9wghUW1D2u2CxYiMLrGut3KZfzGyeIM1RDUM = X-Google-Smtp-Source: AGHT+IHd9bOVmfAL6GhnFMkXfn/qEq/L4zTHm4jeKk1ql8LKHfn+bVeVVgkcnjMPV5Ys2JjlLUFbiw== X-Received: by 2002:a05:6a20:3d23:b0:1a3:8793:8840 with SMTP id y35-20020a056a203d2300b001a387938840mr4450005pzi.33.1711019836249; Thu, 21 Mar 2024 04:17:16 -0700 (PDT) Received: from [127.0.1.1] ([2409:40f4:102b:a64b:d832:a82a:837c:6d3]) by smtp.gmail.com with ESMTPSA id ka6-20020a056a00938600b006e7324d32bbsm5531120pfb.122.2024.03.21.04.17.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Mar 2024 04:17:15 -0700 (PDT) From: Manivannan Sadhasivam Date: Thu, 21 Mar 2024 16:46:29 +0530 Subject: [PATCH v2 09/21] arm64: dts: qcom: sc8280xp: Add PCIe bridge node Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240321-pcie-qcom-bridge-dts-v2-9-1eb790c53e43@linaro.org> References: <20240321-pcie-qcom-bridge-dts-v2-0-1eb790c53e43@linaro.org> In-Reply-To: <20240321-pcie-qcom-bridge-dts-v2-0-1eb790c53e43@linaro.org> To: Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , Conor Dooley , cros-qcom-dts-watchers@chromium.org, Rob Herring Cc: linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Manivannan Sadhasivam X-Mailer: b4 0.12.4 X-Developer-Signature: v=1; a=openpgp-sha256; l=3370; i=manivannan.sadhasivam@linaro.org; h=from:subject:message-id; bh=xm+jWg3BgMqQCkkC5ZHr8tW7UJ1z5Sx/tGZleR1ATvE=; b=owEBbQGS/pANAwAKAVWfEeb+kc71AcsmYgBl/BcL1+Vnkfwh+YBo40ZqpcGU2fjgvQ30/12dm asb8ZOvofKJATMEAAEKAB0WIQRnpUMqgUjL2KRYJ5dVnxHm/pHO9QUCZfwXCwAKCRBVnxHm/pHO 9TY1B/9WeLAXW+OaaT824XlTb276fkWKMEenfw0+X+0fmDRWIkEq8FN3zl2VsT4L0pc/Z+F4jPY HwNobpUhR20Vd/QsgCjO2LEMgosGWAQ3mNkraRpH64xuxh+a+EL8+GilybSRWRlds9nYBqQ4pH8 kVMAe3ozmVc8g8B/bcusILRnPMcjkQche0EV3EBlwLOaV/Z+NmZO+P3w9boTyaZl9xzrLY/s1QV M+VRQpWGdXCj/fc11xeVhPOhqVA6Rec6Ay8aU0QtUD1ImCof8C7t1Mmz2+7JnTfqJxpF627+/Z6 jxzUGCkZukPcEi+bI83OomX+XP49wxM9qD75hWNmBAE/nqoM X-Developer-Key: i=manivannan.sadhasivam@linaro.org; a=openpgp; fpr=C668AEC3C3188E4C611465E7488550E901166008 On Qcom SoCs, the PCIe host bridge is connected to a single PCIe bridge for each controller instance. Hence, add a node to represent the bridge. While at it, let's remove the bridge properties from board dts as they are now redundant. Signed-off-by: Manivannan Sadhasivam --- .../dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts | 20 +++------ arch/arm64/boot/dts/qcom/sc8280xp.dtsi | 50 ++++++++++++++++++++++ 2 files changed, 56 insertions(+), 14 deletions(-) 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 15ae94c1602d..caf7dff446a6 100644 --- a/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts +++ b/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts @@ -731,22 +731,14 @@ &pcie4 { pinctrl-0 = <&pcie4_default>; status = "okay"; +}; - pcie@0 { - device_type = "pci"; - reg = <0x0 0x0 0x0 0x0 0x0>; - #address-cells = <3>; - #size-cells = <2>; - ranges; - - bus-range = <0x01 0xff>; - - wifi@0 { - compatible = "pci17cb,1103"; - reg = <0x10000 0x0 0x0 0x0 0x0>; +&pcie4_port0 { + wifi@0 { + compatible = "pci17cb,1103"; + reg = <0x10000 0x0 0x0 0x0 0x0>; - qcom,ath11k-calibration-variant = "LE_X13S"; - }; + qcom,ath11k-calibration-variant = "LE_X13S"; }; }; diff --git a/arch/arm64/boot/dts/qcom/sc8280xp.dtsi b/arch/arm64/boot/dts/qcom/sc8280xp.dtsi index a5b194813079..c7feebcb28b9 100644 --- a/arch/arm64/boot/dts/qcom/sc8280xp.dtsi +++ b/arch/arm64/boot/dts/qcom/sc8280xp.dtsi @@ -1779,6 +1779,16 @@ pcie4: pcie@1c00000 { phy-names = "pciephy"; status = "disabled"; + + pcie4_port0: pcie@0 { + device_type = "pci"; + reg = <0x0 0x0 0x0 0x0 0x0>; + bus-range = <0x01 0xff>; + + #address-cells = <3>; + #size-cells = <2>; + ranges; + }; }; pcie4_phy: phy@1c06000 { @@ -1877,6 +1887,16 @@ pcie3b: pcie@1c08000 { phy-names = "pciephy"; status = "disabled"; + + pcie3b_port0: pcie@0 { + device_type = "pci"; + reg = <0x0 0x0 0x0 0x0 0x0>; + bus-range = <0x01 0xff>; + + #address-cells = <3>; + #size-cells = <2>; + ranges; + }; }; pcie3b_phy: phy@1c0e000 { @@ -1975,6 +1995,16 @@ pcie3a: pcie@1c10000 { phy-names = "pciephy"; status = "disabled"; + + pcie3a_port0: pcie@0 { + device_type = "pci"; + reg = <0x0 0x0 0x0 0x0 0x0>; + bus-range = <0x01 0xff>; + + #address-cells = <3>; + #size-cells = <2>; + ranges; + }; }; pcie3a_phy: phy@1c14000 { @@ -2076,6 +2106,16 @@ pcie2b: pcie@1c18000 { phy-names = "pciephy"; status = "disabled"; + + pcie2b_port0: pcie@0 { + device_type = "pci"; + reg = <0x0 0x0 0x0 0x0 0x0>; + bus-range = <0x01 0xff>; + + #address-cells = <3>; + #size-cells = <2>; + ranges; + }; }; pcie2b_phy: phy@1c1e000 { @@ -2174,6 +2214,16 @@ pcie2a: pcie@1c20000 { phy-names = "pciephy"; status = "disabled"; + + pcie2a_port0: pcie@0 { + device_type = "pci"; + reg = <0x0 0x0 0x0 0x0 0x0>; + bus-range = <0x01 0xff>; + + #address-cells = <3>; + #size-cells = <2>; + ranges; + }; }; pcie2a_phy: phy@1c24000 {