git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'v4.18-rc2' of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
rk3288-veyron-chromebook.dtsi
diff --git
a/arch/arm/boot/dts/rk3288-veyron-chromebook.dtsi
b/arch/arm/boot/dts/rk3288-veyron-chromebook.dtsi
index be487111d0252ece0b27c324dab7a1b2bad94b95..b16d570ff029b74da108fa1df3d0d60e1c314953 100644
(file)
--- a/
arch/arm/boot/dts/rk3288-veyron-chromebook.dtsi
+++ b/
arch/arm/boot/dts/rk3288-veyron-chromebook.dtsi
@@
-95,7
+95,8
@@
pinctrl-names = "default";
pinctrl-0 = <&bl_en>;
pwms = <&pwm0 0 1000000 0>;
- pwm-delay-us = <10000>;
+ post-pwm-on-delay-ms = <10>;
+ pwm-off-delay-ms = <10>;
};
gpio-charger {