diff options
| author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2022-10-22 23:59:38 +0200 |
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2022-10-24 13:43:21 +0200 |
| commit | 175a8741a78a185d3dc2b3fb4677b2bfb1125fae (patch) | |
| tree | 8b959d81eb947f46fd2c2992f1ac947407c6296f /arch/arm/dts | |
| parent | 2419acf7e21d22c875816de6d13c0be2431241d8 (diff) | |
| download | u-boot-175a8741a78a185d3dc2b3fb4677b2bfb1125fae.tar.gz | |
imx6qp: synchronise device tree with linux
Synchronise device tree with linux v6.0-rc1.
Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Diffstat (limited to 'arch/arm/dts')
| -rw-r--r-- | arch/arm/dts/imx6qp-sabreauto.dts | 7 | ||||
| -rw-r--r-- | arch/arm/dts/imx6qp-sabresd.dts | 10 | ||||
| -rw-r--r-- | arch/arm/dts/imx6qp.dtsi | 3 |
3 files changed, 16 insertions, 4 deletions
diff --git a/arch/arm/dts/imx6qp-sabreauto.dts b/arch/arm/dts/imx6qp-sabreauto.dts index d4caeeb0af..2bb3bfb18e 100644 --- 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 f1b9cb104f..f69eec18d8 100644 --- 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 93b89dc1f5..0503655138 100644 --- 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"; }; |