Unverified Commit a8fc1224 authored by Hans de Goede's avatar Hans de Goede Committed by Ilpo Järvinen
Browse files

platform/x86: x86-android-tablets: Add generic_lipo_4v2_battery info 



Move the asus_tf103c_battery_node to shared-psy-info.c and rename it to
generic_lipo_4v2_battery_node.

This is a preparation patch for adding ovc-capacity-table info to
the battery nodes.

Reviewed-by: default avatarAndy Shevchenko <andy@kernel.org>
Signed-off-by: default avatarHans de Goede <hansg@kernel.org>
Link: https://lore.kernel.org/r/20250609104620.25896-1-hansg@kernel.org


Reviewed-by: default avatarIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: default avatarIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
parent 73f0f2b5

drivers/platform/x86/x86-android-tablets/asus.c

+3 −18
Original line number Diff line number Diff line
@@ -206,24 +206,9 @@ static const struct software_node asus_tf103c_touchscreen_node = { 
	.properties = asus_tf103c_touchscreen_props,

};



static const struct property_entry asus_tf103c_battery_props[] = {

	PROPERTY_ENTRY_STRING("compatible", "simple-battery"),

	PROPERTY_ENTRY_STRING("device-chemistry", "lithium-ion-polymer"),

	PROPERTY_ENTRY_U32("precharge-current-microamp", 256000),

	PROPERTY_ENTRY_U32("charge-term-current-microamp", 128000),

	PROPERTY_ENTRY_U32("constant-charge-current-max-microamp", 2048000),

	PROPERTY_ENTRY_U32("constant-charge-voltage-max-microvolt", 4208000),

	PROPERTY_ENTRY_U32("factory-internal-resistance-micro-ohms", 150000),

	{ }

};



static const struct software_node asus_tf103c_battery_node = {

	.properties = asus_tf103c_battery_props,

};



static const struct property_entry asus_tf103c_bq24190_props[] = {

	PROPERTY_ENTRY_STRING_ARRAY_LEN("supplied-from", tusb1211_chg_det_psy, 1),

	PROPERTY_ENTRY_REF("monitored-battery", &asus_tf103c_battery_node),

	PROPERTY_ENTRY_REF("monitored-battery", &generic_lipo_4v2_battery_node),

	PROPERTY_ENTRY_U32("ti,system-minimum-microvolt", 3600000),

	PROPERTY_ENTRY_BOOL("omit-battery-class"),

	PROPERTY_ENTRY_BOOL("disable-reset"),
@@ -236,7 +221,7 @@ static const struct software_node asus_tf103c_bq24190_node = { 


static const struct property_entry asus_tf103c_ug3105_props[] = {

	PROPERTY_ENTRY_STRING_ARRAY_LEN("supplied-from", bq24190_psy, 1),

	PROPERTY_ENTRY_REF("monitored-battery", &asus_tf103c_battery_node),

	PROPERTY_ENTRY_REF("monitored-battery", &generic_lipo_4v2_battery_node),

	PROPERTY_ENTRY_U32("upisemi,rsns-microohm", 5000),

	{ }

};
@@ -321,6 +306,6 @@ const struct x86_dev_info asus_tf103c_info __initconst = { 
	.gpio_button = &asus_me176c_tf103c_lid,

	.gpio_button_count = 1,

	.gpiod_lookup_tables = asus_tf103c_gpios,

	.bat_swnode = &asus_tf103c_battery_node,

	.bat_swnode = &generic_lipo_4v2_battery_node,

	.modules = bq24190_modules,

};

drivers/platform/x86/x86-android-tablets/shared-psy-info.c

+16 −0
Original line number Diff line number Diff line
@@ -39,6 +39,22 @@ const struct software_node fg_bq25890_supply_node = { 
	.properties = fg_bq25890_supply_props,

};



/* Standard LiPo (max 4.2V) settings used by most devs with a LiPo battery */

static const struct property_entry generic_lipo_4v2_battery_props[] = {

	PROPERTY_ENTRY_STRING("compatible", "simple-battery"),

	PROPERTY_ENTRY_STRING("device-chemistry", "lithium-ion-polymer"),

	PROPERTY_ENTRY_U32("precharge-current-microamp", 256000),

	PROPERTY_ENTRY_U32("charge-term-current-microamp", 128000),

	PROPERTY_ENTRY_U32("constant-charge-current-max-microamp", 2048000),

	PROPERTY_ENTRY_U32("constant-charge-voltage-max-microvolt", 4208000),

	PROPERTY_ENTRY_U32("factory-internal-resistance-micro-ohms", 150000),

	{ }

};



const struct software_node generic_lipo_4v2_battery_node = {

	.properties = generic_lipo_4v2_battery_props,

};



/* LiPo HighVoltage (max 4.35V) settings used by most devs with a HV battery */

static const struct property_entry generic_lipo_hv_4v35_battery_props[] = {

	PROPERTY_ENTRY_STRING("compatible", "simple-battery"),

drivers/platform/x86/x86-android-tablets/shared-psy-info.h

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ extern const char * const bq25890_psy[]; 


extern const struct software_node fg_bq24190_supply_node;

extern const struct software_node fg_bq25890_supply_node;

extern const struct software_node generic_lipo_4v2_battery_node;

extern const struct software_node generic_lipo_hv_4v35_battery_node;



extern struct bq24190_platform_data bq24190_pdata;