msm8996-common: Update charger configuration

msm8996-common: Attempt to fix offline charging

DD3Boh: Adapt to Oreo

Signed-off-by: Davide Garberi <dade.garberi@gmail.com>

msm8996-common: rootdir: Drop qbcharger

* Quickboot is no longer in 14.1, and even if it was we would still
   need proprietary blobs to make it work.

Change-Id: I918d5b5e7a493251bce333c354ee2c1a69c62dee
Signed-off-by: Michael Sky <electrydev@gmail.com>
Signed-off-by: Davide Garberi <dade.garberi@gmail.com>

msm8996-common: rootdir: Update charger configuration

Signed-off-by: Davide Garberi <dade.garberi@gmail.com>

msm8996-common: rootdir: Move charger to init.qcom.power.rc and fix its groups.

  * The same change it's already in several devices and it
  fixes issues with offline charging.

Signed-off-by: Davide Garberi <dade.garberi@gmail.com>

6 files changed, 24 insertions, 45 deletions

diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index 15d9c05..8d361c0 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -110,7 +110,13 @@ QCOM_BT_USE_BTNV := true
 # Charger
 BOARD_CHARGER_ENABLE_SUSPEND := true
 BOARD_CHARGER_DISABLE_INIT_BLANK := true
-WITH_LINEAGE_CHARGER := false
+BOARD_CHARGING_CMDLINE_NAME  := "androidboot.mode"
+BOARD_CHARGING_CMDLINE_VALUE := "usb_chg"
+BACKLIGHT_PATH := "/sys/class/leds/lcd-backlight/brightness"
+BLINK_PATH     := "/sys/class/leds/led:rgb_red/blink"
+RED_LED_PATH   := "/sys/class/leds/led:rgb_red/brightness"
+GREEN_LED_PATH := "/sys/class/leds/led:rgb_green/brightness"
+BLUE_LED_PATH  := "/sys/class/leds/led:rgb_blue/brightness"
 
 # CNE and DPM
 BOARD_USES_QCNE := true
diff --git a/hidl.mk b/hidl.mk
index cef119b..5fc9cd2 100644
--- a/hidl.mk
+++ b/hidl.mk
@@ -68,12 +68,6 @@ PRODUCT_PACKAGES += \
     android.hardware.gatekeeper@1.0-impl \
     android.hardware.gatekeeper@1.0-service
 
-# Health
-PRODUCT_PACKAGES += \
-    android.hardware.health@1.0-impl \
-    android.hardware.health@1.0-convert \
-    android.hardware.health@1.0-service
-
 # HIDL
 PRODUCT_PACKAGES += \
     android.hidl.manager@1.0-java
diff --git a/manifest.xml b/manifest.xml
index 4009946..6a8f95a 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -122,15 +122,6 @@
         </interface>
     </hal>
     <hal format="hidl">
-        <name>android.hardware.health</name>
-        <transport>hwbinder</transport>
-        <version>1.0</version>
-        <interface>
-            <name>IHealth</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-    <hal format="hidl">
         <name>android.hardware.keymaster</name>
         <transport>hwbinder</transport>
         <version>3.0</version>
diff --git a/rootdir/etc/init.qcom.power.rc b/rootdir/etc/init.qcom.power.rc
index ad17e00..3fa9b90 100755
--- a/rootdir/etc/init.qcom.power.rc
+++ b/rootdir/etc/init.qcom.power.rc
@@ -18,9 +18,17 @@ on boot
     # Enable sched boost
     write /proc/sys/kernel/sched_boost 1
 
+on charger
+    write /sys/module/lpm_levels/parameters/sleep_disabled 0
+    write /sys/devices/system/cpu/cpu2/online 0
+    write /sys/devices/system/cpu/cpu3/online 0
+    write /sys/module/msm_thermal/parameters/enabled "N"
+    write /sys/module/msm_thermal/core_control/cpus_offlined 14
+    write /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor "powersave"
+
 on enable-low-power
     # Disable thermal hotplug to switch governor
-	
+
     write /sys/module/msm_thermal/core_control/enabled 0
 
     # Enable Adaptive LMK
@@ -118,13 +126,11 @@ on enable-low-power
     write /proc/sys/vm/dirty_expire_centisecs 10
     write /proc/sys/vm/vfs_cache_pressure 5
 
-on charger
-    write /sys/module/msm_thermal/core_control/cpus_offlined 14
-    write /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor "powersave"
-    write /sys/devices/system/cpu/cpu1/online 0
-    write /sys/devices/system/cpu/cpu2/online 0
-    write /sys/devices/system/cpu/cpu3/online 0
-    write /sys/module/lpm_levels/parameters/sleep_disabled 0
+service charger /charger
+    class charger
+    group log system graphics
+    seclabel u:r:charger:s0
+    writepid /dev/cpuset/system-background/tasks
 
 on property:init.svc.recovery=running
     trigger enable-low-power
diff --git a/rootdir/etc/init.qcom.rc b/rootdir/etc/init.qcom.rc
index 5c579cc..a42146f 100755
--- a/rootdir/etc/init.qcom.rc
+++ b/rootdir/etc/init.qcom.rc
@@ -1073,12 +1073,6 @@ service profiler_daemon /system/bin/profiler_daemon
     group root
     disabled
 
-service charger /charger
-    class charger
-    group system graphics
-    seclabel u:r:charger:s0
-    writepid /dev/cpuset/system-background/tasks
-
 service ssr_diag /system/bin/ssr_diag
     class late_start
     user system
@@ -1096,21 +1090,6 @@ on property:persist.usb.hvdcp.detect=true
 on property:persist.usb.hvdcp.detect=false
     stop hvdcp
 
-service charger_monitor /system/bin/charger_monitor
-    user root
-    group root
-    disabled
-
-service qbcharger /charger -m 1
-    disabled
-    oneshot
-
-on property:sys.qbcharger.enable=true
-    start qbcharger
-
-on property:sys.qbcharger.enable=false
-    stop qbcharger
-
 service diag_mdlog_start /system/bin/diag_mdlog -c
     class late_start
     user shell
diff --git a/system.prop b/system.prop
index 16de385..b6c9ac5 100644
--- a/system.prop
+++ b/system.prop
@@ -33,6 +33,9 @@ persist.camera.video.ubwc=0
 ro.persist.qcapb=1
 camera.disable_zsl_mode=1
 
+# Charger
+ro.enable_boot_charger_mode=1 
+
 # CNE
 persist.cne.feature=1