Merge tag 'dlm-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm

[karo-tx-linux.git] / arch / arm / boot / dts / rk3288-firefly.dtsi

diff --git a/arch/arm/boot/dts/rk3288-firefly.dtsi b/arch/arm/boot/dts/rk3288-firefly.dtsi
index 0b42372e437944f2ed4ffeff249dbaabec1543a8..20fa0ef0b96b8cd7523ca5f599f57e20f45c1ba3 100644 (file)
--- a/arch/arm/boot/dts/rk3288-firefly.dtsi
+++ b/arch/arm/boot/dts/rk3288-firefly.dtsi
@@ -44,6 +44,7 @@
 
 / {
        memory {
+               device_type = "memory";
                reg = <0 0x80000000>;
        };
 
@@ -213,6 +214,8 @@
                regulator-max-microvolt = <1350000>;
                regulator-always-on;
                regulator-boot-on;
+               regulator-enable-ramp-delay = <300>;
+               regulator-ramp-delay = <8000>;
                vin-supply = <&vcc_sys>;
        };