Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c97de0e0 authored by Fairphone ODM's avatar Fairphone ODM Committed by android-t1
Browse files

[1 of 2][10277827]modify charging driver 

 ###%%%comment:[1 of 2]modify charging driver
 ###%%%bug number:10277827
 ###%%%product name:n10
 ###%%%root cause:Coding
 ###%%%Bug category:T2M
 ###%%%regression response:NO
 ###%%%regression comments:
 ###%%%Module_Impact:kernel
 ###%%%Test_Suggestion:device can be charged
 ###%%%Solution:porting tct common charge driver
 ###%%%Test_Report:ok
 ###%%%VAL Can Test:No

Change-Id: I47330b3d1bda501eea0bf39ce89b563f20412609
parent 5559bb8f

arch/arm64/configs/vendor/n10-perf_defconfig

+17 −13
Original line number Original line Diff line number Diff line
@@ -376,8 +376,8 @@ CONFIG_POWER_RESET_QCOM=y 
CONFIG_POWER_RESET_XGENE=y

CONFIG_POWER_RESET_XGENE=y

CONFIG_POWER_RESET_SYSCON=y

CONFIG_POWER_RESET_SYSCON=y

CONFIG_QPNP_SMB5=y

CONFIG_QPNP_SMB5=y

CONFIG_SMB1390_CHARGE_PUMP_PSY=y

CONFIG_SMB1390_CHARGE_PUMP_PSY=n

CONFIG_SMB1355_SLAVE_CHARGER=y

CONFIG_SMB1355_SLAVE_CHARGER=n

CONFIG_QPNP_QG=y

CONFIG_QPNP_QG=y

CONFIG_SMB1398_CHARGER=y

CONFIG_SMB1398_CHARGER=y

CONFIG_THERMAL=y

CONFIG_THERMAL=y
@@ -452,22 +452,22 @@ CONFIG_HID_SONY=y 
CONFIG_USB_HIDDEV=y

CONFIG_USB_HIDDEV=y

CONFIG_USB_ANNOUNCE_NEW_DEVICES=y

CONFIG_USB_ANNOUNCE_NEW_DEVICES=y

CONFIG_USB_XHCI_HCD=y

CONFIG_USB_XHCI_HCD=y

CONFIG_USB_EHCI_HCD=y

CONFIG_USB_EHCI_HCD=n

CONFIG_USB_EHCI_HCD_PLATFORM=y

CONFIG_USB_EHCI_HCD_PLATFORM=n

CONFIG_USB_OHCI_HCD=y

CONFIG_USB_OHCI_HCD=n

CONFIG_USB_OHCI_HCD_PLATFORM=y

CONFIG_USB_OHCI_HCD_PLATFORM=n

CONFIG_USB_STORAGE=y

CONFIG_USB_STORAGE=y

CONFIG_USB_DWC3=y

CONFIG_USB_DWC3=y

CONFIG_USB_DWC3_MSM=y

CONFIG_USB_DWC3_MSM=y

CONFIG_USB_ISP1760=y

CONFIG_USB_ISP1760=n

CONFIG_USB_ISP1760_HOST_ROLE=y

CONFIG_USB_ISP1760_HOST_ROLE=n

CONFIG_USB_EHSET_TEST_FIXTURE=y

CONFIG_USB_EHSET_TEST_FIXTURE=y

CONFIG_USB_LINK_LAYER_TEST=y

CONFIG_USB_LINK_LAYER_TEST=y

CONFIG_NOP_USB_XCEIV=y

CONFIG_NOP_USB_XCEIV=y

CONFIG_USB_MSM_SSPHY_QMP=y

CONFIG_USB_MSM_SSPHY_QMP=n

CONFIG_MSM_QUSB_PHY=y

CONFIG_MSM_QUSB_PHY=y

CONFIG_MSM_HSUSB_PHY=y

CONFIG_MSM_HSUSB_PHY=n

CONFIG_USB_QCOM_EMU_PHY=y

CONFIG_USB_QCOM_EMU_PHY=n

CONFIG_USB_GADGET=y

CONFIG_USB_GADGET=y

CONFIG_USB_GADGET_VBUS_DRAW=900

CONFIG_USB_GADGET_VBUS_DRAW=900

CONFIG_USB_CONFIGFS=y

CONFIG_USB_CONFIGFS=y
@@ -590,7 +590,7 @@ CONFIG_MSM_SYSMON_QMI_COMM=y 
CONFIG_MSM_PIL_SSR_GENERIC=y

CONFIG_MSM_PIL_SSR_GENERIC=y

CONFIG_MSM_BOOT_STATS=y

CONFIG_MSM_BOOT_STATS=y

CONFIG_QCOM_DCC_V2=y

CONFIG_QCOM_DCC_V2=y

CONFIG_QCOM_EUD=y

CONFIG_QCOM_EUD=n

CONFIG_QCOM_MINIDUMP=y

CONFIG_QCOM_MINIDUMP=y

CONFIG_QCOM_FSA4480_I2C=y

CONFIG_QCOM_FSA4480_I2C=y

