ARM: DTS: Re-sync logicpd-som-lv with Linux 4.16-rc3

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

diff --git a/arch/arm/dts/rk3399-puma.dtsi b/arch/arm/dts/rk3399-puma.dtsi
index 6d4dd84bf37e23a88d757b16907f9495e4b051f4..d2c961e31784d8bd8bb320407d3b84464a7e8ebd 100644 (file)
--- a/arch/arm/dts/rk3399-puma.dtsi
+++ b/arch/arm/dts/rk3399-puma.dtsi
@@ -16,6 +16,7 @@
                u-boot,mmc-env-offset = <0x4000>;      /* @  16KB */
                u-boot,efi-partition-entries-offset = <0x200000>; /* 2MB */
                u-boot,boot-led = "module_led";
+               sysreset-gpio = <&gpio1 RK_PA6 GPIO_ACTIVE_HIGH>;
        };
 
        chosen {
@@ -347,11 +348,11 @@
                                regulator-always-on;
                                regulator-boot-on;
                                regulator-min-microvolt = <1800000>;
-                               regulator-max-microvolt = <3300000>;
+                               regulator-max-microvolt = <3000000>;
                                regulator-name = "vcc_sd";
                                regulator-state-mem {
                                        regulator-on-in-suspend;
-                                       regulator-suspend-microvolt = <3300000>;
+                                       regulator-suspend-microvolt = <3000000>;
                                };
                        };
 
@@ -544,12 +545,17 @@
 
 &dwc3_typec1 {
        status = "okay";
+       tsd,usb-port-power = "usbhub_enable";
 };
 
 &vopb {
        status = "okay";
 };
 
+&gpio1 {
+       u-boot,dm-pre-reloc;
+};
+
 &gpio3 {
        u-boot,dm-pre-reloc;
 };