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 'acpi-5.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
sun8i-a83t-cubietruck-plus.dts
diff --git
a/arch/arm/boot/dts/sun8i-a83t-cubietruck-plus.dts
b/arch/arm/boot/dts/sun8i-a83t-cubietruck-plus.dts
index a5a9f5a0603e78efa761ee02179a37ea263dd274..fcbec3d7ccd78461a167edeb59e93e03a5cdfe7b 100644
(file)
--- a/
arch/arm/boot/dts/sun8i-a83t-cubietruck-plus.dts
+++ b/
arch/arm/boot/dts/sun8i-a83t-cubietruck-plus.dts
@@
-247,6
+247,14
@@
#include "axp81x.dtsi"
+&ac_power_supply {
+ status = "okay";
+};
+
+&battery_power_supply {
+ status = "okay";
+};
+
®_aldo1 {
regulator-always-on;
regulator-min-microvolt = <1800000>;