diff options
author | Mark Brown <broonie@kernel.org> | 2018-12-21 13:43:32 +0000 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2018-12-21 13:43:32 +0000 |
commit | b27d9668be60d42904b71ab1a9e4d152c7b5c920 (patch) | |
tree | 62c1b3e52abb5b60cc19a2a772b005e9f00b814b /arch/arm/boot | |
parent | 67a2ab931e9f79f516566e69c92e566b71fb20d1 (diff) | |
parent | cd07e3701fa6a4c68f8493ee1d12caa18d46ec6a (diff) | |
download | linux-b27d9668be60d42904b71ab1a9e4d152c7b5c920.tar.bz2 |
Merge branch 'regulator-4.21' into regulator-next
Diffstat (limited to 'arch/arm/boot')
-rw-r--r-- | arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts b/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts index b828677f331d..ffafe9720b35 100644 --- a/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts +++ b/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts @@ -245,6 +245,8 @@ regulator-min-microvolt = <2800000>; regulator-max-microvolt = <2800000>; regulator-name = "vddio-csi0"; + regulator-soft-start; + regulator-ramp-delay = <1600>; }; ®_ldo4 { |