Commit 364ea7cc authored by Hans de Goede's avatar Hans de Goede Committed by Sebastian Reichel
Browse files

power: supply: Change usb_types from an array into a bitmask 



The bit_types array just hold a list of valid enum power_supply_usb_type
values which map to 0 - 9. This can easily be represented as a bitmap.

This reduces the size of struct power_supply_desc and further reduces
the data section size by drivers no longer needing to store the array.

This also unifies how usb_types are handled with charge_behaviours,
which allows power_supply_show_usb_type() to be removed.

Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Reviewed-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Link: https://lore.kernel.org/r/20240831142039.28830-7-hdegoede@redhat.com


Signed-off-by: default avatarSebastian Reichel <sebastian.reichel@collabora.com>
parent 322900ac

drivers/extcon/extcon-intel-cht-wc.c

+5 −10
Original line number Diff line number Diff line
@@ -461,14 +461,6 @@ static int cht_wc_extcon_psy_get_prop(struct power_supply *psy, 
	return 0;

}



static const enum power_supply_usb_type cht_wc_extcon_psy_usb_types[] = {

	POWER_SUPPLY_USB_TYPE_SDP,

	POWER_SUPPLY_USB_TYPE_CDP,

	POWER_SUPPLY_USB_TYPE_DCP,

	POWER_SUPPLY_USB_TYPE_ACA,

	POWER_SUPPLY_USB_TYPE_UNKNOWN,

};



