platform/x86: x86-android-tablets: Add generic_lipo_4v2_battery info
Hans de Goede
maintainerPATCH v2 1/2 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.
--- .../platform/x86/x86-android-tablets/asus.c | 21 +++---------------- .../x86/x86-android-tablets/shared-psy-info.c | 16 ++++++++++++++ .../x86/x86-android-tablets/shared-psy-info.h | 1 + 3 files changed, 20 insertions(+), 18 deletions(-)
drivers/platform/x86/x86-android-tablets/asus.c +3 -18
@@ -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
@@ -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
@@ -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;
Signature · 1 line
2.49.0
Hans de Goede
maintainerPATCH v2 2/2 platform/x86: x86-android-tablets: Add ovc-capacity-table info
Add ovc-capacity-table info to the generic battery nodes.
The values come from the ug3105 driver which currently hardcodes these values. The ug3105 driver will be modified to stop hardcoding this and instead get the values from device-properties.
---
Changes in v2:
- Remove final comma at the end of the table initialization
--- .../x86/x86-android-tablets/shared-psy-info.c | 60 +++++++++++++++++++ 1 file changed, 60 insertions(+)
drivers/platform/x86/x86-android-tablets/shared-psy-info.c +60 -0
@@ -39,6 +39,58 @@ const struct software_node fg_bq25890_supply_node = { .properties = fg_bq25890_supply_props, }; +static const u32 generic_lipo_battery_ovc_cap_celcius[] = {25 }; + +static const u32 generic_lipo_4v2_battery_ovc_cap_table0[] = { +4200000 ,100 , +4150000 ,95 , +4110000 ,90 , +4075000 ,85 , +4020000 ,80 , +3982500 ,75 , +3945000 ,70 , +3907500 ,65 , +3870000 ,60 , +3853333 ,55 , +3836667 ,50 , +3820000 ,45 , +3803333 ,40 , +3786667 ,35 , +3770000 ,30 , +3750000 ,25 , +3730000 ,20 , +3710000 ,15 , +3690000 ,10 , +3610000 ,5 , +3350000 ,0 +}; + +static const u32 generic_lipo_hv_4v35_battery_ovc_cap_table0[] = { +4300000 ,100 , +4250000 ,96 , +4200000 ,91 , +4150000 ,86 , +4110000 ,82 , +4075000 ,77 , +4020000 ,73 , +3982500 ,68 , +3945000 ,64 , +3907500 ,59 , +3870000 ,55 , +3853333 ,50 , +3836667 ,45 , +3820000 ,41 , +3803333 ,36 , +3786667 ,32 , +3770000 ,27 , +3750000 ,23 , +3730000 ,18 , +3710000 ,14 , +3690000 ,9 , +3610000 ,5 , +3350000 ,0 +}; +/* 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" ),
@@ -48,6 +100,10 @@ static const struct property_entry generic_lipo_4v2_battery_props[] = {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 ), +PROPERTY_ENTRY_U32_ARRAY ("ocv-capacity-celsius" , + generic_lipo_battery_ovc_cap_celcius), +PROPERTY_ENTRY_U32_ARRAY ("ocv-capacity-table-0" , + generic_lipo_4v2_battery_ovc_cap_table0), { } };
@@ -64,6 +120,10 @@ static const struct property_entry generic_lipo_hv_4v35_battery_props[] = {PROPERTY_ENTRY_U32 ("constant-charge-current-max-microamp" ,1856000 ),PROPERTY_ENTRY_U32 ("constant-charge-voltage-max-microvolt" ,4352000 ),PROPERTY_ENTRY_U32 ("factory-internal-resistance-micro-ohms" ,150000 ), +PROPERTY_ENTRY_U32_ARRAY ("ocv-capacity-celsius" , + generic_lipo_battery_ovc_cap_celcius), +PROPERTY_ENTRY_U32_ARRAY ("ocv-capacity-table-0" , + generic_lipo_hv_4v35_battery_ovc_cap_table0), { } };
Signature · 1 line
2.49.0
Hans de Goede
maintainerHi Ilpo,
This series seems to have fallen through the cracks ?
If you're waiting for a review, both patches already have a Reviewed-by from Andy given to the v1 series, this v2 just fixes a small nitpick from Andy's v1 review in patch 2/2.
And the matching ug3105 driver changes have already landed in:
https://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git/log/?h=for-next
Regards,
Hans
Quoted 100 lines · Hans de Goede
Move the
asus_tf103c_battery_nodetoshared-psy-info.cand rename it togeneric_lipo_4v2_battery_node.This is a preparation patch for adding ovc-capacity-table info to the battery nodes.
Reviewed-by Andy Shevchenko <[email protected]>Signed-off-by Hans de Goede <[email protected]>--- .../platform/x86/x86-android-tablets/asus.c | 21 +++---------------- .../x86/x86-android-tablets/shared-psy-info.c | 16 ++++++++++++++ .../x86/x86-android-tablets/shared-psy-info.h | 1 + 3 files changed, 20 insertions(+), 18 deletions(-)drivers/platform/x86/x86-android-tablets/asus.c +3
-18@@ -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@@ -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@@ -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;
Ilpo Järvinen
maintainerQuoted 3 lines · Hans de Goede
Hi Ilpo,
This series seems to have fallen through the cracks ?
Thanks for the heads up, it had indeed been marked as superceded in the patchwork for a reason I don't know, perhaps I had confused it with some other series or mismarked checkboxes in the interface.
I've restored its state now to New so I won't forget it again.
Signature · 1 line
i.
Quoted 115 lines
If you're waiting for a review, both patches already have a Reviewed-by from Andy given to the v1 series, this v2 just fixes a small nitpick from Andy's v1 review in patch 2/2.
And the matching ug3105 driver changes have already landed in:
https://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git/log/?h=for-nextRegards,
Hans
Quoted 100 lines · Hans de Goede
Move the
asus_tf103c_battery_nodetoshared-psy-info.cand rename it togeneric_lipo_4v2_battery_node.This is a preparation patch for adding ovc-capacity-table info to the battery nodes.
Reviewed-by Andy Shevchenko <[email protected]>Signed-off-by Hans de Goede <[email protected]>--- .../platform/x86/x86-android-tablets/asus.c | 21 +++---------------- .../x86/x86-android-tablets/shared-psy-info.c | 16 ++++++++++++++ .../x86/x86-android-tablets/shared-psy-info.h | 1 + 3 files changed, 20 insertions(+), 18 deletions(-)drivers/platform/x86/x86-android-tablets/asus.c +3
-18@@ -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@@ -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@@ -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;
Ilpo Järvinen
maintainerQuoted 8 lines · Hans de Goede
Move the
asus_tf103c_battery_nodetoshared-psy-info.cand rename it togeneric_lipo_4v2_battery_node.This is a preparation patch for adding ovc-capacity-table info to the battery nodes.
[...]
Thank you for your contribution, it has been applied to my local review-ilpo-next branch. Note it will show up in the public platform-drivers-x86/review-ilpo-next branch only once I've pushed my local branch there, which might take a while.
The list of commits applied:
[1/2] platform/x86: x86-android-tablets: Add generic_lipo_4v2_battery info
commit: a8fc1224f2318d3e5948671d1cad458e6372d921
[2/2] platform/x86: x86-android-tablets: Add ovc-capacity-table info
commit: be91bf40a96d567973d5c5e870d1464eb51b6c42--
i.