rockchip: dts: rk3399-puma: add 'same-as-spl' to the front of the boot-order

[u-boot] / arch / arm / dts / rk3399-puma.dtsi

diff --git a/arch/arm/dts/rk3399-puma.dtsi b/arch/arm/dts/rk3399-puma.dtsi
index 1aad6c508e41f5b25898a2452068f4b3c4d1aa72..f95c68e9f6e8b0b9c2a8f6c98a5a5767686444be 100644 (file)
--- a/arch/arm/dts/rk3399-puma.dtsi
+++ b/arch/arm/dts/rk3399-puma.dtsi
@@ -12,13 +12,16 @@
        compatible = "tsd,rk3399-q7", "tsd,puma", "rockchip,rk3399";
 
        config {
-               u-boot,spl-payload-offset = <0x40000>; /* 256kbyte */
+               u-boot,spl-payload-offset = <0x40000>; /* @ 256KB */
+               u-boot,mmc-env-offset = <0x4000>;      /* @  16KB */
+               u-boot,efi-partition-entries-offset = <0x200000>; /* 2MB */
                u-boot,boot-led = "module_led";
        };
 
        chosen {
                stdout-path = "serial0:115200n8";
-               u-boot,spl-boot-order = &spiflash, &sdhci, &sdmmc;
+               u-boot,spl-boot-order = \
+                       "same-as-spl", &spiflash, &sdhci, &sdmmc;
        };
 
        aliases {
@@ -87,6 +90,17 @@
                };
        };
 
+       usbhub_enable: usbhub_enable {
+               compatible = "regulator-fixed";
+               regulator-name = "usbhub_enable";
+               enable-active-low;
+               gpio = <&gpio4 3 GPIO_ACTIVE_HIGH>;
+               regulator-always-on;
+               regulator-boot-on;
+               regulator-min-microvolt = <3300000>;
+               regulator-max-microvolt = <3300000>;
+       };
+
        vccadc_ref: vccadc-ref {
                compatible = "regulator-fixed";
                regulator-name = "vcc1v8_sys";
@@ -512,7 +526,6 @@
 };
 
 &dwc3_typec1 {
-       rockchip,vbus-gpio = <&gpio4 3 GPIO_ACTIVE_LOW>;
        status = "okay";
 };