summaryrefslogtreecommitdiff
authorXiaoliang Wang <xiaoliang.wang@amlogic.com>2018-10-25 11:49:39 (GMT)
committer Gerrit Code Review <gituser@droid04>2018-10-25 11:49:39 (GMT)
commitcff9cefdc3d5249c364fc6d1a235aa804e534666 (patch)
tree9c3269448b172965b4ae08eb4139196322f0d00b
parent686d817a2e10fee8c2bc600bc4f5879d84cbee8c (diff)
parentfb184eb622759cb94270ee7162e8309ec1c8bb49 (diff)
downloadcommon-cff9cefdc3d5249c364fc6d1a235aa804e534666.zip
common-cff9cefdc3d5249c364fc6d1a235aa804e534666.tar.gz
common-cff9cefdc3d5249c364fc6d1a235aa804e534666.tar.bz2
Merge "Revert "power: battery add dummy battery driver [1/1]"" into p-amlogic
Diffstat
-rw-r--r--arch/arm64/boot/dts/amlogic/atom.dts10
1 files changed, 0 insertions, 10 deletions
diff --git a/arch/arm64/boot/dts/amlogic/atom.dts b/arch/arm64/boot/dts/amlogic/atom.dts
index 63fa69b..cc86812 100644
--- a/arch/arm64/boot/dts/amlogic/atom.dts
+++ b/arch/arm64/boot/dts/amlogic/atom.dts
@@ -633,16 +633,6 @@
reg_23cf = <0x88188832>;
};
- dummy-battery {
- compatible = "amlogic, dummy-battery";
- status = "okay";
- };
-
- dummy-charger {
- compatible = "amlogic, dummy-charger";
- status = "okay";
- };
-
bt-dev {
compatible = "amlogic, bt-dev";
dev_name = "bt-dev";