Fix Makefile paths and power supply type
To match eos 5.15 branch.
Bug: 263277551
Change-Id: I2eec7a58d0df4948a0f40904c6e8f4f0b018f0f7
diff --git a/Makefile b/Makefile
index fd5d8d7..4a6ee5a 100644
--- a/Makefile
+++ b/Makefile
@@ -125,7 +125,7 @@
M ?= $(shell pwd)
subdir-ccflags-y += \
- -I$(KERNEL_SRC)/../private/google-modules/bms \
+ -I$(KERNEL_SRC)/../google-modules/bms \
KBUILD_OPTIONS += $(foreach m,$(GBMS_MODULES),CONFIG_$(m)=m )
@@ -139,8 +139,9 @@
EXTRA_CFLAGS="$(EXTRA_CFLAGS)" \
$(@)
-EXTRA_SYMBOLS += $(OUT_DIR)/../private/google-modules/bms/misc/Module.symvers
-include $(KERNEL_SRC)/../private/google-modules/soc/gs/Makefile.include
+EXTRA_SYMBOLS += $(OUT_DIR)/../google-modules/bms/misc/Module.symvers
+EXTRA_SYMBOLS += $(OUT_DIR)/../msm-google/drivers/power/supply/qcom/Module.symvers
+include $(KERNEL_SRC)/../google-modules/soc/msm/Makefile.include
modules modules_install clean:
$(MAKE) -C $(KERNEL_SRC) M=$(M) W=1 \
diff --git a/sw5100_bms.c b/sw5100_bms.c
index 0aa8fcb..30324c6 100644
--- a/sw5100_bms.c
+++ b/sw5100_bms.c
@@ -572,7 +572,7 @@
chg_type = POWER_SUPPLY_CHARGE_TYPE_FAST;
break;
case SW5100_TAPER_CHARGE:
- chg_type = POWER_SUPPLY_CHARGE_TYPE_TAPER;
+ chg_type = POWER_SUPPLY_CHARGE_TYPE_TAPER_EXT;
break;
default:
chg_type = POWER_SUPPLY_CHARGE_TYPE_NONE;