CONFIG_QCOM_WATCHDOG_V2=y

CONFIG_QCOM_WATCHDOG_V2=y
@@ -716,3 +716,7 @@ CONFIG_T2M_SND_MBHC=y 
CONFIG_T2M_SND_HPH_SWITCH=y

CONFIG_T2M_SND_HPH_SWITCH=y

CONFIG_T2M_SND_N10=y

CONFIG_T2M_SND_N10=y

#[T2MNB_BSP] audio end

#[T2MNB_BSP] audio end

CONFIG_TCT_CHG_AUTOTEST=y

CONFIG_TCT_PM7250_COMMON=y

CONFIG_USB_PD_LOG_LVL=1

arch/arm64/configs/vendor/n10_defconfig

+15 −12
Original line number Original line Diff line number Diff line
@@ -384,8 +384,8 @@ CONFIG_POWER_RESET_QCOM=y 
CONFIG_POWER_RESET_XGENE=y

CONFIG_POWER_RESET_XGENE=y

CONFIG_POWER_RESET_SYSCON=y

CONFIG_POWER_RESET_SYSCON=y

CONFIG_QPNP_SMB5=y

CONFIG_QPNP_SMB5=y

CONFIG_SMB1390_CHARGE_PUMP_PSY=y

CONFIG_SMB1390_CHARGE_PUMP_PSY=n

CONFIG_SMB1355_SLAVE_CHARGER=y

CONFIG_SMB1355_SLAVE_CHARGER=n

CONFIG_QPNP_QG=y

CONFIG_QPNP_QG=y

CONFIG_SMB1398_CHARGER=y

CONFIG_SMB1398_CHARGER=y

CONFIG_THERMAL=y

CONFIG_THERMAL=y
@@ -460,22 +460,22 @@ CONFIG_HID_SONY=y 
CONFIG_USB_HIDDEV=y

CONFIG_USB_HIDDEV=y

CONFIG_USB_ANNOUNCE_NEW_DEVICES=y

CONFIG_USB_ANNOUNCE_NEW_DEVICES=y

CONFIG_USB_XHCI_HCD=y

CONFIG_USB_XHCI_HCD=y

CONFIG_USB_EHCI_HCD=y

CONFIG_USB_EHCI_HCD=n

CONFIG_USB_EHCI_HCD_PLATFORM=y

CONFIG_USB_EHCI_HCD_PLATFORM=n

CONFIG_USB_OHCI_HCD=y

CONFIG_USB_OHCI_HCD=n

CONFIG_USB_OHCI_HCD_PLATFORM=y

CONFIG_USB_OHCI_HCD_PLATFORM=n

CONFIG_USB_STORAGE=y

CONFIG_USB_STORAGE=y

CONFIG_USB_DWC3=y

CONFIG_USB_DWC3=y

CONFIG_USB_DWC3_MSM=y

CONFIG_USB_DWC3_MSM=y

CONFIG_USB_ISP1760=y

CONFIG_USB_ISP1760=n

CONFIG_USB_ISP1760_HOST_ROLE=y

CONFIG_USB_ISP1760_HOST_ROLE=n

CONFIG_USB_EHSET_TEST_FIXTURE=y

CONFIG_USB_EHSET_TEST_FIXTURE=y

CONFIG_USB_LINK_LAYER_TEST=y

CONFIG_USB_LINK_LAYER_TEST=y

CONFIG_NOP_USB_XCEIV=y

CONFIG_NOP_USB_XCEIV=y

CONFIG_USB_MSM_SSPHY_QMP=y

CONFIG_USB_MSM_SSPHY_QMP=n

CONFIG_MSM_QUSB_PHY=y

CONFIG_MSM_QUSB_PHY=y

CONFIG_MSM_HSUSB_PHY=y

CONFIG_MSM_HSUSB_PHY=n

CONFIG_USB_QCOM_EMU_PHY=y

CONFIG_USB_QCOM_EMU_PHY=n

CONFIG_USB_GADGET=y

CONFIG_USB_GADGET=y

CONFIG_USB_GADGET_VBUS_DRAW=900

CONFIG_USB_GADGET_VBUS_DRAW=900

CONFIG_USB_CONFIGFS=y

CONFIG_USB_CONFIGFS=y
@@ -608,7 +608,7 @@ CONFIG_MSM_SYSMON_QMI_COMM=y 
CONFIG_MSM_PIL_SSR_GENERIC=y

CONFIG_MSM_PIL_SSR_GENERIC=y

CONFIG_MSM_BOOT_STATS=y

CONFIG_MSM_BOOT_STATS=y

CONFIG_QCOM_DCC_V2=y

CONFIG_QCOM_DCC_V2=y

CONFIG_QCOM_EUD=y

CONFIG_QCOM_EUD=n

CONFIG_QCOM_MINIDUMP=y

CONFIG_QCOM_MINIDUMP=y

CONFIG_MSM_CORE_HANG_DETECT=y

CONFIG_MSM_CORE_HANG_DETECT=y

CONFIG_MSM_GLADIATOR_HANG_DETECT=y

