From 8eb88369baf3ec062b3495db5abe9af5afd836d4 Mon Sep 17 00:00:00 2001 From: Mark Salyzyn Date: Mon, 24 Feb 2020 14:40:49 -0800 Subject: [PATCH] ANDROID: GKI: power: supply: Add support for HVDCP_3P5 Add necessary macros to support and report HVDCP_3P5 adapter. Change-Id: I43c977efdae58551bb934589c05be5960f34fff9 Signed-off-by: Ashish Chavan (cherry picked from commit be88e7b3e9588f69ff4870c23c886b3c45761812) Signed-off-by: Mark Salyzyn Bug: 150789066 --- drivers/power/supply/power_supply_sysfs.c | 2 +- include/linux/power_supply.h | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/power/supply/power_supply_sysfs.c b/drivers/power/supply/power_supply_sysfs.c index f5963ef232ec..0a11e23126c5 100644 --- a/drivers/power/supply/power_supply_sysfs.c +++ b/drivers/power/supply/power_supply_sysfs.c @@ -44,7 +44,7 @@ static const char * const power_supply_type_text[] = { "Unknown", "Battery", "UPS", "Mains", "USB", "USB_DCP", "USB_CDP", "USB_ACA", "USB_C", "USB_PD", "USB_PD_DRP", "BrickID", - "USB_HVDCP", "USB_HVDCP_3", "Wireless", "USB_FLOAT", + "USB_HVDCP", "USB_HVDCP_3", "USB_HVDCP_3P5", "Wireless", "USB_FLOAT", "BMS", "Parallel", "Main", "Wipower", "USB_C_UFP", "USB_C_DFP", "Charge_Pump", }; diff --git a/include/linux/power_supply.h b/include/linux/power_supply.h index c492043dd6b3..7249e9ca13ad 100644 --- a/include/linux/power_supply.h +++ b/include/linux/power_supply.h @@ -106,6 +106,7 @@ enum { POWER_SUPPLY_DP_DM_FORCE_5V = 13, POWER_SUPPLY_DP_DM_FORCE_9V = 14, POWER_SUPPLY_DP_DM_FORCE_12V = 15, + POWER_SUPPLY_DP_DM_CONFIRMED_HVDCP3P5 = 16, }; enum { @@ -125,6 +126,7 @@ enum { enum { POWER_SUPPLY_CP_NONE = 0, POWER_SUPPLY_CP_HVDCP3, + POWER_SUPPLY_CP_HVDCP3P5, POWER_SUPPLY_CP_PPS, POWER_SUPPLY_CP_WIRELESS, }; @@ -411,6 +413,7 @@ enum power_supply_type { POWER_SUPPLY_TYPE_APPLE_BRICK_ID, /* Apple Charging Method */ POWER_SUPPLY_TYPE_USB_HVDCP, /* High Voltage DCP */ POWER_SUPPLY_TYPE_USB_HVDCP_3, /* Efficient High Voltage DCP */ + POWER_SUPPLY_TYPE_USB_HVDCP_3P5, /* Efficient High Voltage DCP */ POWER_SUPPLY_TYPE_WIRELESS, /* Accessory Charger Adapters */ POWER_SUPPLY_TYPE_USB_FLOAT, /* Floating charger */ POWER_SUPPLY_TYPE_BMS, /* Battery Monitor System */