Commit 2ff28e97 authored by Sebastian Reichel's avatar Sebastian Reichel
Browse files

Merge tag 'ib-psy-usb-types-signed' into psy-next 



Changing usb_types type from array to bitmap in the power_supply_desc
struct requires updating power-supply drivers living in different
subsystem, so it is handled via an immutable branch.

Signed-off-by: default avatarSebastian Reichel <sebastian.reichel@collabora.com>
parents 47271a93 364ea7cc

Documentation/ABI/testing/sysfs-class-power

+6 −1
Original line number Diff line number Diff line
@@ -608,7 +608,12 @@ Description: 
		the supply, for example it can show if USB-PD capable source

		is attached.



		Access: Read-Only

		Access: For power-supplies which consume USB power such

		as battery charger chips, this indicates the type of

		the connected USB power source and is Read-Only.



		For power-supplies which act as a USB power-source such as

		e.g. the UCS1002 USB Port Power Controller this is writable.



		Valid values:

			      "Unknown", "SDP", "DCP", "CDP", "ACA", "C", "PD",

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
@@ -456,13 +456,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,
@@ -491,8 +484,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,