static const enum power_supply_property cht_wc_extcon_psy_props[] = {

	POWER_SUPPLY_PROP_USB_TYPE,

	POWER_SUPPLY_PROP_ONLINE,
@@ -477,8 +469,11 @@ static const enum power_supply_property cht_wc_extcon_psy_props[] = { 
static const struct power_supply_desc cht_wc_extcon_psy_desc = {

	.name = "cht_wcove_pwrsrc",

	.type = POWER_SUPPLY_TYPE_USB,

	.usb_types = cht_wc_extcon_psy_usb_types,

	.num_usb_types = ARRAY_SIZE(cht_wc_extcon_psy_usb_types),

	.usb_types = BIT(POWER_SUPPLY_USB_TYPE_SDP) |

		     BIT(POWER_SUPPLY_USB_TYPE_CDP) |

		     BIT(POWER_SUPPLY_USB_TYPE_DCP) |

		     BIT(POWER_SUPPLY_USB_TYPE_ACA) |

		     BIT(POWER_SUPPLY_USB_TYPE_UNKNOWN),

	.properties = cht_wc_extcon_psy_props,

	.num_properties = ARRAY_SIZE(cht_wc_extcon_psy_props),

	.get_property = cht_wc_extcon_psy_get_prop,

drivers/phy/ti/phy-tusb1210.c

+3 −8
Original line number Diff line number Diff line
@@ -411,12 +411,6 @@ static int tusb1210_psy_get_prop(struct power_supply *psy, 
	return 0;

}



static const enum power_supply_usb_type tusb1210_psy_usb_types[] = {

	POWER_SUPPLY_USB_TYPE_SDP,

	POWER_SUPPLY_USB_TYPE_DCP,

	POWER_SUPPLY_USB_TYPE_UNKNOWN,

};



static const enum power_supply_property tusb1210_psy_props[] = {

	POWER_SUPPLY_PROP_ONLINE,

	POWER_SUPPLY_PROP_USB_TYPE,
@@ -426,8 +420,9 @@ static const enum power_supply_property tusb1210_psy_props[] = { 
static const struct power_supply_desc tusb1210_psy_desc = {

	.name = "tusb1211-charger-detect",

	.type = POWER_SUPPLY_TYPE_USB,

	.usb_types = tusb1210_psy_usb_types,

	.num_usb_types = ARRAY_SIZE(tusb1210_psy_usb_types),

	.usb_types = BIT(POWER_SUPPLY_USB_TYPE_SDP) |

		     BIT(POWER_SUPPLY_USB_TYPE_DCP) |

		     BIT(POWER_SUPPLY_USB_TYPE_UNKNOWN),

	.properties = tusb1210_psy_props,

	.num_properties = ARRAY_SIZE(tusb1210_psy_props),

	.get_property = tusb1210_psy_get_prop,

drivers/power/supply/axp20x_usb_power.c

+4 −9
Original line number Diff line number Diff line
@@ -412,13 +412,6 @@ static enum power_supply_property axp813_usb_power_properties[] = { 
	POWER_SUPPLY_PROP_USB_TYPE,

};



static enum power_supply_usb_type axp813_usb_types[] = {

	POWER_SUPPLY_USB_TYPE_SDP,

	POWER_SUPPLY_USB_TYPE_DCP,

	POWER_SUPPLY_USB_TYPE_CDP,

	POWER_SUPPLY_USB_TYPE_UNKNOWN,

};



static const struct power_supply_desc axp20x_usb_power_desc = {

	.name = "axp20x-usb",

	.type = POWER_SUPPLY_TYPE_USB,
@@ -447,8 +440,10 @@ static const struct power_supply_desc axp813_usb_power_desc = { 
	.property_is_writeable = axp20x_usb_power_prop_writeable,

	.get_property = axp20x_usb_power_get_property,

	.set_property = axp20x_usb_power_set_property,

	.usb_types = axp813_usb_types,

	.num_usb_types = ARRAY_SIZE(axp813_usb_types),

	.usb_types = BIT(POWER_SUPPLY_USB_TYPE_SDP) |

		     BIT(POWER_SUPPLY_USB_TYPE_CDP) |

		     BIT(POWER_SUPPLY_USB_TYPE_DCP) |

		     BIT(POWER_SUPPLY_USB_TYPE_UNKNOWN),

};



static const char * const axp20x_irq_names[] = {

drivers/power/supply/bq256xx_charger.c

+5 −10
Original line number Diff line number Diff line
@@ -334,14 +334,6 @@ static const int bq25618_619_ichg_values[] = { 
	1290000, 1360000, 1430000, 1500000

};



static enum power_supply_usb_type bq256xx_usb_type[] = {

	POWER_SUPPLY_USB_TYPE_SDP,

	POWER_SUPPLY_USB_TYPE_CDP,

	POWER_SUPPLY_USB_TYPE_DCP,

	POWER_SUPPLY_USB_TYPE_UNKNOWN,

	POWER_SUPPLY_USB_TYPE_ACA,

};



static int bq256xx_array_parse(int array_size, int val, const int array[])

{

	int i = 0;
@@ -1252,8 +1244,11 @@ static int bq256xx_property_is_writeable(struct power_supply *psy, 
static const struct power_supply_desc bq256xx_power_supply_desc = {

	.name = "bq256xx-charger",

	.type = POWER_SUPPLY_TYPE_USB,

	.usb_types = bq256xx_usb_type,

	.num_usb_types = ARRAY_SIZE(bq256xx_usb_type),

	.usb_types = BIT(POWER_SUPPLY_USB_TYPE_SDP) |

		     BIT(POWER_SUPPLY_USB_TYPE_CDP) |

		     BIT(POWER_SUPPLY_USB_TYPE_DCP) |

		     BIT(POWER_SUPPLY_USB_TYPE_ACA) |

		     BIT(POWER_SUPPLY_USB_TYPE_UNKNOWN),

	.properties = bq256xx_power_supply_props,

	.num_properties = ARRAY_SIZE(bq256xx_power_supply_props),

	.get_property = bq256xx_get_charger_property,

drivers/power/supply/cros_usbpd-charger.c

+8 −14
Original line number Diff line number Diff line
@@ -73,17 +73,6 @@ static enum power_supply_property cros_usbpd_dedicated_charger_props[] = { 
	POWER_SUPPLY_PROP_VOLTAGE_NOW,

};



static enum power_supply_usb_type cros_usbpd_charger_usb_types[] = {

	POWER_SUPPLY_USB_TYPE_UNKNOWN,

	POWER_SUPPLY_USB_TYPE_SDP,

	POWER_SUPPLY_USB_TYPE_DCP,

	POWER_SUPPLY_USB_TYPE_CDP,

	POWER_SUPPLY_USB_TYPE_C,

	POWER_SUPPLY_USB_TYPE_PD,

	POWER_SUPPLY_USB_TYPE_PD_DRP,

	POWER_SUPPLY_USB_TYPE_APPLE_BRICK_ID

};



/* Input voltage/current limit in mV/mA. Default to none. */

static u16 input_voltage_limit = EC_POWER_LIMIT_NONE;

static u16 input_current_limit = EC_POWER_LIMIT_NONE;
@@ -643,9 +632,14 @@ static int cros_usbpd_charger_probe(struct platform_device *pd) 
			psy_desc->properties = cros_usbpd_charger_props;

			psy_desc->num_properties =

				ARRAY_SIZE(cros_usbpd_charger_props);

			psy_desc->usb_types = cros_usbpd_charger_usb_types;

			psy_desc->num_usb_types =

				ARRAY_SIZE(cros_usbpd_charger_usb_types);

			psy_desc->usb_types = BIT(POWER_SUPPLY_USB_TYPE_UNKNOWN) |

					      BIT(POWER_SUPPLY_USB_TYPE_SDP)     |

					      BIT(POWER_SUPPLY_USB_TYPE_DCP)     |

					      BIT(POWER_SUPPLY_USB_TYPE_CDP)     |

					      BIT(POWER_SUPPLY_USB_TYPE_C)       |

					      BIT(POWER_SUPPLY_USB_TYPE_PD)      |

					      BIT(POWER_SUPPLY_USB_TYPE_PD_DRP)  |

					      BIT(POWER_SUPPLY_USB_TYPE_APPLE_BRICK_ID);

		}



		psy_desc->name = port->name;