CONFIG_MSM_GLADIATOR_HANG_DETECT=y
@@ -784,3 +784,6 @@ CONFIG_T2M_SND_HPH_SWITCH=y 
CONFIG_T2M_SND_N10=y

CONFIG_T2M_SND_N10=y

#[T2MNB_BSP] audio end

#[T2MNB_BSP] audio end





CONFIG_TCT_CHG_AUTOTEST=y

CONFIG_TCT_PM7250_COMMON=y

CONFIG_USB_PD_LOG_LVL=1

drivers/iio/adc/qcom-vadc-common.c

+74 −0
Original line number Original line Diff line number Diff line
@@ -247,6 +247,78 @@ static const struct vadc_map_pt adcmap_batt_therm_100k_6125[] = { 
 * Alium.

 * Alium.

 */

 */

static const struct vadc_map_pt adcmap_batt_therm_30k[] = {

static const struct vadc_map_pt adcmap_batt_therm_30k[] = {

#if defined(CONFIG_TCT_PM7250_COMMON)

	{1673,	-400},

	{1649,	-380},

	{1623,	-360},

	{1596,	-340},

	{1566,	-320},

	{1535,	-300},

	{1502,	-280},

	{1467,	-260},

	{1430,	-240},

	{1392,	-220},

	{1352,	-200},

	{1311,	-180},

	{1269,	-160},

	{1226,	-140},

	{1182,	-120},

	{1138,	-100},

	{1093,	-80},

	{1049,	-60},

	{1004,	-40},

	{960,	-20},

	{917,	0},

	{874,	20},

	{832,	40},

	{791,	60},

	{752,	80},

	{713,	100},

	{676,	120},

	{640,	140},

	{606,	160},

	{573,	180},

	{541,	200},

	{511,	220},

	{483,	240},

	{455,	260},

	{430,	280},

	{405,	300},

	{382,	320},

	{360,	340},

	{340,	360},

	{320,	380},

	{302,	400},

	{285,	420},

	{269,	440},

	{253,	460},

	{239,	480},

	{225,	500},

	{213,	520},

	{201,	540},

	{190,	560},

	{179,	580},

	{169,	600},

	{160,	620},

	{152,	640},

	{143,	660},

	{136,	680},

	{128,	700},

	{122,	720},

	{115,	740},

	{109,	760},

	{104,	780},

	{98,	800},

	{93,	820},

	{89,	840},

	{84,	860},

	{80,	880},

	{76,	900},

	{73,	920},

	{69,	940},

	{66,	960},

	{63,	980}

#else

	{1864,	-400},

	{1864,	-400},

	{1863,	-380},

	{1863,	-380},

	{1861,	-360},

	{1861,	-360},
@@ -317,6 +389,7 @@ static const struct vadc_map_pt adcmap_batt_therm_30k[] = { 
	{349,	940},

	{349,	940},

	{332,	960},

	{332,	960},

	{315,	980}

	{315,	980}

#endif

};

};





/*

/*
@@ -1113,6 +1186,7 @@ static int qcom_vadc_scale_hw_calib_batt_therm_30( 




	/* (ADC code * vref_vadc (1.875V)) / full_scale_code */

	/* (ADC code * vref_vadc (1.875V)) / full_scale_code */

	voltage = (s64) adc_code * adc_vdd_ref_mv * 1000;

	voltage = (s64) adc_code * adc_vdd_ref_mv * 1000;

	

	voltage = div64_s64(voltage, (data->full_scale_code_volt

	voltage = div64_s64(voltage, (data->full_scale_code_volt

								* 1000));

								* 1000));

drivers/of/of_batterydata.c

+10 −0
Original line number Original line Diff line number Diff line
@@ -371,6 +371,16 @@ struct device_node *of_batterydata_get_best_profile( 




	if (best_node == NULL) {

	if (best_node == NULL) {

		pr_err("No battery data found\n");

		pr_err("No battery data found\n");

#if defined(CONFIG_TCT_PM7250_COMMON)

		for_each_child_of_node(batterydata_container_node, node)

		{

			if(of_property_read_bool(node,"qcom,default-battery-type"))

			{

				best_node = node;

				break;

			}

		}

#endif

		return best_node;

		return best_node;

	}

	}

drivers/power/supply/power_supply_core.c

+5 −0
Original line number Original line Diff line number Diff line
@@ -122,7 +122,12 @@ void power_supply_changed(struct power_supply *psy) 
	psy->changed = true;

	psy->changed = true;

	pm_stay_awake(&psy->dev);

	pm_stay_awake(&psy->dev);

	spin_unlock_irqrestore(&psy->changed_lock, flags);

	spin_unlock_irqrestore(&psy->changed_lock, flags);



#if defined(CONFIG_TCT_PM7250_COMMON)

	queue_work(private_chg_wq, &psy->changed_work);

#else

	schedule_work(&psy->changed_work);

	schedule_work(&psy->changed_work);

#endif

}

}

EXPORT_SYMBOL_GPL(power_supply_changed);

EXPORT_SYMBOL_GPL(power_supply_changed);