commit 65e0767b633e9902812658c65cfa470f0d81b219
author Linux Build Service Account <lnxbuild@localhost> Tue Mar 19 01:17:59 2013 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Tue Mar 19 01:17:58 2013 -0700
tree 1818464246a437e6ca4feba2029775018f7a33b8
parent c36f489f1e219c2d10cad359bbe58be2b4446864
parent e58c3f800aa4b2321c020157e32f73bfbbabd065

Merge "arm/dt: msm8974: disable battery interface peripheral"

arch/arm/boot/dts/msm8974-cdp.dtsi

diff --git a/arch/arm/boot/dts/msm8974-cdp.dtsi b/arch/arm/boot/dts/msm8974-cdp.dtsi
index 43a7c68..2c513e8 100644
--- a/arch/arm/boot/dts/msm8974-cdp.dtsi
+++ b/arch/arm/boot/dts/msm8974-cdp.dtsi
@@ -359,9 +359,6 @@
 &pm8941_chg {
 	status = "ok";
 
-	qcom,chg-charging-disabled;
-	qcom,chg-use-default-batt-values;
-
 	qcom,chg-chgr@1000 {
 		status = "ok";
 	};
@@ -370,10 +367,6 @@
 		status = "ok";
 	};
 
-	qcom,chg-bat-if@1200 {
-		status = "ok";
-	};
-
 	qcom,chg-usb-chgpth@1300 {
 		status = "ok";
 	};