Return-Path: Received: from mailout4.samsung.com ([203.254.224.34]:20583 "EHLO mailout4.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932205AbeBSXgB (ORCPT ); Mon, 19 Feb 2018 18:36:01 -0500 MIME-version: 1.0 Content-transfer-encoding: 8BIT Content-type: text/plain; charset="UTF-8" Message-id: <5A8B5F5D.8090208@samsung.com> Date: Tue, 20 Feb 2018 08:35:57 +0900 From: Chanwoo Choi To: Hans de Goede , MyungJoo Ham Cc: linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: Re: [PATCH v2] extcon: intel-cht-wc: Also set direction and drv flags for V5 boost GPIO In-reply-to: <20180219132046.13450-1-hdegoede@redhat.com> References: <20180219132046.13450-1-hdegoede@redhat.com> Sender: stable-owner@vger.kernel.org List-ID: Hi, On 2018년 02월 19일 22:20, Hans de Goede wrote: > 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 ...") > Cc: stable@vger.kernel.org > Reviewed-by: Andy Shevchenko > Signed-off-by: Hans de Goede > --- > Changes in v2: > -Add Fixes tag and Cc: stable > --- > drivers/extcon/extcon-intel-cht-wc.c | 11 +++++++---- > 1 file changed, 7 insertions(+), 4 deletions(-) > > diff --git a/drivers/extcon/extcon-intel-cht-wc.c b/drivers/extcon/extcon-intel-cht-wc.c > index 7c4bc8c44c3f..b7e9ea377d70 100644 > --- a/drivers/extcon/extcon-intel-cht-wc.c > +++ b/drivers/extcon/extcon-intel-cht-wc.c > @@ -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); > } > Applied it to extcon-fixes branch. -- Best Regards, Chanwoo Choi Samsung Electronics