From patchwork Thu Apr 27 23:30:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakob Hauser X-Patchwork-Id: 677578 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4D18BC7EE26 for ; Thu, 27 Apr 2023 23:30:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344435AbjD0Xap (ORCPT ); Thu, 27 Apr 2023 19:30:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37226 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344425AbjD0Xan (ORCPT ); Thu, 27 Apr 2023 19:30:43 -0400 Received: from sonic306-21.consmr.mail.ir2.yahoo.com (sonic306-21.consmr.mail.ir2.yahoo.com [77.238.176.207]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A5D3B44AB for ; Thu, 27 Apr 2023 16:30:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rocketmail.com; s=s2048; t=1682638237; bh=BgnxKccDW0hD4wBKD/wGrzdwGz4y7GQfSjWtC1jgF84=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From:Subject:Reply-To; b=PQKjhQf0IZKJMvQi7N9dhnmn7aouaXPgOFtQPXtWZwq1RmCbsAc8jnYENaYkp5HVF9XK33u6Adp/H/NZK/8L3Rcwtadk2F6ZbxHtQ+IIeuwBvH/0PdfWahezGCTcKEKyUPUC0hVBqqr9eDFb36pFXjEPBOnIbH7f2y15kn3kD2yRI0zK6cmBBPAVRKrcNHqj47WEOiEK3Kg++30sfKJMm2yRuG9jeFDkHYuX1fxt3jyb9JISn2QY0Lvpzh2Z6DTVsI0S0hsq18nz+jyG2PbX4fuOZ45M/xlYvLTeXsfQEE5dptbY5i8a0JRi+DIlnpU8eLrh9M++RujM2jJNiD23JQ== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1682638237; bh=YleMwHgEakViniISIjbeHeefdZSR23tchtT2HsYzT3i=; h=X-Sonic-MF:From:To:Subject:Date:From:Subject; b=YWQJOi64ApcawUCjkQf1dbmCFK5EwMUedqVRjKMKCJj8Plt/sPX6gJwnMuyazswrr/0V1BRWfcAqt36vqwBTqzfHU5eZBrQ8NneqkbdILOB5r8qWRbJJLrAdcsb9YAt6BU8lyyDIfZTJ4SnB9+S4ocx73orDbFcxVKSVEfCm/vmG/JEtqgeF1Vl/qH0G4sz6hPpu5LZL9NSdMjmXx83Kc33TIuhnJstK3RcnS9BY1batCSlfONkI5yUH4La8066SJNyvVa4Esprv1yttJjd15Xic6r1Ybcd+siKFqdAX4SWJFZO6jjWmlzxMkNNPUgM5wVVjGZK5fKGgwes4zn0RoA== X-YMail-OSG: zc4eXssVM1m9uhj2LuHZGyMOiYHu_hNQR_9KT6z8KzHNrYtaxkjcX3CB0pATnGY wDA0SK1hHo36Vck0qWQFhDn90gfnIW4l04s5NaDguoTuUtHQqz7qaCrsTj9VIs9XQIiIHbfmh6sU Q73HdOer85Zvg0ag4Oef1cYi09OE2sar42WcieWDJUSPsPOnhT_aBL58VtoMfuqDydB0QceZzQ7y pB_2qw2lgBMytadBKsToX.wkYQ4JV6d7.86uAeqn6VJe6Ebicgos6eutgkBXhMyoZT0etyQWEJrO TwcA1gvaLHJGo7_QNTSfCm0whWjtt7pus8ZRDMVd3J.Ici76B8n08JdHDlD5us10CWoJQb8Nf7fF b1ifsigJvJOqYRx32wLVgNrPvAuUK7AVPX5RmvmHGKDHAVrKlYLa9ni6EJe6hp5S6s4TkVZx8iE_ QMce.aWh50SFMI7bFRMY1x7yWsnU_eO1uTLX2paXbRzKej3hsgmrLyBIjI.I4h_ijOqQ87aobcaF V0a4QAo02a6GM9XuzIk1bz8q9ffe9su8rhMDCGyGrzAnTVgiFaIpO.UnnUUoGDwAN9bZZludYzjb Qe3dXGltiFw7WyFMkzxxxid_sHoxCiMCYSTE8VrBtp6BkzUbj8PsyBemaS4r1o6TU.KJVvISjCqD uSPYEoKthlibkCdnnfnjy3nadPiv.jI0u9JFt_XyYqlHCLRwTTb7lkOaKPSIQ4PrF1.JIo17hV34 qs36pLugFoC9oz13om0X7c_4N8YTszcHvXXK2fFxcv7QeAc72HTv..fFHcZkrp3Fi.DE5QqLtm4X 5rBzsoJugiW0Unw3EtrTsuxK9YMfEfntTAkm_EJPg.YFtQeEB9dVKNu3A0lxDfKMEF6Qvd1Z.4Ir PBZWp.D_sw7PrlavRTnpyPOArd1Be1lTBmQoOP4oNU4idOXEyovG6vLWe_6orrZldqM._2Ra9s7i 0jgLoxYob1yf9_4iEjC4XziyQXDRItSyvRj5HHTnIBpSuj0j.csQmTsyk6C9Qb8FlGl7vSstwoWo fhtpLWrnhZEjN2Ij.DOdYTNdNBTnDGcU7CwZ3ptWNt3VkCndZD4FUYqHX0r9gGnT.j340GYlaS8. AlKTAhRnxbyYw2eJfwr1Twkk.VZ1leWriNFKAEjXzXpQzMJUIOad2WTUo5YGlb2XsWzGZ1OIlghe j5oXiD4b9yLKV9BpmphCVuOjNJK4fvykbajdmoV8eHFEoa76WR_Jrho_Y7tF6QYHgqVeQTiKbU0V 3jt5f.J0E_kxqQkSgVuPu56EHOojY3WhD60Mu0lQqGrAjX4qb.Oh_eSJhQkTl.AkJAJmSeC.z4JA .OcGrcnowMFJ2kZwBn_GcKc1PqryMdXDyRGB0t.VAXdKRp9CiWQhv1Nr3TLqvxBHdmSKKNff1eZ4 U0qe6.0fA4FVzWsOQLo0.whnXsvz.nV_2P8Xba7CWPmroWBZLThpclJJbQIH7Tde1Csl2dfsESRm GFMh4WjypokDPfhxXDqjZw474S.5AL1CPn6f5NaiYmuJJFfOs_K5EQQlNee3wOZGNCfN5UbFST7h 72hrpW23.5OmtuOvmi6RAkSyEvJTrOPJb5y2VeYl5G1haK1Yf3jgqCkeUIq5puPQqCs49I26wcvE YRX0v_NzvCA1jAuW3LYqCjpO4JKJ.9Bh_L.SbHYHhIHAt3zSG0D0UxGu_eZc.ZKn25.u_JtdrZKE v0z.mn2GHgNqaspaXjLBIn90.Iw_5P.4cpOhjIEARYCXyp8WoZI8hnfdyZlo4mfVn_P7CGqU62jM lS7pMCsRe5p7nxzHQkLiN_lHSeUmiDRMT5dNgni7IcwpDj47aCIK2f3axHduJ2hSze1peBBp3lR2 onXZnP7Fp5R4E.fYzsRGJy7CvzU2dJio979oytdhIcYT98gqrVMNXw7GUICSJJvQQr7Lhu0SEuys t6JI40lfoYFxRsz6wIJCHtsy7I72W3d_0uuFkcEnThqRRStnGRBD3mB894.VEz_ID2Q8LQH1bRpj YQIADE6WI.6tI963TkeQ.88ALqUInN_ZUtAaO2FEw8BoZhB0okziHnTpbXawjW62_tCVLvAXBwjv ppfGBAowDEcdNldeq4CQ4i4CKodZwpHNixcZ6e7ftI3TZsVMF.fuOBg45ImADpH_rPvmhO8_C0JN rGnEr7cZF1ByOs4ML.UkUGFYt3pnU9Ab6Z7gr8yMA0hQvz87YgGZdBurPF8L4tHDBn0LqFqqMAFE jYflevAF2pExTgOUr0jOfRr__8lNF6LNzhOLp36lI9rneCFsOWOko.m2RKjfhfgb7UOvTTXIFqJl 1DCwxToLH_hy8BrYiEVPwCzE- X-Sonic-MF: X-Sonic-ID: 613b4756-daa9-440d-a15a-85cdf205f9d2 Received: from sonic.gate.mail.ne1.yahoo.com by sonic306.consmr.mail.ir2.yahoo.com with HTTP; Thu, 27 Apr 2023 23:30:37 +0000 Received: by hermes--production-ir2-74cd8fc864-9w846 (Yahoo Inc. Hermes SMTP Server) with ESMTPA ID 912b1d1a256b22e43f453e00130c1256; Thu, 27 Apr 2023 23:30:36 +0000 (UTC) From: Jakob Hauser To: Sebastian Reichel , Lee Jones , Liam Girdwood , Mark Brown , Rob Herring , Krzysztof Kozlowski Cc: Beomho Seo , Chanwoo Choi , Stephan Gerhold , Raymond Hackley , Pavel Machek , Axel Lin , ChiYuan Huang , Linus Walleij , linux-pm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, phone-devel@vger.kernel.org, ~postmarketos/upstreaming@lists.sr.ht, Jakob Hauser Subject: [PATCH v3 3/8] mfd: rt5033: Fix STAT_MASK, HZ_MASK and AICR defines Date: Fri, 28 Apr 2023 01:30:06 +0200 Message-Id: <8e4c8cfb7820081e62fd6d86db6c53cd2792a29c.1682636929.git.jahau@rocketmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org The charger state mask RT5033_CHG_STAT_MASK should be 0x30 [1][2]. The high impedance mask RT5033_RT_HZ_MASK is actually value 0x02 [3] and is assosiated to the RT5033 CHGCTRL1 register [4]. Accordingly also change RT5033_CHARGER_HZ_ENABLE to 0x02 to avoid the need of a bit shift upon application. For input current limiting AICR mode, the define for the 1000 mA step was missing [5]. Additionally add the define for DISABLE option. Concerning the mask, remove RT5033_AICR_MODE_MASK because there is already RT5033_CHGCTRL1_IAICR_MASK further up. They are redundant and the upper one makes more sense to have the masks of a register colleted there as an overview. [1] https://github.com/msm8916-mainline/linux-downstream/blob/GT-I9195I/drivers/battery/rt5033_charger.c#L669-L682 [2] https://github.com/torvalds/linux/blob/v6.0/include/linux/mfd/rt5033-private.h#L59-L62 [3] https://github.com/msm8916-mainline/linux-downstream/blob/GT-I9195I/include/linux/battery/charger/rt5033_charger.h#L44 [4] https://github.com/msm8916-mainline/linux-downstream/blob/GT-I9195I/drivers/battery/rt5033_charger.c#L223 [5] https://github.com/msm8916-mainline/linux-downstream/blob/GT-I9195I/drivers/battery/rt5033_charger.c#L278 Signed-off-by: Jakob Hauser Acked-for-MFD-by: Lee Jones --- include/linux/mfd/rt5033-private.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/include/linux/mfd/rt5033-private.h b/include/linux/mfd/rt5033-private.h index b035a67cec73..b6773ebf4e6b 100644 --- a/include/linux/mfd/rt5033-private.h +++ b/include/linux/mfd/rt5033-private.h @@ -55,7 +55,7 @@ enum rt5033_reg { }; /* RT5033 Charger state register */ -#define RT5033_CHG_STAT_MASK 0x20 +#define RT5033_CHG_STAT_MASK 0x30 #define RT5033_CHG_STAT_DISCHARGING 0x00 #define RT5033_CHG_STAT_FULL 0x10 #define RT5033_CHG_STAT_CHARGING 0x20 @@ -67,6 +67,7 @@ enum rt5033_reg { /* RT5033 CHGCTRL1 register */ #define RT5033_CHGCTRL1_IAICR_MASK 0xe0 #define RT5033_CHGCTRL1_MODE_MASK 0x01 +#define RT5033_CHGCTRL1_HZ_MASK 0x02 /* RT5033 CHGCTRL2 register */ #define RT5033_CHGCTRL2_CV_MASK 0xfc @@ -92,7 +93,6 @@ enum rt5033_reg { /* RT5033 RT CTRL1 register */ #define RT5033_RT_CTRL1_UUG_MASK 0x02 -#define RT5033_RT_HZ_MASK 0x01 /* RT5033 control register */ #define RT5033_CTRL_FCCM_BUCK_MASK BIT(0) @@ -119,13 +119,14 @@ enum rt5033_reg { * register), AICR mode limits the input current. For example, the AIRC 100 * mode limits the input current to 100 mA. */ +#define RT5033_AICR_DISABLE 0x00 #define RT5033_AICR_100_MODE 0x20 #define RT5033_AICR_500_MODE 0x40 #define RT5033_AICR_700_MODE 0x60 #define RT5033_AICR_900_MODE 0x80 +#define RT5033_AICR_1000_MODE 0xa0 #define RT5033_AICR_1500_MODE 0xc0 #define RT5033_AICR_2000_MODE 0xe0 -#define RT5033_AICR_MODE_MASK 0xe0 /* RT5033 use internal timer need to set time */ #define RT5033_FAST_CHARGE_TIMER4 0x00 @@ -195,7 +196,7 @@ enum rt5033_reg { /* RT5033 charger high impedance mode */ #define RT5033_CHARGER_HZ_DISABLE 0x00 -#define RT5033_CHARGER_HZ_ENABLE 0x01 +#define RT5033_CHARGER_HZ_ENABLE 0x02 /* RT5033 regulator BUCK output voltage uV */ #define RT5033_REGULATOR_BUCK_VOLTAGE_MIN 1000000U From patchwork Thu Apr 27 23:30:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakob Hauser X-Patchwork-Id: 677577 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4A64DC77B7C for ; Thu, 27 Apr 2023 23:30:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344447AbjD0Xa5 (ORCPT ); Thu, 27 Apr 2023 19:30:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37584 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344448AbjD0Xat (ORCPT ); Thu, 27 Apr 2023 19:30:49 -0400 Received: from sonic307-7.consmr.mail.ir2.yahoo.com (sonic307-7.consmr.mail.ir2.yahoo.com [87.248.110.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1D98840C8 for ; Thu, 27 Apr 2023 16:30:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rocketmail.com; s=s2048; t=1682638244; bh=TaDEAz0Die/QkzhQlShMR0Tj2yb+Ub7LPlpIw0Xo3M8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From:Subject:Reply-To; b=paGgIBAYpFnSYcTWXm0oJsxFurcmBe9GTEi35uS45/e7qrjoKMDhRBihRxHg4UKPD7ZHrY80jSZE0W126kdY0MiaFXO8N4+g6IM5yO6p7S6jxX7AFLpj5KOpuMRtSVGiovzU24il8mywpnheCA8a46QGiBVezDssMl1USl1rpQE+PhikGU0Md3RFwxicej4RsyzcyMAzOaZYAI5rqtFrMwKqZfY0PjH8EMDYHNIpgEUK4nng/rTQaGGGRdDUIDoO2MS7XVKV0GEfZuNYI9kgypRF+1wmQCwc9ehrznlM/dmAGkYafYB96CFNgqCtNsuoklcKanh8QVZWBa95V8JAcw== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1682638244; bh=TNgW9onR+O95ZYZuvcKmpUJbgxwJaqWYy+TqTUo40V4=; h=X-Sonic-MF:From:To:Subject:Date:From:Subject; b=EKuOp+7DOVP5ny7egNEcgPRkdyx3ntDxpvSU0OgXyti6gN3I70fkOi8r4gHzK3dFok5TNydOMlCLhn7xqJSqodQLnndHD2ISngAge5toAXqypZ8WQWq72dqap5UicLpNVz/OSsAA6aN1pjph8QMPwILRJshbq1yel2kgEZOWnpbuZ206jqTao1gC0YsN3pzAcP10OZoJgxlu9jf3SgiAidnE9YZTeOIFy6nT9z0EBZaLmnIsG1Cm/EYQe7SLFulzsDaei5Rlcl6v6lrfATx26nz0xwuPI6RmRBjibfvWbb4bHjXHXrVN5Iw0WD5n/1x8MWmol6/guOp7heWhQ7J5dA== X-YMail-OSG: eYwr.2EVM1ns_A6GKsN2zbL2nXttdgRq.CSbBRgVwnuD13.K1.1mI.SjpOdGYKE O00ZrRIwmD4OGzAdW4fjOFpTPHTGcKtujrpbwF3GzkhCVwjNOwDYeE8xi_Qz5C.RuHtoFO8e1CEi qCu_a.UXbnzV4Wqaq2SwceKKwrhOpaoUsXrI2T.5r8J6xIxFys6.jU04IwX6lIHq91CbS1kjPXxd b7_89OaaaDNxZSuxPjPkdCOnDSEy7tSht_sMmhhPJyK8TF2Pr1PZ99Z5sM1r0zmNFKHKRElcx7PM KngQziPjGjTqQJ96Brts3XxIryK7y6XyhURkxeZmHN8_rSwQmdltXVgRQbKyMGBv2kwK74ghwEil vWjUCC.UfIelZyqlUKIv4mt2T.hv4QPXQVsR89go6Fi1DUBCAk0aJV19S7BqRFGi5uTX2HEXXvd_ mK5hGxiLPrpGtlxk7Up3BhK2zc2qhHJIWx7nci03Scl1UkR7ugxPNI9L6glzlb9gypG4W.zhlZs8 HQ00XVWokB7bivi6dNkUBITCiGZGhK_XGaBjhIbzuEw9ss1KUqiZ4eytEYt79IcF3Oq29kjWFkk. xrYvyMCirhknBW4Oc526QaJCI10KeEf_AQRgNLpOOkhzrnRa7CVr8gKICQ3t0Dv79GuSvQqZQ4HN fGHPwA6_crPJfb.IDAZP9wKNr27xsZCHvyArPwD6TSEVaWRIFABB4FOok0gaTXUimO6YWddVyr_g dxat0EueqkdXP4W7U0rA8pPcpdJTC5F7P523oA4j29l61InJq61E4dWVXI_SKHln3cdG1wwbzXYx YDJv0ctRkufkCQCqn.9H9I4WtBSqyFln7b.XcIzgHuF1fjgZYVjRxkJ5hL1NYlKYkZqNxf8_9BkQ WZMsiX5txQEAFZetQbFCYDUtnl5qOw5DDMqlQxNJ3X5MGxZMO39snL81H5HVE37FrrIFlwijH4Tp Ok1auuxlTI_GX4qqB0h_DECllhnGn826qfkZ3sYzTVJBrs.vQWnYvxdz2CCpGir1NzpUm8nyeqF2 Xn9ncdU0WAeKW4gOcYyqf.17atINUcWHj7D8TtL9w67qlQO_QCiEciB92bO9YXAIRiSYvbCYRZMI W1M.j2Bt_mb9d6YNpccJYbE.bX44tuftTK0TJkjlclLfnD2bLi6hqX5KXenay73j0uqzOK6WTMJL SzlFlQJI5kZew9C9ZRGxO9HZF1Q5w8UquqY06_gCMtj6Ds8VJ0WvHMT3OGsX2i34SYInFaSy7VZx 3wSFjGzFnRM9mnFjiSwRafr2eNbRIvc8vvQI6VAgegRLZhlzGoZlnNOJC3Wrkm2x3B4RHfj_gwDW kDHztxRJ1E09MIg2mKymGDEeS2Qk2LCKpUpGHhv1NALvg6m8IDMD7OLfiboIu226nBJ8sRtAtQ5F QKTEz2zeBT4hpzLH9QVbhPqVWLIWfYxSXlSFgqx6dq5JwEzDxYlUSDztZ2oxhwOjw7gmi65oIPrg ReC91rjjtjAVSZTRSJdDsaj3PWIMhDLr3vkO8g5D833MlxiY1dmTMQFkMKw7SyPJKXT9KohyJOMx 0.ROSbpMIasolaMMbX36wntnACArNAoDytMbLamuO_pq9mrRe_bCeFdOgpo4WvT5LQj9Q4wCcUoy HIKHhdDvbQn9PVila5Zs9XHYgIwiRJwx0s7nYVp5HHVnvBuVAwD96Mpev.502bg9Vq.pCOwbVxo2 _znGqW.oZ3FKtyVTcs6vRNbpn8Egin28TxkuWV2ZRD6_nWX31J9S3pKFAeor5WkFD70gB.4x.pQl FWImv7gW3hz_Hwse8WGX5DjKGpH29yyToBPr1ZXgFLnvx7ZVtZnU_mUJRjqyV7lj9S1PhsH3NC9Y GpTFbmiGo5c8YHRDWMKLSHwm4BrVDDWZCVtfh75BZGfo7VnMpNhPu6OfzrdcZg4F_UGX65H7l9Un mxY1aLs0mRVnZArRRtE5GXHNtwXse8Zv0mhHpFLQ30Diz8cUGJV0C.F_Xuc9tZBMUY1SYEe_2Fv2 nTGIUklBjL2oB4J.P17qGLUS7mLh4V8KbU6uVbKjWa_sy3zi0UJcEz8GxX8icxH6JPW3TroLQsHy aN2eeEhnL.a7iS0g1ez4R5hRzYui8o40fJvRFMFXbi6D7aUi7ThsMRXUs40XKgCPIQF3oe6cOTWM OQdTbN9bqH30e18aUzsxyHdluntyryYyooCVIW2R94mPUBzn5Txe4lKlfXlrRPAlmPatTP8KO89z HoAsTy3WlYyMDW.pVLt3WLpI2FcruFtRV75UVr1n37Iay.2.JAH8rJau2y0GXtJxS7eTK2fyU.ay U2IQaOjJcCvI0K2SDQ04mBCzT1C.qEQ-- X-Sonic-MF: X-Sonic-ID: 86e4cd83-3766-41b1-8248-00fc4edfbdcc Received: from sonic.gate.mail.ne1.yahoo.com by sonic307.consmr.mail.ir2.yahoo.com with HTTP; Thu, 27 Apr 2023 23:30:44 +0000 Received: by hermes--production-ir2-74cd8fc864-9w846 (Yahoo Inc. Hermes SMTP Server) with ESMTPA ID 912b1d1a256b22e43f453e00130c1256; Thu, 27 Apr 2023 23:30:39 +0000 (UTC) From: Jakob Hauser To: Sebastian Reichel , Lee Jones , Liam Girdwood , Mark Brown , Rob Herring , Krzysztof Kozlowski Cc: Beomho Seo , Chanwoo Choi , Stephan Gerhold , Raymond Hackley , Pavel Machek , Axel Lin , ChiYuan Huang , Linus Walleij , linux-pm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, phone-devel@vger.kernel.org, ~postmarketos/upstreaming@lists.sr.ht, Jakob Hauser Subject: [PATCH v3 5/8] power: supply: rt5033_charger: Add RT5033 charger device driver Date: Fri, 28 Apr 2023 01:30:08 +0200 Message-Id: <0070da504581081906a30d1095b104c4c2930e86.1682636929.git.jahau@rocketmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org This patch adds device driver of Richtek RT5033 PMIC. The driver supports switching charger. rt5033 charger provides three charging modes. The charging modes are pre-charge mode, fast charge mode and constant voltage mode. They vary in charge rate, the charge parameters can be controlled by i2c interface. Cc: Beomho Seo Cc: Chanwoo Choi Tested-by: Raymond Hackley Signed-off-by: Jakob Hauser --- drivers/power/supply/Kconfig | 8 + drivers/power/supply/Makefile | 1 + drivers/power/supply/rt5033_charger.c | 464 ++++++++++++++++++++++++++ 3 files changed, 473 insertions(+) create mode 100644 drivers/power/supply/rt5033_charger.c diff --git a/drivers/power/supply/Kconfig b/drivers/power/supply/Kconfig index c78be9f322e6..ea11797670ca 100644 --- a/drivers/power/supply/Kconfig +++ b/drivers/power/supply/Kconfig @@ -766,6 +766,14 @@ config BATTERY_RT5033 The fuelgauge calculates and determines the battery state of charge according to battery open circuit voltage. +config CHARGER_RT5033 + tristate "RT5033 battery charger support" + depends on MFD_RT5033 + help + This adds support for battery charger in Richtek RT5033 PMIC. + The device supports pre-charge mode, fast charge mode and + constant voltage mode. + config CHARGER_RT9455 tristate "Richtek RT9455 battery charger driver" depends on I2C diff --git a/drivers/power/supply/Makefile b/drivers/power/supply/Makefile index 4adbfba02d05..dfc624bbcf1d 100644 --- a/drivers/power/supply/Makefile +++ b/drivers/power/supply/Makefile @@ -54,6 +54,7 @@ obj-$(CONFIG_BATTERY_MAX17040) += max17040_battery.o obj-$(CONFIG_BATTERY_MAX17042) += max17042_battery.o obj-$(CONFIG_BATTERY_MAX1721X) += max1721x_battery.o obj-$(CONFIG_BATTERY_RT5033) += rt5033_battery.o +obj-$(CONFIG_CHARGER_RT5033) += rt5033_charger.o obj-$(CONFIG_CHARGER_RT9455) += rt9455_charger.o obj-$(CONFIG_CHARGER_RT9467) += rt9467-charger.o obj-$(CONFIG_CHARGER_RT9471) += rt9471.o diff --git a/drivers/power/supply/rt5033_charger.c b/drivers/power/supply/rt5033_charger.c new file mode 100644 index 000000000000..038530d2f0a0 --- /dev/null +++ b/drivers/power/supply/rt5033_charger.c @@ -0,0 +1,464 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * Battery charger driver for RT5033 + * + * Copyright (C) 2014 Samsung Electronics, Co., Ltd. + * Author: Beomho Seo + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +#include +#include +#include +#include +#include + +static int rt5033_get_charger_state(struct rt5033_charger *charger) +{ + struct regmap *regmap = charger->rt5033->regmap; + unsigned int reg_data; + int state; + + if (!regmap) + return POWER_SUPPLY_STATUS_UNKNOWN; + + regmap_read(regmap, RT5033_REG_CHG_STAT, ®_data); + + switch (reg_data & RT5033_CHG_STAT_MASK) { + case RT5033_CHG_STAT_DISCHARGING: + state = POWER_SUPPLY_STATUS_DISCHARGING; + break; + case RT5033_CHG_STAT_CHARGING: + state = POWER_SUPPLY_STATUS_CHARGING; + break; + case RT5033_CHG_STAT_FULL: + state = POWER_SUPPLY_STATUS_FULL; + break; + case RT5033_CHG_STAT_NOT_CHARGING: + state = POWER_SUPPLY_STATUS_NOT_CHARGING; + break; + default: + state = POWER_SUPPLY_STATUS_UNKNOWN; + } + + return state; +} + +static int rt5033_get_charger_type(struct rt5033_charger *charger) +{ + struct regmap *regmap = charger->rt5033->regmap; + unsigned int reg_data; + int state; + + regmap_read(regmap, RT5033_REG_CHG_STAT, ®_data); + + switch (reg_data & RT5033_CHG_STAT_TYPE_MASK) { + case RT5033_CHG_STAT_TYPE_FAST: + state = POWER_SUPPLY_CHARGE_TYPE_FAST; + break; + case RT5033_CHG_STAT_TYPE_PRE: + state = POWER_SUPPLY_CHARGE_TYPE_TRICKLE; + break; + default: + state = POWER_SUPPLY_CHARGE_TYPE_NONE; + } + + return state; +} + +static int rt5033_get_charger_current_limit(struct rt5033_charger *charger) +{ + struct regmap *regmap = charger->rt5033->regmap; + unsigned int state, reg_data, data; + + regmap_read(regmap, RT5033_REG_CHG_CTRL5, ®_data); + + state = (reg_data & RT5033_CHGCTRL5_ICHG_MASK) + >> RT5033_CHGCTRL5_ICHG_SHIFT; + + data = RT5033_CHARGER_FAST_CURRENT_MIN + + RT5033_CHARGER_FAST_CURRENT_STEP_NUM * state; + + return data; +} + +static int rt5033_get_charger_const_voltage(struct rt5033_charger *charger) +{ + struct regmap *regmap = charger->rt5033->regmap; + unsigned int state, reg_data, data; + + regmap_read(regmap, RT5033_REG_CHG_CTRL2, ®_data); + + state = (reg_data & RT5033_CHGCTRL2_CV_MASK) + >> RT5033_CHGCTRL2_CV_SHIFT; + + data = RT5033_CHARGER_CONST_VOLTAGE_LIMIT_MIN + + RT5033_CHARGER_CONST_VOLTAGE_STEP_NUM * state; + + return data; +} + +static inline int rt5033_init_const_charge(struct rt5033_charger *charger) +{ + struct rt5033_charger_data *chg = charger->chg; + int ret; + unsigned int val; + u8 reg_data; + + /* Set constant voltage mode */ + if (chg->const_uvolt < RT5033_CHARGER_CONST_VOLTAGE_LIMIT_MIN || + chg->const_uvolt > RT5033_CHARGER_CONST_VOLTAGE_LIMIT_MAX) { + dev_err(charger->dev, + "Value 'constant-charge-voltage-max-microvolt' out of range\n"); + return -EINVAL; + } + + if (chg->const_uvolt == RT5033_CHARGER_CONST_VOLTAGE_LIMIT_MIN) + reg_data = 0x00; + else if (chg->const_uvolt == RT5033_CHARGER_CONST_VOLTAGE_LIMIT_MAX) + reg_data = RT5033_CV_MAX_VOLTAGE; + else { + val = chg->const_uvolt; + val -= RT5033_CHARGER_CONST_VOLTAGE_LIMIT_MIN; + val /= RT5033_CHARGER_CONST_VOLTAGE_STEP_NUM; + reg_data = val; + } + + ret = regmap_update_bits(charger->rt5033->regmap, RT5033_REG_CHG_CTRL2, + RT5033_CHGCTRL2_CV_MASK, + reg_data << RT5033_CHGCTRL2_CV_SHIFT); + if (ret) { + dev_err(charger->dev, "Failed regmap update\n"); + return -EINVAL; + } + + /* Set end of charge current */ + if (chg->eoc_uamp < RT5033_CHARGER_EOC_MIN || + chg->eoc_uamp > RT5033_CHARGER_EOC_MAX) { + dev_err(charger->dev, + "Value 'charge-term-current-microamp' out of range\n"); + return -EINVAL; + } + + if (chg->eoc_uamp == RT5033_CHARGER_EOC_MIN) + reg_data = 0x01; + else if (chg->eoc_uamp == RT5033_CHARGER_EOC_MAX) + reg_data = 0x07; + else { + val = chg->eoc_uamp; + if (val < RT5033_CHARGER_EOC_REF) { + val -= RT5033_CHARGER_EOC_MIN; + val /= RT5033_CHARGER_EOC_STEP_NUM1; + reg_data = 0x01 + val; + } else if (val > RT5033_CHARGER_EOC_REF) { + val -= RT5033_CHARGER_EOC_REF; + val /= RT5033_CHARGER_EOC_STEP_NUM2; + reg_data = 0x04 + val; + } else { + reg_data = 0x04; + } + } + + ret = regmap_update_bits(charger->rt5033->regmap, RT5033_REG_CHG_CTRL4, + RT5033_CHGCTRL4_EOC_MASK, reg_data); + if (ret) { + dev_err(charger->dev, "Failed regmap update\n"); + return -EINVAL; + } + + return 0; +} + +static inline int rt5033_init_fast_charge(struct rt5033_charger *charger) +{ + struct rt5033_charger_data *chg = charger->chg; + int ret; + unsigned int val; + u8 reg_data; + + /* Set limit input current */ + ret = regmap_update_bits(charger->rt5033->regmap, RT5033_REG_CHG_CTRL1, + RT5033_CHGCTRL1_IAICR_MASK, RT5033_AICR_2000_MODE); + if (ret) { + dev_err(charger->dev, "Failed regmap update\n"); + return -EINVAL; + } + + /* Set fast-charge mode charging current */ + if (chg->fast_uamp < RT5033_CHARGER_FAST_CURRENT_MIN || + chg->fast_uamp > RT5033_CHARGER_FAST_CURRENT_MAX) { + dev_err(charger->dev, + "Value 'constant-charge-current-max-microamp' out of range\n"); + return -EINVAL; + } + + if (chg->fast_uamp == RT5033_CHARGER_FAST_CURRENT_MIN) + reg_data = 0x00; + else if (chg->fast_uamp == RT5033_CHARGER_FAST_CURRENT_MAX) + reg_data = RT5033_CHG_MAX_CURRENT; + else { + val = chg->fast_uamp; + val -= RT5033_CHARGER_FAST_CURRENT_MIN; + val /= RT5033_CHARGER_FAST_CURRENT_STEP_NUM; + reg_data = val; + } + + ret = regmap_update_bits(charger->rt5033->regmap, RT5033_REG_CHG_CTRL5, + RT5033_CHGCTRL5_ICHG_MASK, + reg_data << RT5033_CHGCTRL5_ICHG_SHIFT); + if (ret) { + dev_err(charger->dev, "Failed regmap update\n"); + return -EINVAL; + } + + return 0; +} + +static inline int rt5033_init_pre_charge(struct rt5033_charger *charger) +{ + struct rt5033_charger_data *chg = charger->chg; + int ret; + unsigned int val; + u8 reg_data; + + /* Set pre-charge threshold voltage */ + if (chg->pre_uvolt < RT5033_CHARGER_PRE_THRESHOLD_LIMIT_MIN || + chg->pre_uvolt > RT5033_CHARGER_PRE_THRESHOLD_LIMIT_MAX) { + dev_err(charger->dev, + "Value 'precharge-upper-limit-microvolt' out of range\n"); + return -EINVAL; + } + + if (chg->pre_uvolt == RT5033_CHARGER_PRE_THRESHOLD_LIMIT_MIN) + reg_data = 0x00; + else if (chg->pre_uvolt == RT5033_CHARGER_PRE_THRESHOLD_LIMIT_MAX) + reg_data = 0x0f; + else { + val = chg->pre_uvolt; + val -= RT5033_CHARGER_PRE_THRESHOLD_LIMIT_MIN; + val /= RT5033_CHARGER_PRE_THRESHOLD_STEP_NUM; + reg_data = val; + } + + ret = regmap_update_bits(charger->rt5033->regmap, RT5033_REG_CHG_CTRL5, + RT5033_CHGCTRL5_VPREC_MASK, reg_data); + if (ret) { + dev_err(charger->dev, "Failed regmap update\n"); + return -EINVAL; + } + + /* Set pre-charge mode charging current */ + if (chg->pre_uamp < RT5033_CHARGER_PRE_CURRENT_LIMIT_MIN || + chg->pre_uamp > RT5033_CHARGER_PRE_CURRENT_LIMIT_MAX) { + dev_err(charger->dev, + "Value 'precharge-current-microamp' out of range\n"); + return -EINVAL; + } + + if (chg->pre_uamp == RT5033_CHARGER_PRE_CURRENT_LIMIT_MIN) + reg_data = 0x00; + else if (chg->pre_uamp == RT5033_CHARGER_PRE_CURRENT_LIMIT_MAX) + reg_data = RT5033_CHG_MAX_PRE_CURRENT; + else { + val = chg->pre_uamp; + val -= RT5033_CHARGER_PRE_CURRENT_LIMIT_MIN; + val /= RT5033_CHARGER_PRE_CURRENT_STEP_NUM; + reg_data = val; + } + + ret = regmap_update_bits(charger->rt5033->regmap, RT5033_REG_CHG_CTRL4, + RT5033_CHGCTRL4_IPREC_MASK, + reg_data << RT5033_CHGCTRL4_IPREC_SHIFT); + if (ret) { + dev_err(charger->dev, "Failed regmap update\n"); + return -EINVAL; + } + + return 0; +} + +static int rt5033_charger_reg_init(struct rt5033_charger *charger) +{ + int ret = 0; + + /* Enable charging termination */ + ret = regmap_update_bits(charger->rt5033->regmap, RT5033_REG_CHG_CTRL1, + RT5033_CHGCTRL1_TE_EN_MASK, RT5033_TE_ENABLE); + if (ret) { + dev_err(charger->dev, "Failed to enable charging termination.\n"); + return -EINVAL; + } + + /* + * Disable minimum input voltage regulation (MIVR), this improves + * the charging performance. + */ + ret = regmap_update_bits(charger->rt5033->regmap, RT5033_REG_CHG_CTRL4, + RT5033_CHGCTRL4_MIVR_MASK, RT5033_CHARGER_MIVR_DISABLE); + if (ret) { + dev_err(charger->dev, "Failed to disable MIVR.\n"); + return -EINVAL; + } + + ret = rt5033_init_pre_charge(charger); + if (ret) + return ret; + + ret = rt5033_init_fast_charge(charger); + if (ret) + return ret; + + ret = rt5033_init_const_charge(charger); + if (ret) + return ret; + + return 0; +} + +static enum power_supply_property rt5033_charger_props[] = { + POWER_SUPPLY_PROP_STATUS, + POWER_SUPPLY_PROP_CHARGE_TYPE, + POWER_SUPPLY_PROP_CURRENT_MAX, + POWER_SUPPLY_PROP_CONSTANT_CHARGE_VOLTAGE, + POWER_SUPPLY_PROP_MODEL_NAME, + POWER_SUPPLY_PROP_MANUFACTURER, + POWER_SUPPLY_PROP_ONLINE, +}; + +static int rt5033_charger_get_property(struct power_supply *psy, + enum power_supply_property psp, + union power_supply_propval *val) +{ + struct rt5033_charger *charger = power_supply_get_drvdata(psy); + int ret = 0; + + switch (psp) { + case POWER_SUPPLY_PROP_STATUS: + val->intval = rt5033_get_charger_state(charger); + break; + case POWER_SUPPLY_PROP_CHARGE_TYPE: + val->intval = rt5033_get_charger_type(charger); + break; + case POWER_SUPPLY_PROP_CURRENT_MAX: + val->intval = rt5033_get_charger_current_limit(charger); + break; + case POWER_SUPPLY_PROP_CONSTANT_CHARGE_VOLTAGE: + val->intval = rt5033_get_charger_const_voltage(charger); + break; + case POWER_SUPPLY_PROP_MODEL_NAME: + val->strval = RT5033_CHARGER_MODEL; + break; + case POWER_SUPPLY_PROP_MANUFACTURER: + val->strval = RT5033_MANUFACTURER; + break; + case POWER_SUPPLY_PROP_ONLINE: + val->intval = (rt5033_get_charger_state(charger) == + POWER_SUPPLY_STATUS_CHARGING); + break; + default: + return -EINVAL; + } + + return ret; +} + +static struct rt5033_charger_data *rt5033_charger_dt_init( + struct rt5033_charger *charger) +{ + struct rt5033_charger_data *chg; + struct power_supply_battery_info *info; + int ret; + + chg = devm_kzalloc(charger->dev, sizeof(*chg), GFP_KERNEL); + if (!chg) + return ERR_PTR(-ENOMEM); + + ret = power_supply_get_battery_info(charger->psy, &info); + if (ret) { + dev_err(charger->dev, "failed to get battery info\n"); + return ERR_PTR(-EINVAL); + } + + /* Assign data. Validity will be checked in the init functions. */ + chg->pre_uamp = info->precharge_current_ua; + chg->fast_uamp = info->constant_charge_current_max_ua; + chg->eoc_uamp = info->charge_term_current_ua; + chg->pre_uvolt = info->precharge_voltage_max_uv; + chg->const_uvolt = info->constant_charge_voltage_max_uv; + + return chg; +} + +static const struct power_supply_desc rt5033_charger_desc = { + .name = "rt5033-charger", + .type = POWER_SUPPLY_TYPE_USB, + .properties = rt5033_charger_props, + .num_properties = ARRAY_SIZE(rt5033_charger_props), + .get_property = rt5033_charger_get_property, +}; + +static int rt5033_charger_probe(struct platform_device *pdev) +{ + struct rt5033_charger *charger; + struct rt5033_dev *rt5033 = dev_get_drvdata(pdev->dev.parent); + struct power_supply_config psy_cfg = {}; + int ret; + + charger = devm_kzalloc(&pdev->dev, sizeof(*charger), GFP_KERNEL); + if (!charger) + return -ENOMEM; + + platform_set_drvdata(pdev, charger); + charger->dev = &pdev->dev; + charger->rt5033 = rt5033; + + psy_cfg.of_node = pdev->dev.of_node; + psy_cfg.drv_data = charger; + + charger->psy = devm_power_supply_register(&pdev->dev, + &rt5033_charger_desc, + &psy_cfg); + if (IS_ERR(charger->psy)) { + dev_err(&pdev->dev, "failed: power supply register\n"); + return PTR_ERR(charger->psy); + } + + charger->chg = rt5033_charger_dt_init(charger); + if (IS_ERR_OR_NULL(charger->chg)) + return -ENODEV; + + ret = rt5033_charger_reg_init(charger); + if (ret) + return ret; + + return 0; +} + +static const struct platform_device_id rt5033_charger_id[] = { + { "rt5033-charger", }, + { } +}; +MODULE_DEVICE_TABLE(platform, rt5033_charger_id); + +static const struct of_device_id rt5033_charger_of_match[] = { + { .compatible = "richtek,rt5033-charger", }, + { } +}; +MODULE_DEVICE_TABLE(of, rt5033_charger_of_match); + +static struct platform_driver rt5033_charger_driver = { + .driver = { + .name = "rt5033-charger", + .of_match_table = rt5033_charger_of_match, + }, + .probe = rt5033_charger_probe, + .id_table = rt5033_charger_id, +}; +module_platform_driver(rt5033_charger_driver); + +MODULE_DESCRIPTION("Richtek RT5033 charger driver"); +MODULE_AUTHOR("Beomho Seo "); +MODULE_LICENSE("GPL v2"); From patchwork Thu Apr 27 23:30:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakob Hauser X-Patchwork-Id: 677576 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5AB32C77B7F for ; Thu, 27 Apr 2023 23:36:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344321AbjD0XgM (ORCPT ); Thu, 27 Apr 2023 19:36:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42504 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229912AbjD0XgL (ORCPT ); Thu, 27 Apr 2023 19:36:11 -0400 Received: from sonic308-19.consmr.mail.ir2.yahoo.com (sonic308-19.consmr.mail.ir2.yahoo.com [77.238.178.147]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1890430C2 for ; Thu, 27 Apr 2023 16:36:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rocketmail.com; s=s2048; t=1682638566; bh=4J5rrnZpFezswuJYUtyHcCH81BOdg28v7BlFqifkzm8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From:Subject:Reply-To; b=Qud29B6J1oIVlcWDGq6UV1lwzpgfD1HbmP5bmNq84YMnJ4dOp3hbBDqK519RYzAu3pIBjZlOi86Qvyw/NcSQUjefxt4BArmxYVp6XFSVlhgVrlgNzBBcvBFlk0Rb+DXgM/GLRn5/Cpnf+DLdsGiGpdaGZHO2a8uTSVKzQ430QzZ8pVIUHBl6pbhwhOpO5lS4H8jC+mKcWoKj9Zks23td7i8IBLtY8aBJLJaZqyw1GC+bPj4X2wmOzCkupJpdf7akt26OWGCELAxuaMhjPmlI/MxjOl9xYEhC+TL6RxEG0qOOtjQazG2f5cgV010lyI4l8woZfW1OP2JlH1YKPXOEKw== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1682638566; bh=98lvrQFm7c8NwOqVpusVyw7RfMmf9CjBnCwImldO5kC=; h=X-Sonic-MF:From:To:Subject:Date:From:Subject; b=teF5e8BM0jI5O9E5u6ZHhwJdzCBONsLu8opuaV1NOkah+sX0kkDlWYhOduF1tVV6jaVSkRm/yKdjP3+KTidhckuhGfmw4GXIurSrRHO8qhw87IOa2ltnc5BGp9g3H17gDOQTh4z/6fnMZh6ZdPWvoQHONUP/DE+ZDSoh6j0eIfPruJWbAZK+maiK4qqnoAZV5LRisTySzgklRM9jnQABwpDoMo7kWqtT27RDg7gXQMXvwNBeadvGuWqwM681dMnuRpi8GVbwC0FR3CFP7qNtbEjxGG94wkRR76+KU1aKxWaPDQk7W2zGZKSbJ2vk9pzygJki5dPMcNtV0AXoPu6qyw== X-YMail-OSG: 9SmrivMVM1mtRz6Bie8xL0zchITEbHi83Ie4j8eNFAMaqjlQBfF0cRtL5OstS07 x0PpQ1AjPnnXRNUIehY5Fg_c4I8nhag5GWj.wtx33W98DGTzgfBq3bXJ8EE7EH9tZdOiNRe0FOPd d_9FDlkSNvwETMcIqSLW4bDsE2ItYwa5UXbTv1bZcNiX77KZoFFgdWssRBhlGKGMLs7UTdRJGmgs suZUdToJ0adYcGH5d.ojBJ55I40_XjFIJhbzIk0gcPf1AGOuywU2OlwJiuMxNpzSGcGxkysb8s8s C499Zba3UdwY_7NyfcrIq_dcPYNFEwVmgbniP1eebaL9CcyRZaAQr59bzg_faORwKEAQUjiEh.UH ahSd73j7sA3IFYuz2X.b2Ndegu5iWgnzTW4t261AIVQSHYujfpyI.MZeaEm4bX_OdKJ7Gbyl1GtJ _X9HjyB36lHomac_eQ4T75jJkVgb9JpSc..eHQi7x0C2IQN6P04kJG85lM.k.wMyBcIJ2.w90c2u OerbciDXFgC3WZ3fLIncHxP3eOm6T2wgXENdChC6cWN49KYSpvPdpVH._zwXdz57FIH2_qfwP36M 4PcSsEFYh_RkgeIKlkPUTTCLNC2xii.UlLXAvVElNnyKaJnW7zOApEVXEmS3rONb_uusEd.s0FAl ipgZBVnCkeMN01T1I5vEmNoSP_FxOSb1k28MH_NxmtLgG6uCamzvpRddh7sZiJoQDdXQoPZZockr SiLMnmFpSHvQFxFDQ1ioCT6Lg2Pdl7DuLJFWetr9DhiPYoqfTyIUKq4jzfMNRSDlC5PVTJWNAwPd VZHb8abtUaRore.gfkIipvreBzE6Nud7KcqUksZObTY0uIPODBfonZS4rXBv1fmw5Xo0osRxLho. lx_d1DeTQgjM3_ONwZn28ZYLIG8EZUr07yqHhjcnzveiQ9AOugbrzu4nUkddL0JG67i5mnIm_bHV kKdGlnV7Dg3gO92bwhKCFqf6rErw00qcHKZ6_F3BMfnV7UDvUh.Ipf8vw1VTeNUNDPnAgoqRVIk7 d_DzVZ5gddO8Q5.MHrULJUzc_VkgxTKHqt0QqVqPoj829ZGjiEeOAdTWWKtkBU81fq1bA_62fGjg qLYmaCjM2QiIEdumP0reX3Qbwtsyl6XARxy4SuxblwRIqRBfxQ53ibcqVGSiun8JzTxa1fz3FZ6m yJwTKp9HdoQYibDJEKDTPAcgGQDvxwYwWivOV8NLHMzUcVW8gvsfvx7jxbfv3C8uysD3lJ2n7fZJ QZ2iZThEbr3LlrQQLhLhGmMUuc1g6JirDvAmbmwB9gD6I9ZgOpQh5sLoL0z_wCeygCRuD2fECuel sKgLuOllOo2V8lhZY9H64cOwlEuVSwSb6O99XmJafsGVMmD_l44pIVlydaUGQVA9gtgnr1aKdHIF PduJcIgQHJ.ht0ot3EsY_u3F9MilmgqqQdhGpWORBxqCuO4SClcLbJRWFGhFPNs8mfOVmE87pnRe NkcFgR99lYcZ9KF8nsp0kpFi.w2MtwN2xUmOIjf4VetHaPxfVFqCh_5PEN2clDCGKtEbuP_ydKaB 2c.9fg957rl0b5P0mY2KQK_UMsihBVJxQ03UmmOrgtg1pMpPhfkrXDHGylagguovaJV.PlK970MA irrQ.Xp9IAPjMOmHAwSO.k5vqIzrQ2LKe1uie6figM8eAzdKNeK9zesBJvFIcTcZe3FocINthTwI bPxRhmAQC1my.0XvDamH07xZv7URHueJxNmzLO4zVsT.LtLMjS1fjeSVgRHJjqJFbDy_QO8JTnA9 KqhXnUiXwCTe1Sx_I.RO_P80Uj4WUFvjrKsKOFSUcsPt05ZQ.cEBVAxj_1DjwiN2EV.cenIxoobE Rd4Vwr87YC_U5TaU.l9.MykErYKkxjLNapI4DlMb.zfqtOXNzqkjewED5c8YICGPLTcq1zkpm7gB sz3285ARIG09M2I5YkiwpBIFuCj_ihfXI_eJapFNfE8IMoMqDD10_8848QTJObsyjLCf7IyGI6u2 HBpe1Phk1.ciacf66a0YnqOo1E_4vrn01uBLC.pKD16ByoBv_mubwqT9zrhEUzs69BilmOy6u4eA ehgEy0ynoF4sQZ_zPXEgWYP.9Kr7ccsA.v0ZXNZneG31y6zdPoCJjVyUCezf_LKPqhiT1.IdKHeC LkAeEe_idvn3eawj2haEQD6lDS2sBD5cos4Zr0tO49RsG8.G96wOHOoV4izgMF_JDMV2EbcOsvuE zSbuGoHrn94g9C_h3N0iCViSUnEsZOIfuxe_U3Qr8Dxx3vnBsNQ0..MovHD890CQsJbM1Uqgb3tN SFKkfMCgz2GIKrHuprRBrJ_K6gyo7mQ-- X-Sonic-MF: X-Sonic-ID: 6be0123e-0453-452a-9532-38378e2d7a86 Received: from sonic.gate.mail.ne1.yahoo.com by sonic308.consmr.mail.ir2.yahoo.com with HTTP; Thu, 27 Apr 2023 23:36:06 +0000 Received: by hermes--production-ir2-74cd8fc864-d5c78 (Yahoo Inc. Hermes SMTP Server) with ESMTPA ID b559be960ee93a958c6ba15207aea559; Thu, 27 Apr 2023 23:36:01 +0000 (UTC) From: Jakob Hauser To: Sebastian Reichel , Lee Jones , Liam Girdwood , Mark Brown , Rob Herring , Krzysztof Kozlowski Cc: Beomho Seo , Chanwoo Choi , Stephan Gerhold , Raymond Hackley , Pavel Machek , Axel Lin , ChiYuan Huang , Linus Walleij , linux-pm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, phone-devel@vger.kernel.org, ~postmarketos/upstreaming@lists.sr.ht, Jakob Hauser Subject: [PATCH v3 6/8] power: supply: rt5033_charger: Add cable detection and USB OTG supply Date: Fri, 28 Apr 2023 01:30:09 +0200 Message-Id: X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Implement cable detection by extcon and handle the driver according to the connector type. There are basically three types of action: "set_charging", "set_otg" and "set_disconnect". A forth helper function to "unset_otg" was added because this is used in both "set_charging" and "set_disconnect". In the first case it covers the rather rare event that someone changes from OTG to charging without disconnect. In the second case, when disconnecting, the values are set back to the ones from initialization to return into a defined state. Additionally, there is "set_mivr". When connecting to e.g. a laptop/PC, the minimum input voltage regulation (MIVR) shall prevent a voltage drop if the cable or the supply is weak. The MIVR value is set to 4600MV, same as in the Android driver [1]. When disconnecting, MIVR is set back to DISABLED. In the function rt5033_get_charger_state(): When in OTG mode, the chip reports status "charging". Change this to "discharging" because there is no charging going on in OTG mode [2]. [1] https://github.com/msm8916-mainline/linux-downstream/blob/GT-I9195I/drivers/battery/rt5033_charger.c#L499 [2] https://github.com/msm8916-mainline/linux-downstream/blob/GT-I9195I/drivers/battery/rt5033_charger.c#L686-L687 Tested-by: Raymond Hackley Signed-off-by: Jakob Hauser --- drivers/power/supply/rt5033_charger.c | 265 +++++++++++++++++++++++++- include/linux/mfd/rt5033.h | 8 + 2 files changed, 271 insertions(+), 2 deletions(-) diff --git a/drivers/power/supply/rt5033_charger.c b/drivers/power/supply/rt5033_charger.c index 038530d2f0a0..94f7b8e0da42 100644 --- a/drivers/power/supply/rt5033_charger.c +++ b/drivers/power/supply/rt5033_charger.c @@ -10,7 +10,10 @@ * published by the Free Software Foundation. */ +#include +#include #include +#include #include #include #include @@ -44,6 +47,10 @@ static int rt5033_get_charger_state(struct rt5033_charger *charger) state = POWER_SUPPLY_STATUS_UNKNOWN; } + /* For OTG mode, RT5033 would still report "charging" */ + if (charger->otg) + state = POWER_SUPPLY_STATUS_DISCHARGING; + return state; } @@ -135,6 +142,9 @@ static inline int rt5033_init_const_charge(struct rt5033_charger *charger) return -EINVAL; } + /* Store that value for later usage */ + charger->cv_regval = reg_data; + /* Set end of charge current */ if (chg->eoc_uamp < RT5033_CHARGER_EOC_MIN || chg->eoc_uamp > RT5033_CHARGER_EOC_MAX) { @@ -318,6 +328,152 @@ static int rt5033_charger_reg_init(struct rt5033_charger *charger) return 0; } +static int rt5033_charger_set_otg(struct rt5033_charger *charger) +{ + int ret; + + mutex_lock(&charger->lock); + + /* Set OTG boost v_out to 5 volts */ + ret = regmap_update_bits(charger->rt5033->regmap, RT5033_REG_CHG_CTRL2, + RT5033_CHGCTRL2_CV_MASK, + 0x37 << RT5033_CHGCTRL2_CV_SHIFT); + if (ret) { + dev_err(charger->dev, "Failed set OTG boost v_out\n"); + return -EINVAL; + } + + /* Set operation mode to OTG */ + ret = regmap_update_bits(charger->rt5033->regmap, RT5033_REG_CHG_CTRL1, + RT5033_CHGCTRL1_MODE_MASK, RT5033_BOOST_MODE); + if (ret) { + dev_err(charger->dev, "Failed to update OTG mode.\n"); + return -EINVAL; + } + + /* In case someone switched from charging to OTG directly */ + if (charger->online) + charger->online = false; + + charger->otg = true; + + mutex_unlock(&charger->lock); + + return 0; +} + +static int rt5033_charger_unset_otg(struct rt5033_charger *charger) +{ + int ret; + u8 data; + + /* Restore constant voltage for charging */ + data = charger->cv_regval; + ret = regmap_update_bits(charger->rt5033->regmap, RT5033_REG_CHG_CTRL2, + RT5033_CHGCTRL2_CV_MASK, + data << RT5033_CHGCTRL2_CV_SHIFT); + if (ret) { + dev_err(charger->dev, "Failed to restore constant voltage\n"); + return -EINVAL; + } + + /* Set operation mode to charging */ + ret = regmap_update_bits(charger->rt5033->regmap, RT5033_REG_CHG_CTRL1, + RT5033_CHGCTRL1_MODE_MASK, RT5033_CHARGER_MODE); + if (ret) { + dev_err(charger->dev, "Failed to update charger mode.\n"); + return -EINVAL; + } + + charger->otg = false; + + return 0; +} + +static int rt5033_charger_set_charging(struct rt5033_charger *charger) +{ + int ret; + + mutex_lock(&charger->lock); + + /* In case someone switched from OTG to charging directly */ + if (charger->otg) { + ret = rt5033_charger_unset_otg(charger); + if (ret) + return -EINVAL; + } + + charger->online = true; + + mutex_unlock(&charger->lock); + + return 0; +} + +static int rt5033_charger_set_mivr(struct rt5033_charger *charger) +{ + int ret; + + mutex_lock(&charger->lock); + + /* + * When connected via USB connector type SDP (Standard Downstream Port), + * the minimum input voltage regulation (MIVR) should be enabled. It + * prevents an input voltage drop due to insufficient current provided + * by the adapter or USB input. As a downside, it may reduces the + * charging current and thus slows the charging. + */ + ret = regmap_update_bits(charger->rt5033->regmap, RT5033_REG_CHG_CTRL4, + RT5033_CHGCTRL4_MIVR_MASK, RT5033_CHARGER_MIVR_4600MV); + if (ret) { + dev_err(charger->dev, "Failed to set MIVR level.\n"); + return -EINVAL; + } + + charger->mivr_enabled = true; + + mutex_unlock(&charger->lock); + + /* Beyond this, do the same steps like setting charging */ + rt5033_charger_set_charging(charger); + + return 0; +} + +static int rt5033_charger_set_disconnect(struct rt5033_charger *charger) +{ + int ret; + + mutex_lock(&charger->lock); + + /* Disable MIVR if enabled */ + if (charger->mivr_enabled) { + ret = regmap_update_bits(charger->rt5033->regmap, + RT5033_REG_CHG_CTRL4, + RT5033_CHGCTRL4_MIVR_MASK, + RT5033_CHARGER_MIVR_DISABLE); + if (ret) { + dev_err(charger->dev, "Failed to disable MIVR.\n"); + return -EINVAL; + } + + charger->mivr_enabled = false; + } + + if (charger->otg) { + ret = rt5033_charger_unset_otg(charger); + if (ret) + return -EINVAL; + } + + if (charger->online) + charger->online = false; + + mutex_unlock(&charger->lock); + + return 0; +} + static enum power_supply_property rt5033_charger_props[] = { POWER_SUPPLY_PROP_STATUS, POWER_SUPPLY_PROP_CHARGE_TYPE, @@ -355,8 +511,7 @@ static int rt5033_charger_get_property(struct power_supply *psy, val->strval = RT5033_MANUFACTURER; break; case POWER_SUPPLY_PROP_ONLINE: - val->intval = (rt5033_get_charger_state(charger) == - POWER_SUPPLY_STATUS_CHARGING); + val->intval = charger->online; break; default: return -EINVAL; @@ -392,6 +547,86 @@ static struct rt5033_charger_data *rt5033_charger_dt_init( return chg; } +static void rt5033_charger_extcon_work(struct work_struct *work) +{ + struct rt5033_charger *charger = + container_of(work, struct rt5033_charger, extcon_work); + struct extcon_dev *edev = charger->edev; + int connector, state; + int ret; + + for (connector = EXTCON_USB_HOST; connector <= EXTCON_CHG_USB_PD; + connector++) { + state = extcon_get_state(edev, connector); + if (state == 1) + break; + } + + /* + * Adding a delay between extcon notification and extcon action. This + * makes extcon action execution more reliable. Without the delay the + * execution sometimes fails, possibly because the chip is busy or not + * ready. + */ + msleep(100); + + switch (connector) { + case EXTCON_CHG_USB_SDP: + ret = rt5033_charger_set_mivr(charger); + if (ret) { + dev_err(charger->dev, "failed to set USB mode\n"); + break; + } + dev_info(charger->dev, "USB mode. connector type: %d\n", + connector); + break; + case EXTCON_CHG_USB_DCP: + case EXTCON_CHG_USB_CDP: + case EXTCON_CHG_USB_ACA: + case EXTCON_CHG_USB_FAST: + case EXTCON_CHG_USB_SLOW: + case EXTCON_CHG_WPT: + case EXTCON_CHG_USB_PD: + ret = rt5033_charger_set_charging(charger); + if (ret) { + dev_err(charger->dev, "failed to set charging\n"); + break; + } + dev_info(charger->dev, "charging. connector type: %d\n", + connector); + break; + case EXTCON_USB_HOST: + ret = rt5033_charger_set_otg(charger); + if (ret) { + dev_err(charger->dev, "failed to set OTG\n"); + break; + } + dev_info(charger->dev, "OTG enabled\n"); + break; + default: + ret = rt5033_charger_set_disconnect(charger); + if (ret) { + dev_err(charger->dev, "failed to set disconnect\n"); + break; + } + dev_info(charger->dev, "disconnected\n"); + break; + } + + power_supply_changed(charger->psy); +} + +static int rt5033_charger_extcon_notifier(struct notifier_block *nb, + unsigned long event, void *param) +{ + struct rt5033_charger *charger = + container_of(nb, struct rt5033_charger, extcon_nb); + + schedule_work(&charger->extcon_work); + + return NOTIFY_OK; +} + static const struct power_supply_desc rt5033_charger_desc = { .name = "rt5033-charger", .type = POWER_SUPPLY_TYPE_USB, @@ -414,6 +649,7 @@ static int rt5033_charger_probe(struct platform_device *pdev) platform_set_drvdata(pdev, charger); charger->dev = &pdev->dev; charger->rt5033 = rt5033; + mutex_init(&charger->lock); psy_cfg.of_node = pdev->dev.of_node; psy_cfg.drv_data = charger; @@ -434,6 +670,31 @@ static int rt5033_charger_probe(struct platform_device *pdev) if (ret) return ret; + /* + * Extcon support is not vital for the charger to work. If no extcon + * is available, just emit a warning and leave the probe function. + */ + charger->edev = extcon_get_edev_by_phandle(&pdev->dev, 0); + if (IS_ERR(charger->edev)) { + dev_warn(&pdev->dev, "no extcon phandle found in device-tree\n"); + goto out; + } + + ret = devm_work_autocancel(&pdev->dev, &charger->extcon_work, + rt5033_charger_extcon_work); + if (ret) { + dev_err(&pdev->dev, "failed to initialize extcon work\n"); + return ret; + } + + charger->extcon_nb.notifier_call = rt5033_charger_extcon_notifier; + ret = devm_extcon_register_notifier_all(&pdev->dev, charger->edev, + &charger->extcon_nb); + if (ret) { + dev_err(&pdev->dev, "failed to register extcon notifier\n"); + return ret; + } +out: return 0; } diff --git a/include/linux/mfd/rt5033.h b/include/linux/mfd/rt5033.h index e99e2ab0c1c1..d2c613764756 100644 --- a/include/linux/mfd/rt5033.h +++ b/include/linux/mfd/rt5033.h @@ -53,6 +53,14 @@ struct rt5033_charger { struct rt5033_dev *rt5033; struct power_supply *psy; struct rt5033_charger_data *chg; + struct extcon_dev *edev; + struct notifier_block extcon_nb; + struct work_struct extcon_work; + struct mutex lock; + bool online; + bool otg; + bool mivr_enabled; + u8 cv_regval; }; #endif /* __RT5033_H__ */