arm64: dts: enable the imx pcie ep verification solution

Enable the imx pcie ep verification solution.

Signed-off-by: Richard Zhu <hongxing.zhu@nxp.com>
Reviewed-by: Fugang Duan <fugang.duan@nxp.com>

diff --git a/arch/arm64/boot/dts/freescale/imx8-ss-hsio.dtsi b/arch/arm64/boot/dts/freescale/imx8-ss-hsio.dtsi
index 830b179..b9e0e35 100644 (file)
--- a/arch/arm64/boot/dts/freescale/imx8-ss-hsio.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx8-ss-hsio.dtsi
@@ -103,9 +103,10 @@ hsio_subsys: bus@5f000000 {
                ranges = <0x81000000 0 0x00000000 0x7ff80000 0 0x00010000 /* downstream I/O */
                          0x82000000 0 0x70000000 0x70000000 0 0x0ff00000>; /* non-prefetchable memory */
                num-lanes = <1>;
+               num-viewport = <4>;
                interrupts = <GIC_SPI 102 IRQ_TYPE_LEVEL_HIGH>,
                                <GIC_SPI 104 IRQ_TYPE_LEVEL_HIGH>; /* eDMA */
-               interrupt-names = "msi";
+               interrupt-names = "msi", "dma";
                #interrupt-cells = <1>;
                interrupt-map-mask = <0 0 0 0x7>;
                interrupt-map =  <0 0 0 1 &gic 0 105 4>,

diff --git a/arch/arm64/boot/dts/freescale/imx8mm-evk-rpmsg.dts b/arch/arm64/boot/dts/freescale/imx8mm-evk-rpmsg.dts
index 02cea5a..1d834d2 100644 (file)
--- a/arch/arm64/boot/dts/freescale/imx8mm-evk-rpmsg.dts
+++ b/arch/arm64/boot/dts/freescale/imx8mm-evk-rpmsg.dts
@@ -18,11 +18,6 @@
                        reg = <0 0x80000000 0 0x1000000>;
                };
 
-               rpmsg_reserved: rpmsg@0xb8000000 {
-                       no-map;
-                       reg = <0 0xb8000000 0 0x400000>;
-               };
-
                rpmsg_dma_reserved:rpmsg_dma@0xb8400000 {
                        compatible = "shared-dma-pool";
                        no-map;

diff --git a/arch/arm64/boot/dts/freescale/imx8mq-evk.dts b/arch/arm64/boot/dts/freescale/imx8mq-evk.dts
index e4f1b6e..afcab6d 100755 (executable)
--- a/arch/arm64/boot/dts/freescale/imx8mq-evk.dts
+++ b/arch/arm64/boot/dts/freescale/imx8mq-evk.dts
@@ -22,6 +22,17 @@
                reg = <0x00000000 0x40000000 0 0xc0000000>;
        };
 
+       reserved-memory {
+               #address-cells = <2>;
+               #size-cells = <2>;
+               ranges;
+
+               rpmsg_reserved: rpmsg@0xb8000000 {
+                       no-map;
+                       reg = <0 0xb8000000 0 0x400000>;
+               };
+       };
+
        modem_reset: modem-reset {
                compatible = "gpio-reset";
                reset-gpios = <&gpio3 5 GPIO_ACTIVE_LOW>;
@@ -611,6 +622,7 @@
                 <&clk IMX8MQ_CLK_PCIE1_PHY>,
                 <&pcie0_refclk>;
        clock-names = "pcie", "pcie_aux", "pcie_phy", "pcie_bus";
+       hard-wired = <1>;
        status = "okay";
 };
 
@@ -624,6 +636,7 @@
                 <&clk IMX8MQ_CLK_PCIE2_PHY>,
                 <&pcie1_refclk>;
        clock-names = "pcie", "pcie_aux", "pcie_phy", "pcie_bus";
+       reserved-region = <&rpmsg_reserved>;
        status = "okay";
 };
 

