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>

diff --git a/arch/arm/boot/dts/nxp/imx/imx6q-utilite-pro.dts b/arch/arm/boot/dts/nxp/imx/imx6q-utilite-pro.dts
index c78f101c3cc122f418b708b1c274ca11b586b65c..2ddd71f09da3490d615ec637e7ada2d5cd16bbb3 100644 (file)
--- a/arch/arm/boot/dts/nxp/imx/imx6q-utilite-pro.dts
+++ b/arch/arm/boot/dts/nxp/imx/imx6q-utilite-pro.dts
@@ -323,19 +323,10 @@
        remote-endpoint = <&parallel_display_in>;
 };
 
-&pcie {
-       pcie@0,0 {
-               reg = <0x000000 0 0 0 0>;
-               device_type = "pci";
-               #address-cells = <3>;
-               #size-cells = <2>;
-               bus-range = <0x00 0xff>;
-               ranges;
-
-               /* non-removable i211 ethernet card */
-               eth1: ethernet@0,0 {
-                       reg = <0x010000 0 0 0 0>;
-               };
+&pcie_port0 {
+       /* non-removable i211 ethernet card */
+       eth1: ethernet@0,0 {
+               reg = <0x010000 0 0 0 0>;
        };
 };
 

diff --git a/arch/arm/boot/dts/nxp/imx/imx6qdl-sabresd.dtsi b/arch/arm/boot/dts/nxp/imx/imx6qdl-sabresd.dtsi
index ba29720e3f7205675b46a14ea4ce3f8957790911..fe9046c03ddd67bf87e201c76c52b5a20c783abc 100644 (file)
--- a/arch/arm/boot/dts/nxp/imx/imx6qdl-sabresd.dtsi
+++ b/arch/arm/boot/dts/nxp/imx/imx6qdl-sabresd.dtsi
@@ -754,11 +754,16 @@
 &pcie {
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_pcie>;
+       /* This property is deprecated, use reset-gpios from the Root Port node. */
        reset-gpio = <&gpio7 12 GPIO_ACTIVE_LOW>;
        vpcie-supply = <&reg_pcie>;
        status = "okay";
 };
 
+&pcie_port0 {
+       reset-gpios = <&gpio7 12 GPIO_ACTIVE_LOW>;
+};
+
 &pwm1 {
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_pwm1>;

diff --git a/arch/arm/boot/dts/nxp/imx/imx6qdl.dtsi b/arch/arm/boot/dts/nxp/imx/imx6qdl.dtsi
index 76e6043e1f9184d5df9baac6695d97cb4f149b7e..eeb3761933983d9b72735d2d1a618208e465f858 100644 (file)
--- a/arch/arm/boot/dts/nxp/imx/imx6qdl.dtsi
+++ b/arch/arm/boot/dts/nxp/imx/imx6qdl.dtsi
@@ -289,6 +289,17 @@
                                 <&clks IMX6QDL_CLK_PCIE_REF_125M>;
                        clock-names = "pcie", "pcie_bus", "pcie_phy";
                        status = "disabled";
+
+                       pcie_port0: pcie@0 {
+                               compatible = "pciclass,0604";
+                               device_type = "pci";
+                               reg = <0x0 0x0 0x0 0x0 0x0>;
+                               bus-range = <0x01 0xff>;
+
+                               #address-cells = <3>;
+                               #size-cells = <2>;
+                               ranges;
+                       };
                };
 
                aips1: bus@2000000 { /* AIPS1 */

diff --git a/arch/arm/boot/dts/nxp/imx/imx6qp-sabreauto.dts b/arch/arm/boot/dts/nxp/imx/imx6qp-sabreauto.dts
index c5b220aeaefd6cd95d89801aee1722e4faec14ea..6b12cab7175fa27ec27a37dc81b6ea13dab6f5de 100644 (file)
--- a/arch/arm/boot/dts/nxp/imx/imx6qp-sabreauto.dts
+++ b/arch/arm/boot/dts/nxp/imx/imx6qp-sabreauto.dts
@@ -45,10 +45,15 @@
 };
 
 &pcie {
+       /* This property is deprecated, use reset-gpios from the Root Port node. */
        reset-gpio = <&max7310_c 5 GPIO_ACTIVE_LOW>;
        status = "okay";
 };
 
+&pcie_port0 {
+       reset-gpios = <&max7310_c 5 GPIO_ACTIVE_LOW>;
+};
+
 &sata {
        status = "okay";
 };