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 branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
sun8i-a83t-bananapi-m3.dts
diff --git
a/arch/arm/boot/dts/sun8i-a83t-bananapi-m3.dts
b/arch/arm/boot/dts/sun8i-a83t-bananapi-m3.dts
index 7d30d3e530fb03be7f10050ff251398d400c6dd7..838be7b3715fc07de9ed33b0907108e466a0f7c9 100644
(file)
--- a/
arch/arm/boot/dts/sun8i-a83t-bananapi-m3.dts
+++ b/
arch/arm/boot/dts/sun8i-a83t-bananapi-m3.dts
@@
-237,6
+237,14
@@
#include "axp81x.dtsi"
+&ac_power_supply {
+ status = "okay";
+};
+
+&battery_power_supply {
+ status = "okay";
+};
+
®_aldo1 {
regulator-always-on;
regulator-min-microvolt = <1800000>;