From patchwork Mon Jul 15 12:55:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Artur Weber X-Patchwork-Id: 13733499 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 5AB90C3DA59 for ; Mon, 15 Jul 2024 12:57:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References :Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date: From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=yplmBPab31T+ENfBznOyfetvZRWw0PUytsuLn61zZ54=; b=2ydLZB43jAw+tA/3RcOhO2ODik Rv1eAo6W3sBw7IQwiFNc5eMKObknm3anKV2UpL0BkiR4pwMP94Q3990FtWNWfEccsnGlZW0YEp1pB eroE9hgZBzsoqkMpxzvlh+q6x995pslDsrGxD2qrKoYxS0junTNOOfIH4i5JF4UdmbWfdGE+V9gCE xsL7vJfU1Xi2sn6R/+xrDStAkFtyk+HV85M5PQ23dFOi917TjO4LRDSOMWh0hReKRmAk0Q13F0F4x eZn/VyC/mu0FpgnIsw9dqD+MLwRGkYUefMAOs7jkBLmm13BHFtPkUBm8P6XjGBo5WHHGAOl6bZzyN +Tf9FLGQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sTLGl-000000077KF-3Rue; Mon, 15 Jul 2024 12:57:31 +0000 Received: from mail-ed1-x52e.google.com ([2a00:1450:4864:20::52e]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sTLEk-000000076Ws-3dUF for linux-arm-kernel@lists.infradead.org; Mon, 15 Jul 2024 12:55:28 +0000 Received: by mail-ed1-x52e.google.com with SMTP id 4fb4d7f45d1cf-58b3fee65d8so4998395a12.3 for ; Mon, 15 Jul 2024 05:55:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1721048125; x=1721652925; darn=lists.infradead.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=yplmBPab31T+ENfBznOyfetvZRWw0PUytsuLn61zZ54=; b=jhr/V6lYafEsAyLiXiXIRDIAOA62LCr8Ifew4HD6aPUPryRYQLxbQw0hC2u9fIHQ6j s4vUlDjRQLCmLrVBTIYJjloQ4l48dEXr5/odNJG3nr+98+yf4yTYAC8X+C+WsTZg3aDT 5XgzmhEGErwtBj93nLVaDBhuEaMW5Cj18gFxODPVmirut/2nbDk1wMsNw5bnhEY+whlH 1ebfK7wtBLOOMa8uomRqVKowOztiH3YdqcrIJsCFleczwivxflML5eKmhoUhlynwHaOx 2kLPofSb9ZGkVdkavT/NzhrIToFFqlUg8J7Bs3wKEUG6J3+Y+/gtT8UYW302uDzy253P qjFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721048125; x=1721652925; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=yplmBPab31T+ENfBznOyfetvZRWw0PUytsuLn61zZ54=; b=QOMkhfI52K5SPLs4eve3tXkth1h9lETkjXTC6FEoWNIp6nj62YF8QQ0AViEyy0vyaD 4raRUzVRDHVMiuQJa/A5Sn6+UxoetpTYEWuNZJFmdkymPkbzJot8UMlzHxh+kS9aL5h+ wET93I/8PVJ2V8YQ1Hq1ZUOlrZx0d4TW7//wuLutg0oEJsV0z9tZ/4hX9zN64wOgkpCD WoY4vzblZoZx+u7xrC/+FWLkfVexppAWTxsOvUFcMjgvPZYZiZ13SAeboZ4P6OK+vMIZ kPL66aqdfvESD2sZGzY/mNH6pC14LPoC2JeA3vcweYz8RqFHLMgx6QE1BTWyzo6jhcSy D5GQ== X-Forwarded-Encrypted: i=1; AJvYcCXXI6cAp5g5TDa4VjkLMKa7CsbSvDdwkPhN5DFxhddsgwY1AUsVZE4LvFY7qpd3jcX2+YAfrRGFZj5t9tcnA4mn7OE6Ik242NS9VIduw6QZSI8q5W4= X-Gm-Message-State: AOJu0Yx+v3N6ZNUByBoO/ZisqPFK+/GiubiONdjnywOmXKN2bxdWxvSs i8Pz33fKBV1n8p6GV63wbzFLQ8BpR6qnppBjtZt+rKETcEdFHVa0 X-Google-Smtp-Source: AGHT+IEi0rB6grzKm+6JFok97+M2O9K/mc/iV01iqXjDpsx+NrTD6Yh0aFRRjs4CR0X9xR4LS9ghuw== X-Received: by 2002:a05:6402:11cb:b0:58e:4088:ed2 with SMTP id 4fb4d7f45d1cf-594baf8d6e7mr14449097a12.16.1721048125174; Mon, 15 Jul 2024 05:55:25 -0700 (PDT) Received: from tablet.my.domain (ip-37-248-157-210.multi.internet.cyfrowypolsat.pl. [37.248.157.210]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-59b26f62165sm3333307a12.87.2024.07.15.05.55.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Jul 2024 05:55:24 -0700 (PDT) From: Artur Weber Date: Mon, 15 Jul 2024 14:55:09 +0200 Subject: [PATCH v2 7/9] power: supply: max77693: Add support for detecting and enabling OTG MIME-Version: 1.0 Message-Id: <20240715-max77693-charger-extcon-v2-7-0838ffbb18c3@gmail.com> References: <20240715-max77693-charger-extcon-v2-0-0838ffbb18c3@gmail.com> In-Reply-To: <20240715-max77693-charger-extcon-v2-0-0838ffbb18c3@gmail.com> To: Krzysztof Kozlowski , Chanwoo Choi Cc: Sebastian Reichel , Rob Herring , Conor Dooley , Lee Jones , Krzysztof Kozlowski , Alim Akhtar , linux-pm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, ~postmarketos/upstreaming@lists.sr.ht, Henrik Grimler , Wolfgang Wiedmeyer , Denis 'GNUtoo' Carikli , Artur Weber X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=6011; i=aweber.kernel@gmail.com; h=from:subject:message-id; bh=EXZReySANjkAeBrLFiKGCwE8yARrL34C4+BpkRUqMJU=; b=owEBbQKS/ZANAwAKAbO7+KEToFFoAcsmYgBmlRwqLWuWZaYoe183l0Kev4lM9FuRl+x8JjYe9 DhmziyLvsyJAjMEAAEKAB0WIQTmYwAOrB3szWrSiQ2zu/ihE6BRaAUCZpUcKgAKCRCzu/ihE6BR aFqqD/9k+4cgfR7QbdCgxHMiTAdYZ6yaMlYJNKYairM6DJecVzZQ9oSl9CvPMC3Y+Mj7V+yDDM1 8uPupF/FP1Ske93xmu36wjbQsAc+6HsqG5Y49oq4pphAO6OKKmJLIlRMoxut9Y4S6cAob1K2l8j e3HKLdOgDxsMS3141wj9AgOxNOtbAzdcxrbpxng59RY3AKGSQU2vvIEvs1OiSvHezgrNZhQWBYa LuuUrGDZsYRChOMDovahmJ0FncmO2GSJSJ1pAbGmkyXJ03q/3a6EN0sEF0sZeHw464raM7I8mMI 5CxZbw7kbrvlZmUZrOfM60EIflph3OADafH1lL1vkV7KsKfLJNES2M4qjJwKNuOy60yKzr7fkz8 FD2tp8AvXjQGRbOhSougbNWjMrCkDhXJ0/dEGlZtgWJCrUetds8gOdU9lUXPq8SdZIk7YMoXjJP d9PL6RZ4r+pgDshMGQ6DJ+yCOQ5nuK+rEygkf32lW7PvdJ0B9Qj1lufEAJk9xUX1yeOdB5+RkCI 223MTVODK1YqRC5CVqnYKpGEGB6ATxrElIV7VzWZBKo4/s8L6K/O16q1K7bezshjOCkEtxd9bp0 6Mge3bn1D0xnpkJ5jQBXodYbxSsXbfyzqoCDT+diuZGwPqjudw1W/DfiznkMpdZnoPYdBkRZFYU I7W0r/aPUFzncuQ== X-Developer-Key: i=aweber.kernel@gmail.com; a=openpgp; fpr=E663000EAC1DECCD6AD2890DB3BBF8A113A05168 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240715_055527_014832_D6A78F35 X-CRM114-Status: GOOD ( 19.39 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Building upon the newly added extcon detection support, add detection for USB OTG cables (EXTCON_USB_HOST type), and enable/disable the OTG bits as needed. Signed-off-by: Artur Weber Acked-by: Lee Jones --- Changes in v2: - Added CHGIN OTG current limit value - Squashed MFD header register changes into this commit --- drivers/power/supply/max77693_charger.c | 103 +++++++++++++++++++++++++++----- include/linux/mfd/max77693-private.h | 5 ++ 2 files changed, 94 insertions(+), 14 deletions(-) diff --git a/drivers/power/supply/max77693_charger.c b/drivers/power/supply/max77693_charger.c index 2dc273dd96ee..34d68b1050d4 100644 --- a/drivers/power/supply/max77693_charger.c +++ b/drivers/power/supply/max77693_charger.c @@ -669,6 +669,16 @@ static int max77693_reg_init(struct max77693_charger *chg) if (ret) return ret; + /* Set OTG current limit to 900 mA */ + data = (0x1 << CHG_CNFG_02_OTG_ILIM_SHIFT); + ret = regmap_update_bits(chg->max77693->regmap, + MAX77693_CHG_REG_CHG_CNFG_02, + CHG_CNFG_02_OTG_ILIM_MASK, data); + if (ret) { + dev_err(chg->dev, "Error setting OTG current limit: %d\n", ret); + return ret; + } + return max77693_set_charge_input_threshold_volt(chg, chg->charge_input_threshold_volt); } @@ -690,11 +700,42 @@ static int max77693_set_charging(struct max77693_charger *chg, bool enable) return ret; } +static int max77693_set_otg(struct max77693_charger *chg, bool enable) +{ + struct regmap *regmap = chg->max77693->regmap; + unsigned int data; + bool is_enabled; + int ret; + + ret = regmap_read(regmap, MAX77693_CHG_REG_CHG_CNFG_00, &data); + if (ret) + return ret; + + is_enabled = !!(data & CHG_CNFG_00_OTG_MASK); + + if (enable && !is_enabled) { + /* OTG on, boost on, DIS_MUIC_CTRL on */ + data |= CHG_CNFG_00_OTG_MASK | CHG_CNFG_00_BOOST_MASK \ + | CHG_CNFG_00_DIS_MUIC_CTRL_MASK; + + } else if (!enable && is_enabled) { + /* OTG off, boost off, DIS_MUIC_CTRL off */ + data &= ~(CHG_CNFG_00_OTG_MASK | CHG_CNFG_00_BOOST_MASK \ + | CHG_CNFG_00_DIS_MUIC_CTRL_MASK); + } + + return regmap_write(chg->max77693->regmap, + MAX77693_CHG_REG_CHG_CNFG_00, + data); +} + static void max77693_charger_extcon_work(struct work_struct *work) { struct max77693_charger *chg = container_of(work, struct max77693_charger, cable.work); struct extcon_dev *edev = chg->cable.edev; + bool set_charging, set_otg; + unsigned int current_limit; int connector, state; int ret; @@ -707,31 +748,61 @@ static void max77693_charger_extcon_work(struct work_struct *work) switch (connector) { case EXTCON_CHG_USB_SDP: - case EXTCON_CHG_USB_DCP: case EXTCON_CHG_USB_CDP: + case EXTCON_CHG_USB_SLOW: + current_limit = 500000; /* 500 mA */ + set_charging = true; + set_otg = false; + + dev_info(chg->dev, "slow charging. connector type: %d\n", + connector); + break; + case EXTCON_CHG_USB_DCP: case EXTCON_CHG_USB_ACA: case EXTCON_CHG_USB_FAST: - case EXTCON_CHG_USB_SLOW: case EXTCON_CHG_USB_PD: - ret = max77693_set_charging(chg, true); - if (ret) { - dev_err(chg->dev, "failed to enable charging\n"); - break; - } - dev_info(chg->dev, "charging. connector type: %d\n", + current_limit = chg->fast_charge_current; + set_charging = true; + set_otg = false; + + dev_info(chg->dev, "fast charging. connector type: %d\n", + connector); + break; + case EXTCON_USB_HOST: + current_limit = 500000; /* 500 mA */ + set_charging = false; + set_otg = true; + + dev_info(chg->dev, "USB host. connector type: %d\n", connector); break; default: - ret = max77693_set_charging(chg, false); - if (ret) { - dev_err(chg->dev, "failed to disable charging\n"); - break; - } - dev_info(chg->dev, "charging. connector type: %d\n", + current_limit = 500000; /* 500 mA */ + set_charging = false; + set_otg = false; + + dev_info(chg->dev, "disconnected. connector type: %d\n", connector); break; } + ret = max77693_set_current_limit(chg, current_limit); + if (ret) { + dev_err(chg->dev, "failed to set current limit (%d)\n", ret); + goto out; + } + + ret = max77693_set_charging(chg, set_charging); + if (ret) { + dev_err(chg->dev, "failed to set charging (%d)\n", ret); + goto out; + } + + ret = max77693_set_otg(chg, set_otg); + if (ret) + dev_err(chg->dev, "failed to set OTG (%d)\n", ret); + +out: power_supply_changed(chg->charger); } @@ -793,6 +864,10 @@ static int max77693_dt_init(struct device *dev, struct max77693_charger *chg) &chg->batttery_overcurrent)) chg->batttery_overcurrent = DEFAULT_BATTERY_OVERCURRENT; + if (of_property_read_u32(np, "maxim,fast-charge-current-microamp", + &chg->fast_charge_current)) + chg->fast_charge_current = DEFAULT_FAST_CHARGE_CURRENT; + if (of_property_read_u32(np, "maxim,charge-input-threshold-microvolt", &chg->charge_input_threshold_volt)) chg->charge_input_threshold_volt = diff --git a/include/linux/mfd/max77693-private.h b/include/linux/mfd/max77693-private.h index 4570646e2f33..313fcc3173f9 100644 --- a/include/linux/mfd/max77693-private.h +++ b/include/linux/mfd/max77693-private.h @@ -209,7 +209,10 @@ enum max77693_charger_battery_state { /* MAX77693 CHG_CNFG_00 register */ #define CHG_CNFG_00_CHG_MASK 0x1 +#define CHG_CNFG_00_OTG_MASK 0x2 #define CHG_CNFG_00_BUCK_MASK 0x4 +#define CHG_CNFG_00_BOOST_MASK 0x8 +#define CHG_CNFG_00_DIS_MUIC_CTRL_MASK 0x20 /* MAX77693_CHG_REG_CHG_CNFG_01 register */ #define CHG_CNFG_01_FCHGTIME_SHIFT 0 @@ -222,6 +225,8 @@ enum max77693_charger_battery_state { /* MAX77693_CHG_REG_CHG_CNFG_02 register */ #define CHG_CNFG_02_CC_SHIFT 0 #define CHG_CNFG_02_CC_MASK 0x3F +#define CHG_CNFG_02_OTG_ILIM_SHIFT 7 +#define CHG_CNFG_02_OTG_ILIM_MASK 0x80 /* MAX77693_CHG_REG_CHG_CNFG_03 register */ #define CHG_CNFG_03_TOITH_SHIFT 0