From patchwork Sat Nov 16 20:36:47 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hans de Goede X-Patchwork-Id: 13877722 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E6D23191F91 for ; Sat, 16 Nov 2024 20:37:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731789427; cv=none; b=B+BXKuYV8iu99DMs9vZ2ZDqfQJxdQGYSxzwjqceDyZ7nj+73hQ4V41PX1w5JTqDNcz6ob6OZDfb7d0hw7irNSBP8MnRvNUnk/13wmejm3HJhuqeML0EyL6SHS99RVwdL3ytqWVQN+92Zuuda1l0F9oCc0E2wg1zEdt9FtZDXH7Y= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731789427; c=relaxed/simple; bh=8Z9adF3i5dFbjVgTDTqQ35n5Zr7fqKmMo1Iu9jx97m0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=cjmOY5Hl2HopZqhy3j3lDOrTjAHHi8VV7ZdH2jTMla2j6o/Nm5+aAYJA7S2RBcMegG6cVgp2lSup4aUw7M+9HHdma3+dmKKPCZboiHNVysNxECQSQ8dUlZJGgc+jCtolqxcQtE0eO4xvLY+Zzh35/F5ihfnlva0AB6hPo2MD2xQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=D2GommU0; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="D2GommU0" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1731789425; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=d3mlHFtAuQ0Swa9hlusVWD5DNnww2YIjIcVgtDs/jxE=; b=D2GommU0M3/4O4z+re0X1I6tpiLVrPD3+fe0tUaE4KoNvo+oYdtJ/hNh6sy+iSmDqF8RXK JocF8QGHF9ziLV3nvL+TBUIW+xT8wJc8cpl2mCUBptYWFsHoOh6G+16OBEh2iT8ouptHs6 IoYv6EDQu9LRQ6qOdjmBCmZW2Cz5h2U= Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-107-um7B8WKnPh2NZUsJcvLr4w-1; Sat, 16 Nov 2024 15:37:01 -0500 X-MC-Unique: um7B8WKnPh2NZUsJcvLr4w-1 X-Mimecast-MFC-AGG-ID: um7B8WKnPh2NZUsJcvLr4w Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 489F71956096; Sat, 16 Nov 2024 20:37:00 +0000 (UTC) Received: from localhost.localdomain (unknown [10.39.192.14]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id F14E51956056; Sat, 16 Nov 2024 20:36:57 +0000 (UTC) From: Hans de Goede To: Sebastian Reichel , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: Hans de Goede , Hermes Zhang , linux-pm@vger.kernel.org, devicetree@vger.kernel.org Subject: [PATCH 2/3] power: supply: bq24190: Fix BQ24296 Vbus regulator support Date: Sat, 16 Nov 2024 21:36:47 +0100 Message-ID: <20241116203648.169100-2-hdegoede@redhat.com> In-Reply-To: <20241116203648.169100-1-hdegoede@redhat.com> References: <20241116203648.169100-1-hdegoede@redhat.com> Precedence: bulk X-Mailing-List: linux-pm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 There are 2 issues with bq24296_set_otg_vbus(): 1. When writing the OTG_CONFIG bit it uses POC_CHG_CONFIG_SHIFT which should be POC_OTG_CONFIG_SHIFT. 2. When turning the regulator off it never turns charging back on. Note this must be done through bq24190_charger_set_charge_type(), to ensure that the charge_type property value of none/trickle/fast is honored. Resolve both issues to fix BQ24296 Vbus regulator support not working. Fixes: b150a703b56f ("power: supply: bq24190_charger: Add support for BQ24296") Signed-off-by: Hans de Goede --- drivers/power/supply/bq24190_charger.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/drivers/power/supply/bq24190_charger.c b/drivers/power/supply/bq24190_charger.c index 0101aaca1a97..4881cbd0e672 100644 --- a/drivers/power/supply/bq24190_charger.c +++ b/drivers/power/supply/bq24190_charger.c @@ -567,6 +567,7 @@ static int bq24190_set_otg_vbus(struct bq24190_dev_info *bdi, bool enable) static int bq24296_set_otg_vbus(struct bq24190_dev_info *bdi, bool enable) { + union power_supply_propval val = { .intval = bdi->charge_type }; int ret; ret = pm_runtime_resume_and_get(bdi->dev); @@ -587,13 +588,18 @@ static int bq24296_set_otg_vbus(struct bq24190_dev_info *bdi, bool enable) ret = bq24190_write_mask(bdi, BQ24190_REG_POC, BQ24296_REG_POC_OTG_CONFIG_MASK, - BQ24296_REG_POC_CHG_CONFIG_SHIFT, + BQ24296_REG_POC_OTG_CONFIG_SHIFT, BQ24296_REG_POC_OTG_CONFIG_OTG); - } else + } else { ret = bq24190_write_mask(bdi, BQ24190_REG_POC, BQ24296_REG_POC_OTG_CONFIG_MASK, - BQ24296_REG_POC_CHG_CONFIG_SHIFT, + BQ24296_REG_POC_OTG_CONFIG_SHIFT, BQ24296_REG_POC_OTG_CONFIG_DISABLE); + if (ret < 0) + goto out; + + ret = bq24190_charger_set_charge_type(bdi, &val); + } out: pm_runtime_mark_last_busy(bdi->dev);