From patchwork Thu Apr 27 23:30:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakob Hauser X-Patchwork-Id: 13225846 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 BDFF5C77B61 for ; Thu, 27 Apr 2023 23:30:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344408AbjD0Xan (ORCPT ); Thu, 27 Apr 2023 19:30:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37250 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344413AbjD0Xal (ORCPT ); Thu, 27 Apr 2023 19:30:41 -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 5E1864232 for ; Thu, 27 Apr 2023 16:30:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rocketmail.com; s=s2048; t=1682638234; bh=tWxmac8mwRjMj71krRu9An5Rypa20FdRhR7NzHl2dAk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From:Subject:Reply-To; b=qyl5QOZKJR1uJ5cJEQdHB6GQivVff1J1Re7SpKiZs6yBFpa95G4NtVX1ySYMgih4uiIZTmxBvKs8Tu8w6DIfE/vtJjxiw0C+qi0lkPIReBF+C85iHFZzJz+NIu7go2St/iQeveq7HiXeCz15F/Yw8lpc0uDu0uWPSn+0KWfekmKbTtpmwoW1awr7PsSrnB4S8+9sK3YCoCh01Upsa/A82Vi5wwGtDrwkgraz1QjZM11+E5pf6+YlRDU9zQlSEJ0Y8xAtphat0CnPAJWuc57nSM69dChryY7F8hkB2FHUdDIFoajDQdS8DK1ADxxmCyLZyAtiqC9tRmzChAwRtWIXKw== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1682638234; bh=E8shyK6oiWaHIQoUePMgE24PvumwHbB6imJB7heussg=; h=X-Sonic-MF:From:To:Subject:Date:From:Subject; b=F7TF9x2rMD0s5KHd7+SMmFgrI+BpZ+SyT4XRSoquWuqcG1b/eR0c6SRo+PwBN7UQ1ivBiUG2uImeSc4RwhNl0fwk9fnPXqCBTKcInZxJcaoaooEBrVIeEbrNh/2/6NlglWf4smuvLMUWOorIs+gulm5KLQCcat5I0RulRl/WPANndzTe1GkE2wBEcePmmZfteHj6fbJKqjGfL83jrBpjnanW9uVvwRmfjvbE6MhnlDStuudhaFJ52jMSvmc3rA/uqI3fVFrvOQHqAAH2DXfBYznEkrO0HiwvolXia/Gz88vNXxIc+/DtTYllDaj3axiaHrr0w4vHJqvg+ucyKUQGRg== X-YMail-OSG: sOLyiosVM1lcjUTFeP3Q_IEVUmN8ewO53k7X3CH7xzYDdJ_9VgCynVyeNPyDF.V ZZH5ybd.dJpCXQhGRTGfm3.oN7.iJ5glWpWncdfwNZv5Z9czOn3RJ5ML9xv0UanBRTSaQgwbS5np 3yCLG_JLcb.b_6XvoEsUOlNPdYZZrwFREumItDgRz35w30l.ETL_RN0Id.5l2xpXBej6kWnQ9w.A _KKru5dod9Av.1Q9x33DgaTXbYaxcEi0I4cc5PTIiP2_BbwNfRrlUL5R.ehxG.ZTp7jwsawH7Nkf K_dO34yr0mhR2obHtfi9PXmWp1hb7yvdkGtY.ROtcAf2M4Fahaxs5x4so39S1xrglI5aXs5KqiUk FDIDpzPXkhU4p7hRd.KVbtq6dIW0m1DH_ntjZfM2d.gGpCpIog_GxeyxuH37OZ_s7C46ekmA79p. pSs4zoKmuME1DzjCUSP953Vm.7kViina4o2_06OGYU_aPXrjk2hcSY617sMvg273p0NGcN84yqz2 uctWozqThHNdJZSzy_6gIVo4T4KntLlaiAA5d5H3k.C2DYdqYKdjo4sZiJToVew6SADpHiHBY3fv gaA7pYiJy_7dMHN97fqWtmJGZ9zuBmz1WcdXbAyXR868DcVEKBuDbiJGL6I9VNRnF86AswKxRMkD UQOVdCTANfyFz8V1cQRix_.pPsBVaCEhy5JQ6tffB3eZ2kGi6G37sagI4kOF4zWvsRm7xm6CSkX. qFPct23dl2p5u7.xZ.UKmAyuTkuzgVQq3rzSwyslISMHC3fixG4vEk658YXC.kMkhg2cobSpMRF9 CoAcEAf_uXpEhojX8c5UwQDW.zpL9t8gMl7jZ7VZH9QTCBPwken7dKvdREvsr8g.I..8wPkJEFCV AVJHgvCWDLmgUtDmk.PtEG.jLjyrx9DkIRH.RQ6f5FmQNyy1Smc88csblF66XQhn9Su4LEyUp4Yt 56L1LZf6n8hKBasvIU0BRX4aDsxciOzs0_PF4a0qR.EGJBWwmow4zf5MlbXhZ7UFQqar.G0Pew3G q8mTtNtwRFLAo9lCICdJ9jG99mbkkuT764l.G9qHIgFhOIRsRfgYf1FejzNgEKWE6p35HCtcgRwB wt3xleRCmzLms5GueICvEgtbDwQzkiwyKM9pveWGzfeGOnq8uwEmLr7LpA_eY7c9OKig7ETLnsbX xvFBxP6ye0LpboXF9AhHQuuuoDDiY5MhKvOuHagJp_2mjqKUz_q5A2FlvWEbx0fJtTFymhiQ355Z 9Iw__ynjKwm9Hse7G2nPsLZZdN5.VhD4HoHFFHvkLgx6hCKJrBqHwstddodFY_lm9dKQRpu72axj W_jFXe9IGLxM_L_AIPRCi4bpoiFOjumoKBrvwch8MQuUqVzR73Ek0keJx8DBb6mmWHTgUb48BCUq kYvc.w5.Hpywp1ZaGqFRbBlQ7S_OMyuPd27a2RVuomBpk5WXzT6XbNUCF.IiJqSCb9VjDmYuTGlv GKmjVpPVAZCxLWgcYm1cH6MN97kcZCIzzSJItE3otQaWLN11purSLD_TfN7JKlzBwCh0Et9smrXa D9y2Aeh6pZSuEWYMvVNoZmoRPyPQNDshEA6W_8Qd1V_pInWZWnzCLJ_D0AuV2S4PIL9P5cEIM1oI fJnxWEcB0rVpbsFt3mimIwvCkBcyPHuMaEIgC76f38TUYRJqyIo4TB18zueTM7KBqsf.4KO.q7im fGWA2kKVRRea1_pBqlDfr9M9i4uFH7YkKwhmlXf.3Nb6duQ1xsOASFL3FLYk_uvhVIAQ00LGFDrT vNLA1F3HV_PJi1qWbl3S6UQwIBVdrmeWtbVkJzcXJl2b9Ab3JaxN3QGKOmlGFRDeCTe._bRRVTMD xJ7h3jxk9yVyujki8SCtFv7BNTHP2f8F2fZsLdhgdpokFZQYBaQhA3vlpM4wCDj_9apPG6ZuIgxF 6mkRsv1Oabrk8HHU1XsyWVT_bJI8FiwfAdEimgMwtasf2gBDOarZpCmlvjOmbaYoI3kdR_OqgkE4 TVYNOQzzjdP0tTmxywirhGz_4JxDO6dwj60Y0GMsp3mfuJk1RLIZOBFNmS_UPG_9DdEDARTtdSn7 ju6IYdn62uAAHDqq1gNK1DEpTjenUw6prM_tOmT1OV1MhsSXLtCAgq0GLlmr0L8wPlH6k0vqG62a Ln_MHUGf9Jtz5NauZ_c2OlecPZiWOv4ccMQRCdW.e.0Q.MDns.Ylj7Ue03YbVgE94Sn8LyUY88Jb dFThK6QC42S99QYxnrXkGg1zS9Z1GEYBjI9udhrTQxvEnrbj.zKLNdYDmg1cS1Ck88EOQvy_e7il 56ISKOAe29mHZVhlZjU6X10A- X-Sonic-MF: X-Sonic-ID: 496de9a9-910d-43ca-9817-720c78d0d241 Received: from sonic.gate.mail.ne1.yahoo.com by sonic307.consmr.mail.ir2.yahoo.com with HTTP; Thu, 27 Apr 2023 23:30:34 +0000 Received: by hermes--production-ir2-74cd8fc864-9w846 (Yahoo Inc. Hermes SMTP Server) with ESMTPA ID 912b1d1a256b22e43f453e00130c1256; Thu, 27 Apr 2023 23:30:33 +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, Lee Jones , Jakob Hauser Subject: [PATCH v3 1/8] mfd: rt5033: Drop rt5033-battery sub-device Date: Fri, 28 Apr 2023 01:30:04 +0200 Message-Id: <16f1dabc331513ba69162d0b2496cee0961276fc.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: linux-pm@vger.kernel.org From: Stephan Gerhold The fuel gauge in the RT5033 PMIC (rt5033-battery) has its own I2C bus and interrupt lines. Therefore, it is not part of the MFD device and needs to be specified separately in the device tree. Cc: Beomho Seo Cc: Chanwoo Choi Fixes: 0b271258544b ("mfd: rt5033: Add Richtek RT5033 driver core.") Signed-off-by: Stephan Gerhold Acked-by: Lee Jones Signed-off-by: Jakob Hauser Reviewed-by: Linus Walleij --- drivers/mfd/rt5033.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/mfd/rt5033.c b/drivers/mfd/rt5033.c index a5e520fe50a1..8029d444b794 100644 --- a/drivers/mfd/rt5033.c +++ b/drivers/mfd/rt5033.c @@ -40,9 +40,6 @@ static const struct mfd_cell rt5033_devs[] = { { .name = "rt5033-charger", .of_compatible = "richtek,rt5033-charger", - }, { - .name = "rt5033-battery", - .of_compatible = "richtek,rt5033-battery", }, { .name = "rt5033-led", .of_compatible = "richtek,rt5033-led", From patchwork Thu Apr 27 23:30:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakob Hauser X-Patchwork-Id: 13225848 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 AA500C77B7C for ; Thu, 27 Apr 2023 23:30:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344431AbjD0Xao (ORCPT ); Thu, 27 Apr 2023 19:30:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37250 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344424AbjD0Xam (ORCPT ); Thu, 27 Apr 2023 19:30:42 -0400 Received: from sonic313-21.consmr.mail.ir2.yahoo.com (sonic313-21.consmr.mail.ir2.yahoo.com [77.238.179.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7A8DB421A 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=1682638236; bh=Fg8O9S7CQWLvLBXMCmKEFeFmz8DxFrOra+7NQGOwBwo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From:Subject:Reply-To; b=izqek3gebLUiMUc++qyVsn6UxbtTlO6eLBY78E6g1uHBnCFMspBzLw89x9hcC7Us5j/b6Ap84i7bRwDiUgKP+kDN47oRG6ncHm5hbDALcZf+aYQaBYIypQ1qlK311wuGWgsQ4PaOey1crKi6vA2/qIyOctLCY2a33HL+mLTx+IemPx/+kkKdYnjS94K4OvAG6xInl775mh/gStsu9nFaXiRJWPkb93uRQeml9+z0WRJpL2sBmkI3DSnNeZIMK7hDmXupoSi4WeN6ZOuBFN+lceSD8ePbbjT1ud8SnCzs29DdegZTP3/dxhWRn2n9O9PJ0+ix3Ew0MuqkRdO91tBY6Q== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1682638236; bh=dWiTtY/4/MaCv5v/MxK2MH2OmOYdRFb5lS37KN6alH5=; h=X-Sonic-MF:From:To:Subject:Date:From:Subject; b=c3d29tgYDQngI638H8pobPDqyF5s82vN6sFnYq7oOkftxPp+p9d78hNuJ2sE00SpX1e6Jth6/lKa0aczWU8Na5kNNd1yPbJY0jDJcnCxQRjU2XiKIy4FqQVkHFKNshyDcUHIXI5Z2uPHVFmP+gkbrpvVS3p/rY1bFu4ntczPPFmBlkX8a/q5Hysj+CHqrLEAU5cq1Fwammbh9OLt1zzt6VUF6ZDVIS6PM7rKmqqG1PGDqs1/rL159C1j3Kpjtws+9IhlNLFQsBM7H4qrGCBSrb6TxqeHM1HUV3Sj9caRs7UI1eLRmShmDAiMU7xGH3KeEUMCiEF9+y0VhyR9uTXsHQ== X-YMail-OSG: xV6o_T8VM1mMCxldKnBSjCDCAU3ScFxjRdNVVrb2DUwiGWI3hIGgLk0f6YWtMNM Zx9DCNWXIe.BCma2rty502vbXglqxTsWun3D4Sg1r0ZVoh7W0fusCHjyrwxKQDdq6Xl4sX_zzu8n 6z4PAVrdBaRuTu_YATDyZsBE37OvL3ld.a9Buo631ix7hxPn3IXHFgv2WQa5Dpt4pW8r5EdvLWt9 B75XxLvKNzLJCueFzLSuF8rNZ39vC7N.1PIVn4njzMdbHRkPRhNRfLe4kwZ2w2mGx2nSBon8i5Uc gFG4s.i8tyXu_ZkrGQJiJAgUH67ug0rMXxoxYg95pUDx8i6h6WHQdZEsdTGVyHhigRgpDgtryolx een1ULFX4oYOBM_2s0so_jwxBCee.978VZdEvuXbo90uOZ8rLUE00zF0mIna9C.dVrPvPq4rh6kI w4uIgfJcJP2qylb0vXI_tZst5qWBFUDSRzKqja6lFNbJLbnJBGvAWMSZ8ri6p8GRwegBgcuL5Jfq Ci5i1MbK_1Of1kihOBzMtOEIzYKgffsRA.i.HN4in.MS3GDrAS9.ddRZCkLHIQimkBa5fn.54oCj k6La0dxU.AD10tlC2VA81J.LiT2ymmH7yHXo3z3ZKtwrfTXbZVAEO5ijfiIckD3bS6_5WDlFhZZS RGEW4AEv3yBdptrg71xMzgA4MIEiU7yrBGibHdk3AxoavOEHOrP4G9m8BxlSG8DO5psk_EZiGSID GdrdvxxdxSMtzGvq5UtvLT5X1retWVzYFs_4fDwNPUps.R_GfioEDcgSoRVm1fuwWcAFJ7bg44kt r3yvuhuJZn4TUwXCwRlL7te.p22dsZEQFe5w12dwd0zMnvA1H29Rxg1zggBOPJ37IlipGfqqv9I9 NwinsVRAZRlSOYMut5T8KWnTcYdyRIQUtJgTcV.OTKUUdVE1fzUE1p3Sg3EiWc2Y9VcUVd4v4N5X aU2QLLksW7IiZ.4YCJ5zndpCkWysgXRJG9_74HSRQOSA8hmXSVKWiatLU5voi1ujV4zI8RF9TE_d YPTvdQo70PgzFq4.U6E8hUqmdbdPnAg6Dsc6Y3IXyd00fKA3oZ9A9.cnjibkyo5RzIBZ5ZAmDGNs LAxFtL11ey.h8qYTJ2yghMMttGuv1gXL5wKkozjN32AEsMUe.AzZuzMzebpeDcBEYKEpLPDbn9oR J6.PYRIb3n06QBBErEog0ZMZSrbnu8dk727kaEog.0m4uN0KXxlrGd0m3ybMsR_WYBvfexrChaLX ZQeXhe3DAW2ALFr3Oe.bn7Q42ylnPS5UDEEKhRZuPYzI15oGgoISNvnAaGkOqOJcZ9uPfYPHmID8 MFUuMxuXJ88bWSi0x7t947dHl1pjHGaCZOgrZ.GI6i46lNfNsmk1EVRbxXSR4lCwuiEMwcDs.GfW KpL9IQKIrPyKYdR5ZRj0jmzVK4qmbZe2fHBHFhRaWJFJmv1kw0enVa6tqAadF1ksi91AxVYLxVPv LAXvMoKc6tMeV3DJI3de7CG2wYiBtptDYpqJX5Gbr4dlXbaP.qf1vZ_zP.iE9k.PuAOTkHm3a2_c 3Ofrcvq4xUDXQCS0UUcHKvNIj9XyHEJchYe0tzGkoZmCaowxdSXeBkKneKfLNpat8oDKRs6SmdVn Cld51L5MYcbNj9EoUWo5H1ARGokXTgHWPkvGQA5DqL2qwX4RIheFnyIZheu6DDKXC4vfzekvBJs9 Txjum4dZuCJ5aghNvHZVPTrzz7GFs.WCAnplrvuuDjJdju2opqAAu3pR6HIQz8OymWwmiMSIESrM CVAhSDUaZnYX.V79rwsw3BPPGcozLgEndmyYpYfL4h2c0Wdsn3WUvSbxJ6b4pR20c7Io4H4_AAI6 Fp.oCNdWMgR9ViPmLk4csOQNzCt7vhzWREIkGBxlru9kn2JVdlNiqffW6I3yQCTG0kkFGQF_rlFR YSUfAGjyLLBxL39Gwy6zkpzejCINQ4PmfpbguWF74sMmZCkrj8gwGZanS1_nrwMcCh03BN6Uv6M4 RSE47uf242B4jZrFezkeR7JXXxn7Aw5wrucbvRFQijOYUy5fcynwRnRZJ6TiWxFsz3JprIRWqINv 0An_KVzh2d_Z26xVQ0mGgN1J5HpM2oSfdO998ZtIVA_zOJXesdtVI_hJaZ9YWe527pcGUhVVjybu UWXRFnKQGs76TIEp1ZmncXIJtzXInQirfrHZK.GG_1konzXfsGj9N8x3bHBZ4hFSuiVXLAf5wmHY 3baoYku9FQLU1GnECNx_JOWvBAWFJ.RR2ltvUqkhexCM9lw1Jp2yoVtM2_EVQv0qedaxW3Vzqmwy 7x0DCrymQUNf_RrKJnidErQ-- X-Sonic-MF: X-Sonic-ID: 2e63afa5-df03-43b5-bf09-af9c6ec7a812 Received: from sonic.gate.mail.ne1.yahoo.com by sonic313.consmr.mail.ir2.yahoo.com with HTTP; Thu, 27 Apr 2023 23:30:36 +0000 Received: by hermes--production-ir2-74cd8fc864-9w846 (Yahoo Inc. Hermes SMTP Server) with ESMTPA ID 912b1d1a256b22e43f453e00130c1256; Thu, 27 Apr 2023 23:30:34 +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 2/8] mfd: rt5033: Fix chip revision readout Date: Fri, 28 Apr 2023 01:30:05 +0200 Message-Id: <36e5dfcd1c724060e44798dbb1eeee2321cac583.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: linux-pm@vger.kernel.org After reading the data from the DEVICE_ID register, mask 0x0f needs to be applied to extract the revision of the chip [1]. The other part of the DEVICE_ID register, mask 0xf0, is a vendor identification code. That's how it is set up at similar products of Richtek, e.g. RT9455 [2] page 21 top. [1] https://github.com/msm8916-mainline/linux-downstream/blob/GT-I9195I/drivers/mfd/rt5033_core.c#L484 [2] https://www.richtek.com/assets/product_file/RT9455/DS9455-00.pdf Signed-off-by: Jakob Hauser --- drivers/mfd/rt5033.c | 5 +++-- include/linux/mfd/rt5033-private.h | 4 ++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/drivers/mfd/rt5033.c b/drivers/mfd/rt5033.c index 8029d444b794..3eee4242ee02 100644 --- a/drivers/mfd/rt5033.c +++ b/drivers/mfd/rt5033.c @@ -55,7 +55,7 @@ static const struct regmap_config rt5033_regmap_config = { static int rt5033_i2c_probe(struct i2c_client *i2c) { struct rt5033_dev *rt5033; - unsigned int dev_id; + unsigned int dev_id, chip_rev; int ret; rt5033 = devm_kzalloc(&i2c->dev, sizeof(*rt5033), GFP_KERNEL); @@ -78,7 +78,8 @@ static int rt5033_i2c_probe(struct i2c_client *i2c) dev_err(&i2c->dev, "Device not found\n"); return -ENODEV; } - dev_info(&i2c->dev, "Device found Device ID: %04x\n", dev_id); + chip_rev = dev_id & RT5033_CHIP_REV_MASK; + dev_info(&i2c->dev, "Device found (rev. %d)\n", chip_rev); ret = regmap_add_irq_chip(rt5033->regmap, rt5033->irq, IRQF_TRIGGER_FALLING | IRQF_ONESHOT, diff --git a/include/linux/mfd/rt5033-private.h b/include/linux/mfd/rt5033-private.h index 6bb432f6a96c..b035a67cec73 100644 --- a/include/linux/mfd/rt5033-private.h +++ b/include/linux/mfd/rt5033-private.h @@ -71,6 +71,10 @@ enum rt5033_reg { /* RT5033 CHGCTRL2 register */ #define RT5033_CHGCTRL2_CV_MASK 0xfc +/* RT5033 DEVICE_ID register */ +#define RT5033_VENDOR_ID_MASK 0xf0 +#define RT5033_CHIP_REV_MASK 0x0f + /* RT5033 CHGCTRL3 register */ #define RT5033_CHGCTRL3_CFO_EN_MASK 0x40 #define RT5033_CHGCTRL3_TIMER_MASK 0x38 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: 13225849 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 6D568C77B73 for ; Thu, 27 Apr 2023 23:30:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344443AbjD0Xas (ORCPT ); Thu, 27 Apr 2023 19:30:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37424 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344434AbjD0Xaq (ORCPT ); Thu, 27 Apr 2023 19:30:46 -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 A6CC3468C 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: linux-pm@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:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakob Hauser X-Patchwork-Id: 13225850 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 EEA38C7EE21 for ; Thu, 27 Apr 2023 23:30:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344455AbjD0Xaw (ORCPT ); Thu, 27 Apr 2023 19:30:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37444 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344438AbjD0Xaq (ORCPT ); Thu, 27 Apr 2023 19:30:46 -0400 Received: from sonic303-21.consmr.mail.ir2.yahoo.com (sonic303-21.consmr.mail.ir2.yahoo.com [77.238.178.202]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BFC2C30E9 for ; Thu, 27 Apr 2023 16:30:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rocketmail.com; s=s2048; t=1682638240; bh=5w6Shyycf9TKW8fxiIBkdZ0V7BL6iy8PZMl/Ylzmv2k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From:Subject:Reply-To; b=lIO/G6G0791liF6HsWkUX3fRrnRTeR40wXCW7myx4n1RJxqWB3xIK0ZPCazMbHMfOvtX1LVGIbh5K4l6GRxaA0J5YRJ9xJyo8NVfQvsco1Au8+0dWGkvO0bp/n1F3a5xB1BdtXQ/8hIn3ZeoZTvuh/sZYTO4nvpLnxbIeRFOYorbw6jF6jUoPBbcwDLkIKgVeXODshUUZwjVm1H6fvcu1Deib+P3ksqBjrHjXNeaH+d4x16SlGZ2l2MZrNLphg0cxxdpTuLMea8DiltbRKdOl98+gi0+DRC44K+jNopaxCFDeD1+0LBf45GQ2yO5qe+z6tYp1H5xnDuC/S9K+W2d0w== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1682638240; bh=7AwfMWhIcIpV+xE2e+9RfQ22UQGUhT+EcKvKOlDcxZl=; h=X-Sonic-MF:From:To:Subject:Date:From:Subject; b=KVhEIfUmooyuGQCXI8LlgZ0t9gL0MHbJ6QHXJzKx9N9MZTfqeMDQXfX3vJUGJmET/Oe8aAAQRx/G8m7th0Q9juaR1SFonD/3WNZoaXbhQtdmcBGeh6EiHVN5UDfeODDBCCH2zbfEe9u8hhqcgtEM30FsLpygTt5+T/zJCiDWKaGCznPflAFSVZ6lbSX0OaXlHyKFPAYqgKRM7mt9QZx1TWknQO0d0lqFSwpj0XIgy5k1SwgcUzH8X6cAmfvQiOzN4Jh/8NvDeyufwUs1WWeR6Cy+yezq78WsbqVfNZ/lYVnF13dQtf9pwBoCBN8CLoazOicV3hh7QwHsLLKZa5o2PA== X-YMail-OSG: JQFEhTAVM1nVEnx7AGEET9qVTJY1EzA4MO1ecXl8CjOgeVtBuCE4qgCvJHdp3_7 wStUaNVC3dv5fTgIL1uZiRYR40lwyKV9UYG1HP2BJYom8Rkoy7g27WzyX3juj9y7fypv0b6JbDvB USYiyUdTcJz1TAveRvRgW6mJygqiHjoK53blXCFObKxhO5Uec59zrIS7ZkGrd1Ad324LCE1HwKB1 gQx46VXpuWOcnQnwjgNLH7swRNHRHTvRIy.S256ECsVPX3PdWFxfjmjrTeqnzyS_XymM75RcepXZ _SpcSgqGcmW4G7jPmBALat_gwKyGRGi2KsxYenmr2jrKTyhXQ7.PwouzkRMHYKO5ZxFia1tclIZz DKh8WWRl3s.Ijy5DEwUzQ9INpSlYB03u9MvJoj8RH0MnXFOS8QkN2g478YVTqOimZWJdwuL_YL6m oHLtmtAP6ZrpVgMKe923SX0EXdASHuTHB0pXE.kO8sAx7FLkTAbHic_qXPPzZrVpdpQI76XRwSAg BZ41sbm7LK_sFH3CaiAbt9Ak.dZO_6Le8UqxCOLS9bVnD5tYF1y7v.c6VmgeNy6L0NL3OU.MzNEu vVFTmy5bKm7OizUx2AyFmBB6XoRPdGoSJ54tusLRdSYJBDle.ezhI49xCJtXXDA44DYPvBq80wgm JTsd5oiFs5bSf6_xzGqhc6uWptuQS4_vD0ptwrpFuOeUvI_lrhqUkyUfpx9gBRkZeofUIfyeXMB4 3KuX6mTm7OYzZJBB1cld4B9hpiN399lVUCMOJh5hBIrkpp9p1ZxWTMb20SaF3vQqv9S8zu_.JcjG cX19TvMX_wtqzd3oITXOH9PDJdxdin5Hb7BzNp7V_rtsojhvUjEweaLmU5_sfnlE6MgmHSmjFDPB ouEFrWv622XGl00Vxz_KHBnWoJbXsPUMPPJqBBk95C6SUERn463MP_p8061MzV1dTnCSB2Xk6uyR NpoHPdVLPHgwvuTZMaXQoWOHnQn.lrZ5mQgYE4FXyOr1OTsODJw4oXrjjZECfERGjb0kB4AiCant Bml97dCTZfzffj.P2aCX3FQH4HTiyTvfe8Sjk.enqsWjCzZOrBqq7ejk_99qKcD5yafKeA9EebyZ zk0NgNPKbwotEgCepB.tRDZFC_RKS2o4P73iREL0OCehqBbIfP0erBOc_4b7Rt.F.PvAZKGqPzDl nOHEGMdTavPkHBlfZDxDDljxR6zqjIWaqSOniTjXnsTMDVNEoi2nCbcmeuxd4I6HjwPt1O44o3RO 9PpvlW0cAuKW4B8DhAP7fW1_z3.imXxRF.fXVc_nuQjBlYUeH1CWxygR3qC4I45f_PrGpOVFcHQ3 16xS4xeuN6zxPcATRKa3HvFeUY_UdOuOVzyfVEhP5CijzUBC3KVWuwHvjIDtZk8yY.DsEE4BVVDb rMCsOJ._4M5zweG01nAYrCIeOyhZQCWVVf7ulMCZtpMg6EtzUmys9mEIafvW4S.y41uK09.cLrZi xwSs_x2bawei2kgnwCC_ouOiFXcdYFC6ebymEPEaZv9Ca0O6dNDcbYS_gvg_kuijzjj68w62krEU JQxSSPDlgQvfucIdEz1OUvc8ITYBy9M_tq0xe5oN.O9_ulaZSxhoKr114jJ_wgHdUEVkPrj4mn9M 0FyVeycms4gmkgnp_9rIFKH_WabeO4CS3zWsGy9VozOpu8Yuu4YI2EF2m9jrFfngo1nKeRMZzI66 pDmTMN5FqMeMEh_W2QnfgroaOX.Z27R7NHsEjY6TDJmZ4oEbCatsuAfWQvxL8v3ikHXDg.KJshYr aWBim1Si0p1_P0CTYqN6.rklnpZ1pS9sm7sfXIqNJuqcswx.kPU4rqv.NSzyiJXEI06Q0rwv_xio 8FIqgxNXEfAzH0vU2iIIHlJS_9nXVCwJgb6ePQIiJHg1bfcSsXD5llTdevaOaZjkei.GyZLIXB6s nY3o8YX3pzuz6wc_PTt4A2AhHa1ySFV1NJ2lUx9r71zYRvnUSbArjcIM6uWWnETKfuBFuIg7Z3oV 9iTzKtnJR2DTifazORl6ecOaxZa9g4x.X4l.mCy0aQvLtLkTZ8hHNZTHYpPVUjw9B0D0jipgxDs6 i9MeL2Fzl_sPprwmyZekW2TcULxPihz2Bmb0mAByAiD9wVQt3xAqWRZwZekmNhnXNiycolAXPdKD R64HPx..OkMvmN5eaiABzU4fKrqPeynNbdziIIbEnSfLX00RSQJVdnMeqZ_bIFjVYGfWP.n3JKiT 4bo6n0M5jz5Yf0FmQbF9a8Vti1SsplulEUHWnbVO6R9vv8O6l9V4ZNPIWRMBpu9euP6YxnRK8.cE be0Q39cXgTmAcSk6aY36bhi3B X-Sonic-MF: X-Sonic-ID: 0a167e92-6dd8-4fb9-b86e-24f661fe5a24 Received: from sonic.gate.mail.ne1.yahoo.com by sonic303.consmr.mail.ir2.yahoo.com with HTTP; Thu, 27 Apr 2023 23:30:40 +0000 Received: by hermes--production-ir2-74cd8fc864-9w846 (Yahoo Inc. Hermes SMTP Server) with ESMTPA ID 912b1d1a256b22e43f453e00130c1256; Thu, 27 Apr 2023 23:30:37 +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 4/8] mfd: rt5033: Apply preparatory changes before adding rt5033-charger driver Date: Fri, 28 Apr 2023 01:30:07 +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: linux-pm@vger.kernel.org Order the register blocks to have the masks in descending manner. Add new defines for constant voltage shift (RT5033_CHGCTRL2_CV_SHIFT), MIVR mask (RT5033_CHGCTRL4_MIVR_MASK), pre-charge current shift (RT5033_CHGCTRL4_IPREC_SHIFT), internal timer disable (RT5033_INT_TIMER_DISABLE), termination disable (RT5033_TE_DISABLE), CFO disable (RT5033_CFO_DISABLE), UUG disable (RT5033_CHARGER_UUG_DISABLE). The fast charge timer type needs to be written on mask 0x38 (RT5033_CHGCTRL3_TIMER_MASK). To avoid a bit shift on application, change the values of the timer types to fit the mask. Added the timout duration as a comment. And the timer between TIMER8 and TIMER12 is most likely TIMER10, see e.g. RT5036 [1] page 28 bottom. Add value options for MIVR (Minimum Input Voltage Regulation). Move RT5033_TE_ENABLE_MASK to the block "RT5033 CHGCTRL1 register", in order to have the masks of the register collected there. To fit the naming scheme, rename it to RT5033_CHGCTRL1_TE_EN_MASK. Move RT5033_CHG_MAX_CURRENT to the block "RT5033 charger fast-charge current". Add new defines RT5033_CV_MAX_VOLTAGE and RT5033_CHG_MAX_PRE_CURRENT to the blocks "RT5033 charger constant charge voltage" and "RT5033 charger pre-charge current limits". In include/linux/mfd/rt5033.h, turn power_supply "psy" into a pointer in order to use it in devm_power_supply_register(). [1] https://media.digikey.com/pdf/Data%20Sheets/Richtek%20PDF/RT5036%20%20Preliminary.pdf Signed-off-by: Jakob Hauser --- include/linux/mfd/rt5033-private.h | 53 ++++++++++++++++++++---------- include/linux/mfd/rt5033.h | 2 +- 2 files changed, 36 insertions(+), 19 deletions(-) diff --git a/include/linux/mfd/rt5033-private.h b/include/linux/mfd/rt5033-private.h index b6773ebf4e6b..0221f806d139 100644 --- a/include/linux/mfd/rt5033-private.h +++ b/include/linux/mfd/rt5033-private.h @@ -55,22 +55,24 @@ enum rt5033_reg { }; /* RT5033 Charger state register */ +#define RT5033_CHG_STAT_TYPE_MASK 0x60 +#define RT5033_CHG_STAT_TYPE_PRE 0x20 +#define RT5033_CHG_STAT_TYPE_FAST 0x60 #define RT5033_CHG_STAT_MASK 0x30 #define RT5033_CHG_STAT_DISCHARGING 0x00 #define RT5033_CHG_STAT_FULL 0x10 #define RT5033_CHG_STAT_CHARGING 0x20 #define RT5033_CHG_STAT_NOT_CHARGING 0x30 -#define RT5033_CHG_STAT_TYPE_MASK 0x60 -#define RT5033_CHG_STAT_TYPE_PRE 0x20 -#define RT5033_CHG_STAT_TYPE_FAST 0x60 /* RT5033 CHGCTRL1 register */ #define RT5033_CHGCTRL1_IAICR_MASK 0xe0 -#define RT5033_CHGCTRL1_MODE_MASK 0x01 +#define RT5033_CHGCTRL1_TE_EN_MASK 0x08 #define RT5033_CHGCTRL1_HZ_MASK 0x02 +#define RT5033_CHGCTRL1_MODE_MASK 0x01 /* RT5033 CHGCTRL2 register */ #define RT5033_CHGCTRL2_CV_MASK 0xfc +#define RT5033_CHGCTRL2_CV_SHIFT 0x02 /* RT5033 DEVICE_ID register */ #define RT5033_VENDOR_ID_MASK 0xf0 @@ -82,14 +84,15 @@ enum rt5033_reg { #define RT5033_CHGCTRL3_TIMER_EN_MASK 0x01 /* RT5033 CHGCTRL4 register */ -#define RT5033_CHGCTRL4_EOC_MASK 0x07 +#define RT5033_CHGCTRL4_MIVR_MASK 0xe0 #define RT5033_CHGCTRL4_IPREC_MASK 0x18 +#define RT5033_CHGCTRL4_IPREC_SHIFT 0x03 +#define RT5033_CHGCTRL4_EOC_MASK 0x07 /* RT5033 CHGCTRL5 register */ -#define RT5033_CHGCTRL5_VPREC_MASK 0x0f #define RT5033_CHGCTRL5_ICHG_MASK 0xf0 #define RT5033_CHGCTRL5_ICHG_SHIFT 0x04 -#define RT5033_CHG_MAX_CURRENT 0x0d +#define RT5033_CHGCTRL5_VPREC_MASK 0x0f /* RT5033 RT CTRL1 register */ #define RT5033_RT_CTRL1_UUG_MASK 0x02 @@ -128,20 +131,28 @@ enum rt5033_reg { #define RT5033_AICR_1500_MODE 0xc0 #define RT5033_AICR_2000_MODE 0xe0 -/* RT5033 use internal timer need to set time */ -#define RT5033_FAST_CHARGE_TIMER4 0x00 -#define RT5033_FAST_CHARGE_TIMER6 0x01 -#define RT5033_FAST_CHARGE_TIMER8 0x02 -#define RT5033_FAST_CHARGE_TIMER9 0x03 -#define RT5033_FAST_CHARGE_TIMER12 0x04 -#define RT5033_FAST_CHARGE_TIMER14 0x05 -#define RT5033_FAST_CHARGE_TIMER16 0x06 +/* RT5033 charger minimum input voltage regulation */ +#define RT5033_CHARGER_MIVR_DISABLE 0x00 +#define RT5033_CHARGER_MIVR_4200MV 0x20 +#define RT5033_CHARGER_MIVR_4300MV 0x40 +#define RT5033_CHARGER_MIVR_4400MV 0x60 +#define RT5033_CHARGER_MIVR_4500MV 0x80 +#define RT5033_CHARGER_MIVR_4600MV 0xa0 +#define RT5033_CHARGER_MIVR_4700MV 0xc0 +#define RT5033_CHARGER_MIVR_4800MV 0xe0 +/* RT5033 use internal timer need to set time */ +#define RT5033_FAST_CHARGE_TIMER4 0x00 /* 4 hrs */ +#define RT5033_FAST_CHARGE_TIMER6 0x08 /* 6 hrs */ +#define RT5033_FAST_CHARGE_TIMER8 0x10 /* 8 hrs */ +#define RT5033_FAST_CHARGE_TIMER10 0x18 /* 10 hrs */ +#define RT5033_FAST_CHARGE_TIMER12 0x20 /* 12 hrs */ +#define RT5033_FAST_CHARGE_TIMER14 0x28 /* 14 hrs */ +#define RT5033_FAST_CHARGE_TIMER16 0x30 /* 16 hrs */ + +#define RT5033_INT_TIMER_DISABLE 0x00 #define RT5033_INT_TIMER_ENABLE 0x01 -/* RT5033 charger termination enable mask */ -#define RT5033_TE_ENABLE_MASK 0x08 - /* * RT5033 charger opa mode. RT5033 has two opa modes for OTG: charger mode * and boost mode. @@ -150,25 +161,30 @@ enum rt5033_reg { #define RT5033_BOOST_MODE 0x01 /* RT5033 charger termination enable */ +#define RT5033_TE_DISABLE 0x00 #define RT5033_TE_ENABLE 0x08 /* RT5033 charger CFO enable */ +#define RT5033_CFO_DISABLE 0x00 #define RT5033_CFO_ENABLE 0x40 /* RT5033 charger constant charge voltage (as in CHGCTRL2 register), uV */ #define RT5033_CHARGER_CONST_VOLTAGE_LIMIT_MIN 3650000U #define RT5033_CHARGER_CONST_VOLTAGE_STEP_NUM 25000U #define RT5033_CHARGER_CONST_VOLTAGE_LIMIT_MAX 4400000U +#define RT5033_CV_MAX_VOLTAGE 0x1e /* RT5033 charger pre-charge current limits (as in CHGCTRL4 register), uA */ #define RT5033_CHARGER_PRE_CURRENT_LIMIT_MIN 350000U #define RT5033_CHARGER_PRE_CURRENT_STEP_NUM 100000U #define RT5033_CHARGER_PRE_CURRENT_LIMIT_MAX 650000U +#define RT5033_CHG_MAX_PRE_CURRENT 0x03 /* RT5033 charger fast-charge current (as in CHGCTRL5 register), uA */ #define RT5033_CHARGER_FAST_CURRENT_MIN 700000U #define RT5033_CHARGER_FAST_CURRENT_STEP_NUM 100000U #define RT5033_CHARGER_FAST_CURRENT_MAX 2000000U +#define RT5033_CHG_MAX_CURRENT 0x0d /* * RT5033 charger const-charge end of charger current ( @@ -192,6 +208,7 @@ enum rt5033_reg { * RT5033 charger UUG. It enables MOS auto control by H/W charger * circuit. */ +#define RT5033_CHARGER_UUG_DISABLE 0x00 #define RT5033_CHARGER_UUG_ENABLE 0x02 /* RT5033 charger high impedance mode */ diff --git a/include/linux/mfd/rt5033.h b/include/linux/mfd/rt5033.h index 8f306ac15a27..e99e2ab0c1c1 100644 --- a/include/linux/mfd/rt5033.h +++ b/include/linux/mfd/rt5033.h @@ -51,7 +51,7 @@ struct rt5033_charger_data { struct rt5033_charger { struct device *dev; struct rt5033_dev *rt5033; - struct power_supply psy; + struct power_supply *psy; struct rt5033_charger_data *chg; }; 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: 13225851 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 B1658C77B61 for ; Thu, 27 Apr 2023 23:30:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344474AbjD0Xa4 (ORCPT ); Thu, 27 Apr 2023 19:30:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37578 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344447AbjD0Xas (ORCPT ); Thu, 27 Apr 2023 19:30:48 -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 1A63D3C3D 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: linux-pm@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 Reviewed-by: Linus Walleij --- 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: 13225853 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 0281EC7EE21 for ; Thu, 27 Apr 2023 23:36:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344339AbjD0XgO (ORCPT ); Thu, 27 Apr 2023 19:36:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42490 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344277AbjD0XgM (ORCPT ); Thu, 27 Apr 2023 19:36:12 -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 186EC2D6B 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: linux-pm@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__ */ From patchwork Thu Apr 27 23:30:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakob Hauser X-Patchwork-Id: 13225854 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 15F6DC77B73 for ; Thu, 27 Apr 2023 23:36:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344308AbjD0XgR (ORCPT ); Thu, 27 Apr 2023 19:36:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42530 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344335AbjD0XgN (ORCPT ); Thu, 27 Apr 2023 19:36:13 -0400 Received: from sonic301-22.consmr.mail.ir2.yahoo.com (sonic301-22.consmr.mail.ir2.yahoo.com [77.238.176.99]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AAADC3C01 for ; Thu, 27 Apr 2023 16:36:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rocketmail.com; s=s2048; t=1682638568; bh=TVyy9/b03N8nbazd1B41Q2wdYfTHpwuv2C4n1t0mm1Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From:Subject:Reply-To; b=EaLOn+/XmXNN5NFCL8n1L944a6/vsnMqagPbWxd3/nPRBB0Sr+FBxCNoUpDKFCSlol+8tmPnk8R1wmRhUHTcm61YbSuez31WXeKWNbqr8ys7iavHwydNKplNoJeR3cNFCuh9Ga+bh2e4U0C1ySK9iJUBQpluNExPZPHFv1an3WGHCggPiWfFPBn8E+0Lgr0S2NuRNCPi52/DfVCtJNzC+KEVdFdRKCmMifeKBxSEIMI7fgIlCXIplnuyjPMdDvf4GBgVDdSz0mOTrvVJFWmKG35ShCDv6eM+HrqQ9Q5FzrHOcOjQOsNjucDIVgg+Sht754s54geGZRtQY3zKzusTSA== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1682638568; bh=H6QAeUAfPU8qA9SFl4JWKCkwkojo3613EmzTYADDT/f=; h=X-Sonic-MF:From:To:Subject:Date:From:Subject; b=i2P8RaevaCe+BjtX/tY7kyCt6QvD65fNG5WjQ4wW7SPdcYhVZkEa1UlSyRRgOL7truX53tZA5XI+mpr8x/AYwsQaCqqt1YiCGhGPEu5Y26lEe0aZq8jntWgrmuWWoKySz/xj8lawjprmMYGENWhBILiN/Di1JzkADLzdJLxieRbJUMowbtElV9AssxTzySCKYs31YdOyd05xqMrup+Sep3hLt8UXC7RG/dFqHFyvByviYfHwPhnLgyGHND9UE1NaYyvgox6u09gZ2anCpyspZOaTulErtjS1vXNnaO84egpIEMOTX7exjJJ1JmlKx7mzFlqqPyHCvK8IB+hiK5JpQQ== X-YMail-OSG: GxSgUtUVM1mDps3zNb2GewA1aDRc7SuXvavYTqd8fqOfd3pmslChq0hsY4SAgPZ szi1nfGO89PxaeJDdmcuco7XrLzn_vb6fQUWyMfYu5Jp04RvNbHCc9KlLXzZONzP3OhYB09QjPLe 1.ylwdZH0L0rDNLh9Y_dyYsKZB6ThvwON3rQahCpQdu57KYbHO_IXujOr.6wSyxanze.lu6ilFIr QSzirJ5HuZeaZRLh3tLEASd4yHyuhLaQeplZRAWfnKokd8CHRLT95Qsv5i_I6wWTyWKWvQ9QBkCP OcpuVFnX8uLYs33xoWKFKdR5uw5jq0mUJhJOtstkJEuxinurELp6LGWrk1zvo0oKQ9Ze54khgzXR .Sqt6wd2hIRSMJq_xOv5097gQ1QlH9jJ2RF1QEEqJki_ejsI8Cwg5YlTMlCDWC6Q6gRYBB6IXl_j XVQWBZcq5qxnc4.DmgI3eqa.hUrScCTtzmPepLG21dmHC6H8zsoWg0qcmLlMpcYWzdvlti_v2Yfd M_pst146wQqamFV4.pBlc76virLLpoWeMUYaw61KIO3kkWU9jJzhH5v4oC0_fJ12su6MLqrQUpYZ UDZj6R4g4qLWfp32ImHe9294Ga7HfVfrYIgxrlsi34cS4l.QIaBnI557R2iLtZHBQtPNot160GFl t9i._MvDs8EHFtEMrfalRl8WzRJFqAEW6qrim0J8aEQWO5lxvDrf1sxiTgiCQrBkRh4bWEr0_SVg ZpC5nWPxzDtitzW1hks9K4.2g7jKjhQQ3HZx1.JttGMUuJ08TuqM0BK3iPigGoV6Ci04XKLtxkao 8CBLIm2teCwywktfzcnqgT3NMLu0DyolNx6gJ2A_X6EjVY8JH5L5hiCQtnASHctDyLp5oogOuiR2 zVO72L4FdvVQigH_qRXF5YfcHuQReXOPPwdfP9.1swjbpS_31gUIgKbRVXIRQ_RkyRQRs.Tv9aea ZYehwgfeUChaofeHZIyn5DXEQ9HnDTFx3qwgTmmEZsDlxPsUkISB9KUgMAXEO9TF_w7f5p_HgR3l sCn_.zG3XO6sf.YUIdl1Kfj6WNHqD0RXWRHUV0wZ2RVOyn6rWueNAIbpn4h5YJf8f2Fza9zhOBxr 9r1XFB2FR_VrnKLylfl5sOPSGG5b4uW_qmfYa1oAnXqEIr8UK2UggyZ4D2I.MW2Qx4wZy5spKCiv jKjlVOQYFw2bTdkadm9YzXfcNX4cNx0ghYytBcGQDvsoE3irlpMEcKnoc1FdFwQAu3a4j.4uJ0di gBOD_UsK7_Z8WLF5QOSSRiiAmfmALDl71vaPzrD38VOTfU938oi1UK3dbkpz_AW9VNgExuPfOSgN RlrcsvreX9MQoxkFfhoqWxAikoi1e0vwC4Psh2H6.ieaDP2w7ZGDWk7GD3aBKpwgBaX3L3GwwpDT Nxdek0AD4LiGcMqnVhP9IMl.S.rNVHsjpVQr14N2UJ6Y7u0wa7f6ewfuBn7oQqh.E_NTMSp5DuS7 .LKBUzEniiXEk6DtB5n5qBHxX4qAOHB8N5FmlXB10C_OH9toVw5s81T2P.B4rDVU85Xb.yj4NTBZ n4c0Ept9_ZG4C6tCplBwimG3rRmaT6a8AQttdPnr4LXhOFxDyR4Gtj3bh9XLP0cWF26bONa.ksxO XfXleSMJ3yFDJSFOvpvAuqb301ai2vioS05Y8Ke.qS2rR_m2GNI5Aw84F0vIN8GrLcGCdgTuNCfI NW0PejYQrMKiN4KygFHgSiDoDX1kzfWhD_6608hURIyjE93sFbFoeIZhEcnZRs0jqCzPVZLyy4fg x.J5p0MgY4Fmll5BJTGMmGFVWedKnhUQPCgDjWWfoLVjX5l2z6rkcRv8UF1VtR_ZWcUHj8afvW81 TGTokowmSJF0eHmMqvNywbMIP0ZmZYISvEIRU2TyVCZQlPnpK.K3tNE3DWuyCJD18uiTC2ok9mJ0 nE_9anX5ewbjV_kxyEuPsQdDUJ48YeFdQkBWCcnwtx_NsTP65rC5eBJ5SCcMKVjR0vJ_xZEZdg0x 9tBm547gKJiIZN.UMgcZUedYsXqbOPvuLLhoSC0MN_7pIGNscdOUn5xCjTdEZx.5Zg5LgxLdiQFC W3HYxQI9KC4D5adsoOdbBhz3mRuuW4eFVznLqVoMSSp4mlcPDwguWtpal7iiUj9Pfc6e356lWJm7 e6cRa4tfxbfGj3mioOk4LIzw_3EzZ5HThE0fL6qagUT91K3zuvwPvesl.mlp9dzBtWsK1qPof98O X7lSM8Cy2v9be_ALe1Xl9S.0ckFyJKkUYXCmq_eDdY56UGVuA_7wSYcCSGmhMIQ_B_9ngqbqaibD etHGEMGkrvGf4cc2bG16a7R97.6Aq X-Sonic-MF: X-Sonic-ID: 8394d146-4d61-4725-9ab6-e269909a2dbd Received: from sonic.gate.mail.ne1.yahoo.com by sonic301.consmr.mail.ir2.yahoo.com with HTTP; Thu, 27 Apr 2023 23:36:08 +0000 Received: by hermes--production-ir2-74cd8fc864-d5c78 (Yahoo Inc. Hermes SMTP Server) with ESMTPA ID b559be960ee93a958c6ba15207aea559; Thu, 27 Apr 2023 23:36:03 +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 7/8] power: supply: rt5033_battery: Adopt status property from charger Date: Fri, 28 Apr 2023 01:30:10 +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: linux-pm@vger.kernel.org The rt5033-battery fuelgauge can't get a status by itself. The rt5033-charger can, let's get this value. Tested-by: Raymond Hackley Signed-off-by: Jakob Hauser --- drivers/power/supply/rt5033_battery.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/drivers/power/supply/rt5033_battery.c b/drivers/power/supply/rt5033_battery.c index 5c04cf305219..a6520716d813 100644 --- a/drivers/power/supply/rt5033_battery.c +++ b/drivers/power/supply/rt5033_battery.c @@ -12,6 +12,26 @@ #include #include +static int rt5033_battery_get_status(struct i2c_client *client) +{ + struct power_supply *charger; + union power_supply_propval val; + int ret; + + charger = power_supply_get_by_name("rt5033-charger"); + if (!charger) + return POWER_SUPPLY_STATUS_UNKNOWN; + + ret = power_supply_get_property(charger, POWER_SUPPLY_PROP_STATUS, &val); + if (ret) { + power_supply_put(charger); + return POWER_SUPPLY_STATUS_UNKNOWN; + } + + power_supply_put(charger); + return val.intval; +} + static int rt5033_battery_get_capacity(struct i2c_client *client) { struct rt5033_battery *battery = i2c_get_clientdata(client); @@ -84,6 +104,9 @@ static int rt5033_battery_get_property(struct power_supply *psy, case POWER_SUPPLY_PROP_CAPACITY: val->intval = rt5033_battery_get_capacity(battery->client); break; + case POWER_SUPPLY_PROP_STATUS: + val->intval = rt5033_battery_get_status(battery->client); + break; default: return -EINVAL; } @@ -96,6 +119,7 @@ static enum power_supply_property rt5033_battery_props[] = { POWER_SUPPLY_PROP_VOLTAGE_OCV, POWER_SUPPLY_PROP_PRESENT, POWER_SUPPLY_PROP_CAPACITY, + POWER_SUPPLY_PROP_STATUS, }; static const struct regmap_config rt5033_battery_regmap_config = { From patchwork Thu Apr 27 23:30:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakob Hauser X-Patchwork-Id: 13225852 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 4D0F7C77B61 for ; Thu, 27 Apr 2023 23:36:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344289AbjD0XgL (ORCPT ); Thu, 27 Apr 2023 19:36:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42490 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229912AbjD0XgK (ORCPT ); Thu, 27 Apr 2023 19:36:10 -0400 Received: from sonic312-26.consmr.mail.ir2.yahoo.com (sonic312-26.consmr.mail.ir2.yahoo.com [77.238.178.97]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BBA4D2703 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=Eyax2bKePMQ2l+ilv5VKF3wXpgbhV5+aqNkVo61NHn0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From:Subject:Reply-To; b=R3C8m8nezvdXpCtLNyDtVpCy+btvFGmO9kA4FtkrMyhbGJWtlnSvjTfmK/5P7DnxzLgaTuH7aDtWTWnSG/80bYowH0PS1/m5b5QO4ximUSxdtR8vmp136B6LJXNlUrfLKK1eIIX+5SIdv9DpTivgiASvtcIauZy13VLPKLTtbX2/4WlQ1k9+KoVTTJElW7gNEVlA3sx2cUQgqmlBnVFnSGPSaoDNZli8KQTwPy9qcFC0DG1SPWCprxgUcy+elfYO2sR2sYRadRNjTiLoOPUWW2V96hgkqqMZfIG3EpmpV/CFdKIkKHagqcnv04xdiVV1KIQoxSxDMsamD18SF7P90A== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1682638566; bh=+WQH72n4J6AInZ2KIrKpj3gM3CbWQ64ag+uXlbnsm5H=; h=X-Sonic-MF:From:To:Subject:Date:From:Subject; b=mEwmmvKx45rZ/C8VSice7L+lJkOtEFTIZkeurzruV5Rwc0dgUzBi67mVgo8x54In1PGH6b9d1xj5EN+D+HMnFFPJEWg+It/KKgbVE5+TzsfHaKUcJ8xtmJHzIzLwnF7ND6SSdc+pnq1Mlp5ylZgZUqqKtWrH4uwwT7MZ7l/IkGOItbCORtFgFbFTTHDYu1wP5de4R2RDJ9JeVoPiRvbObLxpYEXMW4B7iMCUot77Xv5lViKye7hzUyZytQ0Vi+JHvkOJfX5nhugiXLDrTuBPcR73vsMiOmlcr05Bcomoe6ivc66etpfygwZg9iGcP678Lxz/PbWxnhTyax22RMirkQ== X-YMail-OSG: Prn9KpQVM1kIkUCe_1gXUjPEfUgBQylRwXI8Gm5YkyC2K2D_oWsyOUY3NmIX8_6 EtezlFjzi0H0iBU4XrApA2a.k4_RujwI8Z4qL4nLBnN.Dw2WpzXhzOaJuOLikAFmCGQxh_KyByxo mmGc1utHaXkK3UbQXs.Jowb55YSchw3qmPszQG5kY2mrfBwKhtGyO0VLOEhnvQ3ZHkGRVSHFksNs l0Memw9B8aGDMHGhpEOxzh2IdKoMtylrP.XlVOu66zLfL87Gd96u7iH2OliRHQpqHsQPBWa4g_.r INXph9c9clGMWNJJbs_PMPoTh9Va6doLEOUCHBecgxL_QXH4ZssqaN51U4LF569dz7pMZgmqwYmg TewTHXD9xHAuaIBQRPQgxaXEqqB1M_Q1gdBVohKl7vhL.AdezWs.pCElnRaMShqZe7_qE.Je_ATM jWzOeBeEc0jU93oFblEmlo2SJpWUas_mgecp64GTIcTFKxaKT5dwHru2GlAkIinN4YlDVlDXw41K uFwcls1hVIZtMdef8kiCKtTycWwS256u5fUxDuwt6mAPDTbUQLCdeMay9xjDOF8lPAFVZlgXaWPh uqr.vkNN7Oi6FGIL0YbEONwP153kyBfvOcdSwYOgmt2ClnfSnzCAJ7GcaHb6HtnO7EjKWsBUGM.H a9o6vmVsAZVmfP9q6gIWwrZbfQHWotX6T5IxWVnFVpn_KQchFa9urPsDP80jDAHAkpvKvM2oGmSx Z9dd443Lz2cbEHbrhs4Fogy5Olcvq.jRdjMf8BJogCHLU4BGCN9qDkIQawLrn3MoeK2Ie4GYnReZ 4PkNQx3CfFsmMymDM2R56rkdNf6ebWCoPbkXRpskCosenuUVH7_I7L6eLwAyLnZowsoK0Eb7UJPJ kP39KlUF6qtXu69iZj21wZQQ9CMLGVEkRvrLKn5cTOSBAs_SEzkmfutwZNXh.JEOR78q7U3.E.M. KWEqQzgftHzqft5igAX_bWAdA5WfjSZzvbgUR9uxwM60Gcr034nQte1td1bCWKyiFv9mrlHNoI4I mBHKB_.QyhFDCDlOtef5aY9_ydOggPLq50ChY.lTbH6skLoACiVW7MzZmCqhS3MCpGCBuayDkI9J j_16zVd0f8KiRuiL7wjipAJ0WG6RIxFjML1yoOzf5zhqg7mEwiKIJ8kfd5ExteiToo5JplOjdhvk j8cnS4UxJDJJrJG0kEn4H2FPXXKJPywTppEzx0j19Cl9OpBaPdlZt0ArEGhYtl1dyPtPh14OpA6K 13gG5UlXkBmzvQ5Kme190ftdr3ZUg5uzvAs61vciK8yzgMNvO2BLanazdUcLftBMdEcZOeAYcD1. LK0rwkMrSkpPvilpMInkZJFAKUfkfLPfGH2Ac4kPaQH3P_3Eda64.EIUNJvue23AIEogPcOOJfFQ zQfgYckkfd.pRezOdBkiynablrElQVFZI30ACzDQ518a37Ong3a.Kf4HFBwKRRB96KGgB0SzN3WN p9moUWva2MJ8QIIvhi5C8XDkn5sL7GJRS9M_d_uy4VrD3vb2POOJKj1Hhq44qoIJjh4f7.HGJTBh BgzRXX6zlWjTDnnoenGs.O2McUPC6AukI24.v0W09dmOxTcfGYMnhP.YsSN1zo2NGVa3mzdi23LJ 2Iu8QcCHNfeb0sk5UZT3AUGrw3udnEJKT6rlW6tLQQj.IK7jW.Oy7e7CzjohuXTTDZVBvceKRVFS vYfdxNFwlZS.kSUVSFe0nx2OYpFCuCAx5sbB_VquMMYYHblAFDPR_mk_YMBl209Ddp8D7xMPGl4h AdnmWNZq0nY120hhTgm5hl_2sHcWylkaVRM4f6WY_upb_TPVvK6t7rwkiEAEtyn3hkaA4.bvfaR0 9d7Mzq5fKDnC5bQBwQ4dhL470El2w2WxjgXylbu03L6pIpH5PPPBrWUPEUZE0bsZ8wJBXDBsTtnU 6S5AxWo03TfZGGe.p_N44NkYlfsuMCwbUd.n0M8RT_Zfnw5JsXkcsZJLGzsBGiAYWzHdxvWy8azl 4o7zkZsVm1aWu4PjGY8oiqwVjg2qw_mmgUXryIoYc6m5lJPvNaSak_dISwDUXV_wzXBwCZuMHbog OtZFyEQT2FEM8O5mwzdt646R4.AKqH2I9.Ii2TD6IZfDyeqNWX3AIUyKsnGwLEcfkpcIxBH.espS DPpbZ.9RC3hjwmCjVR_ri43BnELBcPxBIrjdLQJYW1pCI6VVNeL1qi8sWbNNCGdJx46RDBBnLf7n DRSVM33Ay9mAbaqMJBeXBTtAv_yPYZDIbFZ4n_hGqhls3UPgPysUBzvjALWyAJbbyGgAWQd9fG0O 4k.gr0sDQIGea0tDGEtzPjuDuH3O8dw-- X-Sonic-MF: X-Sonic-ID: 6d200f06-61ac-4d49-9de7-a5f911c864e1 Received: from sonic.gate.mail.ne1.yahoo.com by sonic312.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:04 +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 8/8] dt-bindings: Add rt5033 mfd, regulator and charger Date: Fri, 28 Apr 2023 01:30:11 +0200 Message-Id: <5bd8b90713a61129acf292a941eb7fb5ccaa3db4.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: linux-pm@vger.kernel.org Add device tree binding documentation for rt5033 multifunction device, voltage regulator and battery charger. Cc: Beomho Seo Cc: Chanwoo Choi Signed-off-by: Jakob Hauser Reviewed-by: Linus Walleij --- The patch is based on next-20230413. The drivers for rt5033 (mfd) and rt5033-regulator are existing. Whereas the the driver rt5033-charger is new in this patchset. The extcon phandle is still there, as I didn't know what Rob meant by "standard connector bindings". Changes in v3: - Removed redundant "documentation" in the commit title. - Squashed regulator into the mfd binding. - Restored the regulator node names to uppercase because it is an existing driver. - In the charger binding replaced the vendor properties by "battery" node style. Accodringly updated the example in the mfd. .../bindings/mfd/richtek,rt5033.yaml | 105 ++++++++++++++++++ .../power/supply/richtek,rt5033-charger.yaml | 63 +++++++++++ 2 files changed, 168 insertions(+) create mode 100644 Documentation/devicetree/bindings/mfd/richtek,rt5033.yaml create mode 100644 Documentation/devicetree/bindings/power/supply/richtek,rt5033-charger.yaml diff --git a/Documentation/devicetree/bindings/mfd/richtek,rt5033.yaml b/Documentation/devicetree/bindings/mfd/richtek,rt5033.yaml new file mode 100644 index 000000000000..ee704914201f --- /dev/null +++ b/Documentation/devicetree/bindings/mfd/richtek,rt5033.yaml @@ -0,0 +1,105 @@ +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/mfd/richtek,rt5033.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Richtek RT5033 Power Management Integrated Circuit + +maintainers: + - Jakob Hauser + +description: + RT5033 is a multifunction device which includes battery charger, fuel gauge, + flash LED current source, LDO and synchronous Buck converter for portable + applications. It is interfaced to host controller using I2C interface. The + battery fuel gauge uses a separate I2C bus. + +properties: + compatible: + const: richtek,rt5033 + + reg: + maxItems: 1 + + interrupts: + maxItems: 1 + + regulators: + description: + The regulators of RT5033 have to be instantiated under a sub-node named + "regulators". For SAFE_LDO voltage there is only one value of 4.9 V. LDO + voltage ranges from 1.2 V to 3.0 V in 0.1 V steps. BUCK voltage ranges + from 1.0 V to 3.0 V in 0.1 V steps. + type: object + patternProperties: + "^(SAFE_LDO|LDO|BUCK)$": + type: object + $ref: /schemas/regulator/regulator.yaml# + unevaluatedProperties: false + additionalProperties: false + + charger: + type: object + $ref: /schemas/power/supply/richtek,rt5033-charger.yaml# + +required: + - compatible + - reg + - interrupts + +additionalProperties: false + +examples: + - | + #include + + battery: battery { + compatible = "simple-battery"; + precharge-current-microamp = <450000>; + constant-charge-current-max-microamp = <1000000>; + charge-term-current-microamp = <150000>; + precharge-upper-limit-microvolt = <3500000>; + constant-charge-voltage-max-microvolt = <4350000>; + }; + + i2c { + #address-cells = <1>; + #size-cells = <0>; + + pmic@34 { + compatible = "richtek,rt5033"; + reg = <0x34>; + + interrupt-parent = <&msmgpio>; + interrupts = <62 IRQ_TYPE_EDGE_FALLING>; + + pinctrl-names = "default"; + pinctrl-0 = <&pmic_int_default>; + + regulators { + safe_ldo_reg: SAFE_LDO { + regulator-name = "SAFE_LDO"; + regulator-min-microvolt = <4900000>; + regulator-max-microvolt = <4900000>; + regulator-always-on; + }; + ldo_reg: LDO { + regulator-name = "LDO"; + regulator-min-microvolt = <2800000>; + regulator-max-microvolt = <2800000>; + }; + buck_reg: BUCK { + regulator-name = "BUCK"; + regulator-min-microvolt = <1200000>; + regulator-max-microvolt = <1200000>; + }; + }; + + charger { + compatible = "richtek,rt5033-charger"; + monitored-battery = <&battery>; + extcon = <&muic>; + }; + }; + }; diff --git a/Documentation/devicetree/bindings/power/supply/richtek,rt5033-charger.yaml b/Documentation/devicetree/bindings/power/supply/richtek,rt5033-charger.yaml new file mode 100644 index 000000000000..bf08e8db365e --- /dev/null +++ b/Documentation/devicetree/bindings/power/supply/richtek,rt5033-charger.yaml @@ -0,0 +1,63 @@ +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/power/supply/richtek,rt5033-charger.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Richtek RT5033 PIMC Battery Charger + +maintainers: + - Jakob Hauser + +description: + The battery charger of the multifunction device RT5033 has to be instantiated + under sub-node named "charger" using the following format. + +properties: + compatible: + const: richtek,rt5033-charger + + monitored-battery: + description: | + Phandle to the monitored battery according to battery.yaml. The battery + node needs to contain five parameters. + + precharge-current-microamp: + Current of pre-charge mode. The pre-charge current levels are 350 mA + to 650 mA programmed by I2C per 100 mA. + + constant-charge-current-max-microamp: + Current of fast-charge mode. The fast-charge current levels are 700 mA + to 2000 mA programmed by I2C per 100 mA. + + charge-term-current-microamp: + This property is end of charge current. Its level ranges from 150 mA + to 600 mA. Between 150 mA and 300 mA in 50 mA steps, between 300 mA and + 600 mA in 100 mA steps. + + precharge-upper-limit-microvolt: + Voltage of pre-charge mode. If the battery voltage is below the pre-charge + threshold voltage, the charger is in pre-charge mode with pre-charge + current. Its levels are 2.3 V to 3.8 V programmed by I2C per 0.1 V. + + constant-charge-voltage-max-microvolt: + Battery regulation voltage of constant voltage mode. This voltage levels + from 3.65 V to 4.4 V by I2C per 0.025 V. + + extcon: + description: + Phandle to the extcon device. + maxItems: 1 + +required: + - monitored-battery + +additionalProperties: false + +examples: + - | + charger { + compatible = "richtek,rt5033-charger"; + monitored-battery = <&battery>; + extcon = <&muic>; + };