Skip to content

Commit 38fcbfb

Browse files
dt-bindings: PCI: qcom: Move PHY & reset GPIO to Root Port node
Move the phys, phy-names, reset-gpios properties to the PCIe Root Port node from Host Bridge node, as agreed upon here [1]. Update the qcom,pcie-common.yaml to include the 'phys' property in the Root Port node. 'phy-names' property is not needed in Root Port since each Root Port supports only one PHY. Also, there is already 'reset-gpios' property defined for PERST# in pci-bus-common.yaml, so use that property instead of 'perst-gpios'. For backward compatibility, do not remove any existing properties in the bridge node, but mark them as 'deprecated' instead. [1] https://lore.kernel.org/linux-pci/20241211192014.GA3302752@bhelgaas/ Signed-off-by: Krishna Chaitanya Chundru <[email protected]> [mani: commit message rewording] Signed-off-by: Manivannan Sadhasivam <[email protected]> Signed-off-by: Bjorn Helgaas <[email protected]> Reviewed-by: Rob Herring (Arm) <[email protected]> Link: https://patch.msgid.link/[email protected]
1 parent 7d944c0 commit 38fcbfb

File tree

2 files changed

+42
-6
lines changed

2 files changed

+42
-6
lines changed

Documentation/devicetree/bindings/pci/qcom,pcie-common.yaml

Lines changed: 30 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,18 @@ properties:
5151

5252
phys:
5353
maxItems: 1
54+
deprecated: true
55+
description:
56+
This property is deprecated, instead of referencing this property from
57+
the host bridge node, use the property from the PCIe root port node.
5458

5559
phy-names:
5660
items:
5761
- const: pciephy
62+
deprecated: true
63+
description:
64+
Phandle to the register map node. This property is deprecated, and not
65+
required to add in the root port also, as the root port has only one phy.
5866

5967
power-domains:
6068
maxItems: 1
@@ -71,12 +79,18 @@ properties:
7179
maxItems: 12
7280

7381
perst-gpios:
74-
description: GPIO controlled connection to PERST# signal
82+
description: GPIO controlled connection to PERST# signal. This property is
83+
deprecated, instead of referencing this property from the host bridge node,
84+
use the reset-gpios property from the root port node.
7585
maxItems: 1
86+
deprecated: true
7687

7788
wake-gpios:
78-
description: GPIO controlled connection to WAKE# signal
89+
description: GPIO controlled connection to WAKE# signal. This property is
90+
deprecated, instead of referencing this property from the host bridge node,
91+
use the property from the PCIe root port node.
7992
maxItems: 1
93+
deprecated: true
8094

8195
vddpe-3v3-supply:
8296
description: PCIe endpoint power supply
@@ -85,6 +99,20 @@ properties:
8599
opp-table:
86100
type: object
87101

102+
patternProperties:
103+
"^pcie@":
104+
type: object
105+
$ref: /schemas/pci/pci-pci-bridge.yaml#
106+
107+
properties:
108+
reg:
109+
maxItems: 1
110+
111+
phys:
112+
maxItems: 1
113+
114+
unevaluatedProperties: false
115+
88116
required:
89117
- reg
90118
- reg-names

Documentation/devicetree/bindings/pci/qcom,pcie-sc7280.yaml

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -165,9 +165,6 @@ examples:
165165
iommu-map = <0x0 &apps_smmu 0x1c80 0x1>,
166166
<0x100 &apps_smmu 0x1c81 0x1>;
167167
168-
phys = <&pcie1_phy>;
169-
phy-names = "pciephy";
170-
171168
pinctrl-names = "default";
172169
pinctrl-0 = <&pcie1_clkreq_n>;
173170
@@ -176,7 +173,18 @@ examples:
176173
resets = <&gcc GCC_PCIE_1_BCR>;
177174
reset-names = "pci";
178175
179-
perst-gpios = <&tlmm 2 GPIO_ACTIVE_LOW>;
180176
vddpe-3v3-supply = <&pp3300_ssd>;
177+
pcie1_port0: pcie@0 {
178+
device_type = "pci";
179+
reg = <0x0 0x0 0x0 0x0 0x0>;
180+
bus-range = <0x01 0xff>;
181+
182+
#address-cells = <3>;
183+
#size-cells = <2>;
184+
ranges;
185+
phys = <&pcie1_phy>;
186+
187+
reset-gpios = <&tlmm 2 GPIO_ACTIVE_LOW>;
188+
};
181189
};
182190
};

0 commit comments

Comments
 (0)