From patchwork Tue Oct 18 00:42:51 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Boyd X-Patchwork-Id: 9380941 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id CD9B2608A7 for ; Tue, 18 Oct 2016 00:43:31 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C97B028CF5 for ; Tue, 18 Oct 2016 00:43:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B0C1228FF2; Tue, 18 Oct 2016 00:43:31 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1542228CF5 for ; Tue, 18 Oct 2016 00:43:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935471AbcJRAnQ (ORCPT ); Mon, 17 Oct 2016 20:43:16 -0400 Received: from mail-pf0-f179.google.com ([209.85.192.179]:35697 "EHLO mail-pf0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935024AbcJRAm5 (ORCPT ); Mon, 17 Oct 2016 20:42:57 -0400 Received: by mail-pf0-f179.google.com with SMTP id s8so85228002pfj.2 for ; Mon, 17 Oct 2016 17:42:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=XbVUxAVZUko2x9a0MN/JImf3rn3S3HrjhPQWUSwZaBk=; b=dGOW90LGoMpOaUfBixLG0Mx5AqxJma4CBFbQFzxvk9ag1vay983rtl4ZiqwKUeucBZ rS8LwiV5Uue4vc67kSQKl7j6wWk4c9wlmg8xoj52Xc0qPne+kppVKa8gAPmPynX8GNM0 X6Sh869aBg9rEvScKDSTAddzaVCONGrVPrlCE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=XbVUxAVZUko2x9a0MN/JImf3rn3S3HrjhPQWUSwZaBk=; b=kAKjaOVCI4Zb+5WjaxgxYzgAWqWsOQQmSWpDdErkoksEdDLkjTXNbxZSA7G1RqdXO7 CcRxU1XTJXsYQaXvlYzi4DOSY/jYsnbWtTufXn2Gg6HJlkeAoxOXyTd1KY2xr+VXUHpe z135NO2yc1B64ofYGak4bsEDKZMAJUrIee9fRAwN/WD9Tphi091F7eVZWlMLMO0OrGsU w7/1OHgxNcRMvNaubsChMfBSIr6MuMEFI7FV7lR5oRg6BbjZjX44xDqjmmerfgWN9KH3 E1QMVjtWxdlvzdkg6VH/jwy+1K11t9IYCyZr6+wj+gSZ2DNpj4VqZ7cNdaz/MhEqG6F6 PlKg== X-Gm-Message-State: AA6/9RnGn8SoAwRk+OdkCKnEHvjafe8TViNNutiAkrivP4wdqDJ1WGlddTvjA/rtB8lDHnQg X-Received: by 10.98.220.141 with SMTP id c13mr324507pfl.63.1476751376708; Mon, 17 Oct 2016 17:42:56 -0700 (PDT) Received: from localhost.localdomain (i-global254.qualcomm.com. [199.106.103.254]) by smtp.gmail.com with ESMTPSA id j63sm50692446pfj.70.2016.10.17.17.42.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 17 Oct 2016 17:42:55 -0700 (PDT) From: Stephen Boyd To: Sebastian Reichel Cc: "Bird, Tim" , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Mark Brown , linux-pm@vger.kernel.org, linux-arm-msm@vger.kernel.org, Bjorn Andersson , Andy Gross , Tim Bird Subject: [PATCH v5 2/2] power: qcom_smbb: Add otg regulator for control of vbus Date: Mon, 17 Oct 2016 17:42:51 -0700 Message-Id: <20161018004251.28733-3-stephen.boyd@linaro.org> X-Mailer: git-send-email 2.10.0.297.gf6727b0 In-Reply-To: <20161018004251.28733-1-stephen.boyd@linaro.org> References: <20161018004251.28733-1-stephen.boyd@linaro.org> Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: "Bird, Tim" Add a regulator to control the OTG chargepath switch. This is used by USB code to control VBUS direction - out for host mode on the OTG port, and in for charging mode. Signed-off-by: Tim Bird Acked-by: Bjorn Andersson Reviewed-by: Andy Gross [stephen.boyd@linaro.org: Fix supply name, constify ops, drop machine.h and of_regulator.h includes] Signed-off-by: Stephen Boyd --- drivers/power/supply/qcom_smbb.c | 70 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) diff --git a/drivers/power/supply/qcom_smbb.c b/drivers/power/supply/qcom_smbb.c index b5896ba2a602..5bdde6108c12 100644 --- a/drivers/power/supply/qcom_smbb.c +++ b/drivers/power/supply/qcom_smbb.c @@ -35,6 +35,7 @@ #include #include #include +#include #define SMBB_CHG_VMAX 0x040 #define SMBB_CHG_VSAFE 0x041 @@ -72,6 +73,8 @@ #define BTC_CTRL_HOT_EXT_N BIT(0) #define SMBB_USB_IMAX 0x344 +#define SMBB_USB_OTG_CTL 0x348 +#define OTG_CTL_EN BIT(0) #define SMBB_USB_ENUM_TIMER_STOP 0x34e #define ENUM_TIMER_STOP BIT(0) #define SMBB_USB_SEC_ACCESS 0x3d0 @@ -125,6 +128,9 @@ struct smbb_charger { struct power_supply *dc_psy; struct power_supply *bat_psy; struct regmap *regmap; + + struct regulator_desc otg_rdesc; + struct regulator_dev *otg_reg; }; static const unsigned int smbb_usb_extcon_cable[] = { @@ -787,12 +793,56 @@ static const struct power_supply_desc dc_psy_desc = { .property_is_writeable = smbb_charger_writable_property, }; +static int smbb_chg_otg_enable(struct regulator_dev *rdev) +{ + struct smbb_charger *chg = rdev_get_drvdata(rdev); + int rc; + + rc = regmap_update_bits(chg->regmap, chg->addr + SMBB_USB_OTG_CTL, + OTG_CTL_EN, OTG_CTL_EN); + if (rc) + dev_err(chg->dev, "failed to update OTG_CTL\n"); + return rc; +} + +static int smbb_chg_otg_disable(struct regulator_dev *rdev) +{ + struct smbb_charger *chg = rdev_get_drvdata(rdev); + int rc; + + rc = regmap_update_bits(chg->regmap, chg->addr + SMBB_USB_OTG_CTL, + OTG_CTL_EN, 0); + if (rc) + dev_err(chg->dev, "failed to update OTG_CTL\n"); + return rc; +} + +static int smbb_chg_otg_is_enabled(struct regulator_dev *rdev) +{ + struct smbb_charger *chg = rdev_get_drvdata(rdev); + unsigned int value = 0; + int rc; + + rc = regmap_read(chg->regmap, chg->addr + SMBB_USB_OTG_CTL, &value); + if (rc) + dev_err(chg->dev, "failed to read OTG_CTL\n"); + + return !!(value & OTG_CTL_EN); +} + +static const struct regulator_ops smbb_chg_otg_ops = { + .enable = smbb_chg_otg_enable, + .disable = smbb_chg_otg_disable, + .is_enabled = smbb_chg_otg_is_enabled, +}; + static int smbb_charger_probe(struct platform_device *pdev) { struct power_supply_config bat_cfg = {}; struct power_supply_config usb_cfg = {}; struct power_supply_config dc_cfg = {}; struct smbb_charger *chg; + struct regulator_config config = { }; int rc, i; chg = devm_kzalloc(&pdev->dev, sizeof(*chg), GFP_KERNEL); @@ -905,6 +955,26 @@ static int smbb_charger_probe(struct platform_device *pdev) } } + /* + * otg regulator is used to control VBUS voltage direction + * when USB switches between host and gadget mode + */ + chg->otg_rdesc.id = -1; + chg->otg_rdesc.name = "otg-vbus"; + chg->otg_rdesc.ops = &smbb_chg_otg_ops; + chg->otg_rdesc.owner = THIS_MODULE; + chg->otg_rdesc.type = REGULATOR_VOLTAGE; + chg->otg_rdesc.supply_name = "usb-otg-in"; + chg->otg_rdesc.of_match = "otg-vbus"; + + config.dev = &pdev->dev; + config.driver_data = chg; + + chg->otg_reg = devm_regulator_register(&pdev->dev, &chg->otg_rdesc, + &config); + if (IS_ERR(chg->otg_reg)) + return PTR_ERR(chg->otg_reg); + chg->jeita_ext_temp = of_property_read_bool(pdev->dev.of_node, "qcom,jeita-extended-temp-range");