Merge branch 'akpm' (patches from Andrew)

[sfrench/cifs-2.6.git] / arch / arm64 / boot / dts / allwinner / sun50i-a64-bananapi-m64.dts

diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts
index 9d0afd7d50eca23c1fbfbf58de74ead975106ff3..7793ebb5d2b83d8b7be5164e62d95bf984071bb2 100644 (file)
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts
@@ -222,6 +222,14 @@
 
 #include "axp803.dtsi"
 
+&ac_power_supply {
+       status = "okay";
+};
+
+&battery_power_supply {
+       status = "okay";
+};
+
 &reg_aldo1 {
        /*
         * This regulator also drives the PE pingroup GPIOs,