Skip to content

Commit 9dc3953

Browse files
SherrySun5nxpfrankli
authored andcommitted
ARM: dts: imx6qdl: Add Root Port node and PERST property
Since describing the PCIe PERST# property under Host Bridge node is now deprecated, it is recommended to add it to the Root Port node, so creating the Root Port node and add the reset-gpios property in Root Port. Signed-off-by: Sherry Sun <sherry.sun@nxp.com> Signed-off-by: Frank Li <Frank.Li@nxp.com>
1 parent dcf7bac commit 9dc3953

4 files changed

Lines changed: 25 additions & 13 deletions

File tree

arch/arm/boot/dts/nxp/imx/imx6q-utilite-pro.dts

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -323,19 +323,10 @@
323323
remote-endpoint = <&parallel_display_in>;
324324
};
325325

326-
&pcie {
327-
pcie@0,0 {
328-
reg = <0x000000 0 0 0 0>;
329-
device_type = "pci";
330-
#address-cells = <3>;
331-
#size-cells = <2>;
332-
bus-range = <0x00 0xff>;
333-
ranges;
334-
335-
/* non-removable i211 ethernet card */
336-
eth1: ethernet@0,0 {
337-
reg = <0x010000 0 0 0 0>;
338-
};
326+
&pcie_port0 {
327+
/* non-removable i211 ethernet card */
328+
eth1: ethernet@0,0 {
329+
reg = <0x010000 0 0 0 0>;
339330
};
340331
};
341332

arch/arm/boot/dts/nxp/imx/imx6qdl-sabresd.dtsi

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -754,11 +754,16 @@
754754
&pcie {
755755
pinctrl-names = "default";
756756
pinctrl-0 = <&pinctrl_pcie>;
757+
/* This property is deprecated, use reset-gpios from the Root Port node. */
757758
reset-gpio = <&gpio7 12 GPIO_ACTIVE_LOW>;
758759
vpcie-supply = <&reg_pcie>;
759760
status = "okay";
760761
};
761762

763+
&pcie_port0 {
764+
reset-gpios = <&gpio7 12 GPIO_ACTIVE_LOW>;
765+
};
766+
762767
&pwm1 {
763768
pinctrl-names = "default";
764769
pinctrl-0 = <&pinctrl_pwm1>;

arch/arm/boot/dts/nxp/imx/imx6qdl.dtsi

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -289,6 +289,17 @@
289289
<&clks IMX6QDL_CLK_PCIE_REF_125M>;
290290
clock-names = "pcie", "pcie_bus", "pcie_phy";
291291
status = "disabled";
292+
293+
pcie_port0: pcie@0 {
294+
compatible = "pciclass,0604";
295+
device_type = "pci";
296+
reg = <0x0 0x0 0x0 0x0 0x0>;
297+
bus-range = <0x01 0xff>;
298+
299+
#address-cells = <3>;
300+
#size-cells = <2>;
301+
ranges;
302+
};
292303
};
293304

294305
aips1: bus@2000000 { /* AIPS1 */

arch/arm/boot/dts/nxp/imx/imx6qp-sabreauto.dts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,15 @@
4545
};
4646

4747
&pcie {
48+
/* This property is deprecated, use reset-gpios from the Root Port node. */
4849
reset-gpio = <&max7310_c 5 GPIO_ACTIVE_LOW>;
4950
status = "okay";
5051
};
5152

53+
&pcie_port0 {
54+
reset-gpios = <&max7310_c 5 GPIO_ACTIVE_LOW>;
55+
};
56+
5257
&sata {
5358
status = "okay";
5459
};

0 commit comments

Comments
 (0)