extcon: intel-cht-wc: Also set direction and drv flags for V5 boost GPIO
Subsystems (2)
PATCH v2 1/1 extcon: intel-cht-wc: Also set direction and drv flags for V5 boost GPIO
Sometimes (firmware bug?) the V5 boost GPIO is not configured as output by the BIOS, leading to the 5V boost convertor being permanently on,
Explicitly set the direction and drv flags rather then inheriting them from the firmware to fix this.
---
Changes in v2:
-Add Fixes tag and Cc: stable
--- drivers/extcon/extcon-intel-cht-wc.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
drivers/extcon/extcon-intel-cht-wc.c +7 -4
@@ -66,6 +66,8 @@#define CHT_WC_VBUS_GPIO_CTLO 0x6e2d#define CHT_WC_VBUS_GPIO_CTLO_OUTPUT BIT(0) +#define CHT_WC_VBUS_GPIO_CTLO_DRV_OD BIT(4) +#define CHT_WC_VBUS_GPIO_CTLO_DIR_OUT BIT(5)enum cht_wc_usb_id {USB_ID_OTG ,
@@ -183,14 +185,15 @@ static void cht_wc_extcon_set_5v_boost(struct cht_wc_extcon_data *ext, {int ret, val; - val = enable ?CHT_WC_VBUS_GPIO_CTLO_OUTPUT :0 ; -/* * The 5V boost converter is enabled through a gpio on the PMIC, since * there currently is no gpio driver we access the gpio reg directly. */ - ret =regmap_update_bits (ext->regmap,CHT_WC_VBUS_GPIO_CTLO , -CHT_WC_VBUS_GPIO_CTLO_OUTPUT , val); + val =CHT_WC_VBUS_GPIO_CTLO_DRV_OD |CHT_WC_VBUS_GPIO_CTLO_DIR_OUT ; +if (enable) + val |=CHT_WC_VBUS_GPIO_CTLO_OUTPUT ; + + ret =regmap_write (ext->regmap,CHT_WC_VBUS_GPIO_CTLO , val);if (ret)dev_err (ext->dev,"Error writing Vbus GPIO CTLO: %d\n" , ret); }
Signature · 1 line
2.14.3
Hi,
Quoted 41 lines · Hans de Goede
Sometimes (firmware bug?) the V5 boost GPIO is not configured as output by the BIOS, leading to the 5V boost convertor being permanently on,
Explicitly set the direction and drv flags rather then inheriting them from the firmware to fix this.
Fixes 585cb239f4de ("extcon: intel-cht-wc: Disable external 5v boost ...")Reviewed-by Andy Shevchenko <[email protected]>Signed-off-by Hans de Goede <[email protected]>---
Changes in v2:(quoted diff) +0
-2-Add Fixes tag and Cc: stable --- drivers/extcon/extcon-intel-cht-wc.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)drivers/extcon/extcon-intel-cht-wc.c +2
-2@@ -66,6 +66,8 @@#define CHT_WC_VBUS_GPIO_CTLO 0x6e2d#define CHT_WC_VBUS_GPIO_CTLO_OUTPUT BIT(0) +#define CHT_WC_VBUS_GPIO_CTLO_DRV_OD BIT(4) +#define CHT_WC_VBUS_GPIO_CTLO_DIR_OUT BIT(5)enum cht_wc_usb_id {USB_ID_OTG ,@@ -183,14 +185,15 @@ static void cht_wc_extcon_set_5v_boost(struct cht_wc_extcon_data *ext, {int ret, val; - val = enable ?CHT_WC_VBUS_GPIO_CTLO_OUTPUT :0 ; -/* * The 5V boost converter is enabled through a gpio on the PMIC, since * there currently is no gpio driver we access the gpio reg directly. */
drivers/extcon/extcon-intel-cht-wc.c static void cht_wc_extcon_set_5v_boost(struct cht_wc_extcon_data *ext, · line 199
Quoted 10 lines
drivers/extcon/extcon-intel-cht-wc.c +5
-2- ret =regmap_update_bits (ext->regmap,CHT_WC_VBUS_GPIO_CTLO , -CHT_WC_VBUS_GPIO_CTLO_OUTPUT , val); + val =CHT_WC_VBUS_GPIO_CTLO_DRV_OD |CHT_WC_VBUS_GPIO_CTLO_DIR_OUT ; +if (enable) + val |=CHT_WC_VBUS_GPIO_CTLO_OUTPUT ; + + ret =regmap_write (ext->regmap,CHT_WC_VBUS_GPIO_CTLO , val);if (ret)dev_err (ext->dev,"Error writing Vbus GPIO CTLO: %d\n" , ret); }
Applied it to extcon-fixes branch.
Signature · 3 lines
Best Regards, Chanwoo Choi Samsung Electronics