imx6qp: synchronise device tree with linux

Synchronise device tree with linux v6.0-rc1.

Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>

diff --git a/arch/arm/dts/imx6qp-sabreauto.dts b/arch/arm/dts/imx6qp-sabreauto.dts
index d4caeeb0af703e5f9e9438289eb176a65c34f6f6..2bb3bfb18ec3e2347ac59823cbce9e861c32beac 100644 (file)
--- a/arch/arm/dts/imx6qp-sabreauto.dts
+++ b/arch/arm/dts/imx6qp-sabreauto.dts
@@ -47,7 +47,12 @@
 };
 
 &pcie {
-       status = "disabled";
+       reset-gpio = <&max7310_c 5 GPIO_ACTIVE_LOW>;
+       status = "okay";
+};
+
+&sata {
+       status = "okay";
 };
 
 &vgen3_reg {

diff --git a/arch/arm/dts/imx6qp-sabresd.dts b/arch/arm/dts/imx6qp-sabresd.dts
index f1b9cb104fddc0d7887cf49f8bfd56517b6e2f39..f69eec18d8657b01e19f686d623dcafc7cdfeb9e 100644 (file)
--- a/arch/arm/dts/imx6qp-sabresd.dts
+++ b/arch/arm/dts/imx6qp-sabresd.dts
@@ -50,6 +50,14 @@
        };
 };
 
+&vgen3_reg {
+       regulator-always-on;
+};
+
 &pcie {
-       status = "disabled";
+       status = "okay";
+};
+
+&sata {
+       status = "okay";
 };

diff --git a/arch/arm/dts/imx6qp.dtsi b/arch/arm/dts/imx6qp.dtsi
index 93b89dc1f53b5b20c1044ceead90f821b112c2fb..050365513836356a0f132c9ffc78020c546a5b6d 100644 (file)
--- a/arch/arm/dts/imx6qp.dtsi
+++ b/arch/arm/dts/imx6qp.dtsi
@@ -77,7 +77,6 @@
 };
 
 &fec {
-       /delete-property/interrupts-extended;
        interrupts = <0 118 IRQ_TYPE_LEVEL_HIGH>,
                     <0 119 IRQ_TYPE_LEVEL_HIGH>;
 };
@@ -111,5 +110,5 @@
 };
 
 &pcie {
-       compatible = "fsl,imx6qp-pcie", "snps,dw-pcie";
+       compatible = "fsl,imx6qp-pcie";
 };