diff --git a/arch/arm64/boot/dts/freescale/imx8mq.dtsi b/arch/arm64/boot/dts/freescale/imx8mq.dtsi
index a477e69..50a7cda 100755 (executable)
--- a/arch/arm64/boot/dts/freescale/imx8mq.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx8mq.dtsi
@@ -1439,8 +1439,9 @@
                                  0x82000000 0 0x18000000 0x18000000 0 0x07f00000>; /* non-prefetchable memory */
                        num-lanes = <1>;
                        num-viewport = <4>;
-                       interrupts = <GIC_SPI 122 IRQ_TYPE_LEVEL_HIGH>;
-                       interrupt-names = "msi";
+                       interrupts = <GIC_SPI 122 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 127 IRQ_TYPE_LEVEL_HIGH>; /* eDMA */
+                       interrupt-names = "msi", "dma";
                        #interrupt-cells = <1>;
                        interrupt-map-mask = <0 0 0 0x7>;
                        interrupt-map = <0 0 0 1 &gic GIC_SPI 125 IRQ_TYPE_LEVEL_HIGH>,
@@ -1468,8 +1469,9 @@
                                   0x82000000 0 0x20000000 0x20000000 0 0x07f00000>; /* non-prefetchable memory */
                        num-lanes = <1>;
                        num-viewport = <4>;
-                       interrupts = <GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH>;
-                       interrupt-names = "msi";
+                       interrupts = <GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 80 IRQ_TYPE_LEVEL_HIGH>; /* eDMA */
+                       interrupt-names = "msi", "dma";
                        #interrupt-cells = <1>;
                        interrupt-map-mask = <0 0 0 0x7>;
                        interrupt-map = <0 0 0 1 &gic GIC_SPI 77 IRQ_TYPE_LEVEL_HIGH>,

diff --git a/arch/arm64/boot/dts/freescale/imx8qm-mek.dts b/arch/arm64/boot/dts/freescale/imx8qm-mek.dts
index 748e16f..a90ea9e 100755 (executable)
--- a/arch/arm64/boot/dts/freescale/imx8qm-mek.dts
+++ b/arch/arm64/boot/dts/freescale/imx8qm-mek.dts
@@ -771,6 +771,7 @@
        disable-gpio = <&lsio_gpio4 9 GPIO_ACTIVE_LOW>;
        ext_osc = <1>;
        epdev_on-supply = <&epdev_on>;
+       reserved-region = <&rpmsg_reserved>;
        status = "okay";
 };
 

diff --git a/arch/arm64/boot/dts/freescale/imx8qm-ss-hsio.dtsi b/arch/arm64/boot/dts/freescale/imx8qm-ss-hsio.dtsi
index 51ddea3..b648374 100644 (file)
--- a/arch/arm64/boot/dts/freescale/imx8qm-ss-hsio.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx8qm-ss-hsio.dtsi
@@ -99,9 +99,10 @@
                ranges = <0x81000000 0 0x00000000 0x6ff80000 0 0x00010000 /* downstream I/O */
                          0x82000000 0 0x60000000 0x60000000 0 0x0ff00000>; /* non-prefetchable memory */
                num-lanes = <1>;
+               num-viewport = <4>;
                interrupts = <GIC_SPI 70 IRQ_TYPE_LEVEL_HIGH>,
                                <GIC_SPI 72 IRQ_TYPE_LEVEL_HIGH>; /* eDMA */
-               interrupt-names = "msi";
+               interrupt-names = "msi", "dma";
                #interrupt-cells = <1>;
                interrupt-map-mask = <0 0 0 0x7>;
                interrupt-map =  <0 0 0 1 &gic 0 73 4>,

diff --git a/arch/arm64/boot/dts/freescale/imx8qxp-mek.dts b/arch/arm64/boot/dts/freescale/imx8qxp-mek.dts
index 430f49d..1d483f0 100755 (executable)
--- a/arch/arm64/boot/dts/freescale/imx8qxp-mek.dts
+++ b/arch/arm64/boot/dts/freescale/imx8qxp-mek.dts
@@ -826,6 +826,7 @@
        disable-gpio = <&pca9557_a 2 GPIO_ACTIVE_LOW>;
        reset-gpio = <&lsio_gpio4 0 GPIO_ACTIVE_LOW>;
        ext_osc = <1>;
+       reserved-region = <&rpmsg_reserved>;
        status = "okay";
 };