Merge https://gitlab.denx.de/u-boot/custodians/u-boot-clk

[oweals/u-boot.git] / arch / arm / dts / fsl-imx8qxp-mek.dts

diff --git a/arch/arm/dts/fsl-imx8qxp-mek.dts b/arch/arm/dts/fsl-imx8qxp-mek.dts
index c14e1845a1d3bd7fe272c06bd7057c31bbaf8603..4f35fbe31dbf65e4f8e39a468d9f66c84a62990b 100644 (file)
--- a/arch/arm/dts/fsl-imx8qxp-mek.dts
+++ b/arch/arm/dts/fsl-imx8qxp-mek.dts
@@ -6,6 +6,7 @@
 /dts-v1/;
 
 #include "fsl-imx8qxp.dtsi"
+#include "fsl-imx8qxp-mek-u-boot.dtsi"
 
 / {
        model = "Freescale i.MX8QXP MEK";
@@ -16,18 +17,14 @@
                stdout-path = &lpuart0;
        };
 
-       regulators {
-               compatible = "simple-bus";
-
-               reg_usdhc2_vmmc: usdhc2-vmmc {
-                       compatible = "regulator-fixed";
-                       regulator-name = "SD1_SPWR";
-                       regulator-min-microvolt = <3000000>;
-                       regulator-max-microvolt = <3000000>;
-                       gpio = <&gpio4 19 GPIO_ACTIVE_HIGH>;
-                       off-on-delay = <3480>;
-                       enable-active-high;
-               };
+       reg_usdhc2_vmmc: regulator-usdhc2-vmmc {
+               compatible = "regulator-fixed";
+               regulator-name = "SD1_SPWR";
+               regulator-min-microvolt = <3000000>;
+               regulator-max-microvolt = <3000000>;
+               gpio = <&gpio4 19 GPIO_ACTIVE_HIGH>;
+               off-on-delay = <3480>;
+               enable-active-high;
        };
 };
 
@@ -227,6 +224,7 @@
        status = "okay";
        phy-reset-gpios = <&pca9557_a 4 GPIO_ACTIVE_LOW>;
        phy-reset-duration = <10>;
+       phy-reset-post-delay = <150>;
 
        mdio {
                #address-cells = <1>;