From patchwork Thu Jun 19 14:55:09 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Casey Connolly X-Patchwork-Id: 898041 Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id F0C0723498F for ; Thu, 19 Jun 2025 14:55:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750344922; cv=none; b=Z2tnwjVIQMZQBCAhBkxHT2lKVyB64by4VX0v/UgGDpNgojEBxRMsBVviuafHClGQYUsDdgo5r+dbsctMgWXGuynGdKLmOD0KLYA0drBbZkga7Jkov89G4lrIyk+YKK1QP4N89rJJzlv3U4rSrBYeo+dLUn4PPmm9/UCTIPS2/cQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750344922; c=relaxed/simple; bh=MB5gNv4+QCpg94YIRZF4W9VQB93gw02YQkHuOGD6vUQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=mAK7aJziWiyyYdLFqlohqZogA/77TvZKeYCNwTo58RLQ5w6H9QdWTHgf+qOwn+1B5vZEd2N0BOlfFi/SGzesvcV1Pks+oLour+gcpG0aDSQp7Ga0lh74RxYb1IjC5Yj3/rzoE5MyvIIEZi6YmCYFL7PrHd4inQKiAXmDtKKwM0M= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=nqHNZFEJ; arc=none smtp.client-ip=209.85.128.42 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="nqHNZFEJ" Received: by mail-wm1-f42.google.com with SMTP id 5b1f17b1804b1-451ebd3d149so5710185e9.2 for ; Thu, 19 Jun 2025 07:55:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1750344917; x=1750949717; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=e226Tcn8nARRrl/o7ezCwkhDY/r/vdSmLiez583al2Y=; b=nqHNZFEJA43FDoybqSa/jmGsD09Q0uWkhO2rpMUJW4sKY2/E2k9a+w0wUvtPuZGJ9j swtFceSO8IGu8MwVdjy6VJ2WCpTCl9yoVo/QzCnQVdb2duRIkKjDyV8ftaPPltEqJyEa aFcdCg8bdp+NpoXwKduxu097QWaab7F22hRuZxyyqymuQn+g7m0+VhG+ABcvFNrsb7Vt LKmoIp3uQsLFudcdUkpnMSQLCPfhTY//k1tTKLpE5evelLzTBgSayba6B15qwvJCUhgC iaZnEH6R0yd5X3P1A/fujzlxpiBuzzLRbryq03fiIoLiTAvnJekj3ceTqhyGAqjJVbH8 PDdQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750344917; x=1750949717; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=e226Tcn8nARRrl/o7ezCwkhDY/r/vdSmLiez583al2Y=; b=WEW27YR+w11Ap0e8BgKFT/vna668ib0340Gnn7geWGx2oqEYVZO+6OstACq4If2drT p/Za+dTpGLt8KktAWEqSvN9q0B6Y32kZvHtbtCL7GUU5w898ACC7sj4OzZqRIa9iWo/2 tgCKrvnlQQws7yvboEWUhJI3qUNL3+RyrvXT962sR7eb0DYFo8vVjLoiX7OZ5bU8aXNr CYJX5ieRPVmVEuu3AoBhYX3gCrA1WZK+bwlJhi2xOtrdNnJILr/icRSCXxi8sIMZ6VZa 9kcFMZC2A4Klybzsi6IGloPIRpQMtoQg7fFJpElQUlnjJd1WzRir/xZ5B5NSPRe37pAr xyuQ== X-Gm-Message-State: AOJu0YxLfvslPnFYJ5IPRmhEhcSyxTqg19gXT+lL4NtIjZbRlnzpj35a w/Bb6Exl738udfwXtVKFh8vQ2ZdaLoXyU5L4UQtEYlKSmvOcV/bkcxaMz8yNMBecaNA= X-Gm-Gg: ASbGncttj18Mll7F39CLVVf/gCbJ8LOclCs4D/sZUyq5Ke9o/xwwEsw46pXyHEC18DV 1VmIHqOYf8jpVfU8zIeiC8AVuAQeTFSC1SkE6aYS4ybdOmtCO09N61Arhc5R4f02RiNid07PPXA QgGofF6xKQGSNC9DZINXOoV/3ihywIZVh7IJJAi+LM0TbSXG7ObA4DVg6zGE/wNIEdSWlTbUByi Fiqz1/O0ztWp4T1m7eInlWib1MHCziLWNwHSOUEHRChcY/jlbCCiHv5vuDOsck/3xvUKAElnTri QLg+znjztB3wI0W+eeFNzECR6LbPwIG/0xOYSn8B0vy2Vje5ahX3QMHHAtiPvAjeTSpzgfKMHG2 JylKvFtPfgVg= X-Google-Smtp-Source: AGHT+IFQzca4+a+ltyk7vQE3TZE/D2mu0OwKAeR+4tbx2F99S6hmXreNik1ilhlwI9i/rW0dhkrFBA== X-Received: by 2002:a05:600c:870b:b0:450:d5bf:6720 with SMTP id 5b1f17b1804b1-4533ef3dc36mr211428225e9.3.1750344917257; Thu, 19 Jun 2025 07:55:17 -0700 (PDT) Received: from toyger.tail248178.ts.net ([2a0e:c5c1:0:100:b058:b8f5:b561:423c]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4535ebced8asm31343715e9.40.2025.06.19.07.55.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Jun 2025 07:55:16 -0700 (PDT) From: Casey Connolly Date: Thu, 19 Jun 2025 16:55:09 +0200 Subject: [PATCH 01/11] dt-bindings: power: supply: qcom,pmi89980-charger: add pm8150b and 7250b Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250619-smb2-smb5-support-v1-1-ac5dec51b6e1@linaro.org> References: <20250619-smb2-smb5-support-v1-0-ac5dec51b6e1@linaro.org> In-Reply-To: <20250619-smb2-smb5-support-v1-0-ac5dec51b6e1@linaro.org> To: Sebastian Reichel , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Bjorn Andersson , Konrad Dybcio , Kees Cook , "Gustavo A. R. Silva" Cc: linux-arm-msm@vger.kernel.org, linux-pm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Sebastian Reichel , linux-hardening@vger.kernel.org, Casey Connolly X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=916; i=casey.connolly@linaro.org; h=from:subject:message-id; bh=MB5gNv4+QCpg94YIRZF4W9VQB93gw02YQkHuOGD6vUQ=; b=owEBbQKS/ZANAwAKAQWDMSsZX2S2AcsmYgBoVCTR5stwaRD3G+1RyljrB3UVlYuZ+3+s+ShMF as6OYZp7liJAjMEAAEKAB0WIQS2UaFGPGq+0GkMVc0FgzErGV9ktgUCaFQk0QAKCRAFgzErGV9k ttYDD/9KFimD2p4h23k5xwtIATlmZZyylMC73cSMtYuVsujSDMChaMvxzCR+hqEXwJFOPamuSsK pGjKknYRSfjfbxlnwUnplNRJDaTLLE6LMnz8Dg+nqIHpYIKUabmGbcGchwGAwi7R6IEvjRcqXFG dJSoRpByMALnezFURpEV0rgBSYJ6t4bpne+Nfq10A3jWutIYtV3Nh9UrUHF2z5EG+fEjXhds1nb lkm2xGBz58/R97WDxYI2vuP9HIVB/x/lo10izOgvF8v+GO7rFuTE8Q/sRgaZ04bLvx6jyxcpBNg bROsC2G/cLSeQ4Ka+LzcUHe1q/KAWRvlJcdVgHbpUuQMufcl3rNathQbVQvZudDscvgG+7V7eDP RtTkX8okMc9GTQ4oXCsjA0hg2iUemH+gp1uV5CI8d+LWBPoIDkxqfhhXickhWFys1KLgn5d15sO j5is6KBoi9XaDltq127ONHfW6sd0V2Yyq25KfdBvGkUd2CsPp4dlMayENF5s/CHlo4cfBwccRLz 5/XY6c1yGhaQidhpGz4xKUxv7qlbmAnLE1Z2KYElQHRVbvLwUQ4aWgbrWq1rFc280fnU1jjMAen wd6nXa/uzyPYg92Kcl7EyF/uYihEUKAbxFFy+AGOnJgekqnRQUyNF/9bBEJ1HCOZzNYtrqUbSgh /i4F/G9yKI0VTsQ== X-Developer-Key: i=casey.connolly@linaro.org; a=openpgp; fpr=83B24DA7FE145076BC38BB250CD904EB673A7C47 Add compatible strings for these two PMICs which use the SMB5 generation of charger. Signed-off-by: Casey Connolly --- .../devicetree/bindings/power/supply/qcom,pmi8998-charger.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Documentation/devicetree/bindings/power/supply/qcom,pmi8998-charger.yaml b/Documentation/devicetree/bindings/power/supply/qcom,pmi8998-charger.yaml index 90c7dc7632c58dc5cbfb3abcde8e730882bfd936..d19746b64fee19a07bdb8f7a996e42103a9e0e73 100644 --- a/Documentation/devicetree/bindings/power/supply/qcom,pmi8998-charger.yaml +++ b/Documentation/devicetree/bindings/power/supply/qcom,pmi8998-charger.yaml @@ -11,8 +11,10 @@ maintainers: properties: compatible: enum: + - qcom,pm7250b-charger + - qcom,pm8150b-charger - qcom,pmi8998-charger - qcom,pm660-charger reg: From patchwork Thu Jun 19 14:55:10 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Casey Connolly X-Patchwork-Id: 899122 Received: from mail-wm1-f44.google.com (mail-wm1-f44.google.com [209.85.128.44]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6D1B7278753 for ; Thu, 19 Jun 2025 14:55:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750344923; cv=none; b=YRKzjvwCoG7dmnTT9K0vzfw00hx/zdDZeOLHSyGPh8K/M2mSzPExtoOuKL/sJTgYMtabbtngFoquDDMq/th+00fQSdITENDTXrZ8f0dZkgR/TLSBQkWUE7vQf0cApGIzvzSBmkL7hzAGG2iY0Ac+4VoeiIxhxyO3S3VZ0z72STA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750344923; c=relaxed/simple; bh=qYAZCfZCRBki6rEwNto82MyVYrF2GEVO45R3Q08g/IA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=KUKEuEX/bxNxbkZTzgcEdsHgP3a47h4Wj+F4+IF1tpz4hXPE8dKtF1pMgY0qkNtZrtX1Ggd9NDCvnHtEfhOOu/XFheuu70VJqrlhiEsI2bVXoJHugrPh4117vBpnwTQReRFYqR19E3mTfllue0e4SsFDesSH5r6tM4NOaND+gHM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=GiRIjnJz; arc=none smtp.client-ip=209.85.128.44 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="GiRIjnJz" Received: by mail-wm1-f44.google.com with SMTP id 5b1f17b1804b1-450ce3a2dd5so7857785e9.3 for ; Thu, 19 Jun 2025 07:55:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1750344918; x=1750949718; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=k6CcoGZqjD9+K1M8PYMMCHFJXIehGW4t5wpSeTmgCi8=; b=GiRIjnJzhPZYfgHcZwpnz89qiKvoMQrB2yAurdDj7rDgg33XvrOCFXIO9QFDYL2wEV N6KkwpYi+AtVZAh7NRXXw42faiHbmPZ8ecHdaoHsEGxcZGo4aMTE3ptQ0QhPM9ktX+rA aVCQSguZeKDD8EVUVNcuQ+ZWWYqN7MPO6llVi486H7VITLEJ46q7oU0aIYOz70I5ePmA aQ0N0+YaQuLTZGnIE7DRxEk7qxuNO6q9v8tFZOoxEDILoUM33yxoSHd4vGbui7x7y+L0 jdDXCCoB6nkO9OZtE/u7gVOfihI331pAw3zC2Gb2IbvD3jhc27VgVlC25wDW66KGe27J ZKhw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750344918; x=1750949718; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=k6CcoGZqjD9+K1M8PYMMCHFJXIehGW4t5wpSeTmgCi8=; b=FueERe38UkenbUXjlGD+X5E371gPyIMP6+/Ww/G3Y3VCMt1FwfCKJPaXV2IhN37vsk y/Wul49Xk1UJA8M4NrjzmYk7fKAGaZvI/pnsC5wty/pxRsUG9rcDn2A8FyzBj74+89xi fBWSjc7GLZoBHrhKfVcH2+xk0ZHFDRXt13eJ76FJXzJuxROXSfMkKQjCjMEkX5hO9j1f g+p5e1egq5HvlLHYAZ1sk5W+aaeUzmzt7ztLkSir7zbhCMKFdw2ibeawW9IV+DjTTUzH SeSKAJDe3qwHytASfAnT67nHmZN2tD9Y0uoEDF/HDWb92VHcsrBJTurNlGxluD2XkNib RCow== X-Gm-Message-State: AOJu0YxCooKHXWZ9vLeLx7Rvrilz1fpfJxpAOByop05Z6nqZY+WfVPIF ylOJ6j64aC3UMcyL/pkzedmyS5+kxF+JI5OT9ueNIdXJS8qDjoPH5lU8J1tw9HOiP4A= X-Gm-Gg: ASbGncv3+M0WHIPDDpIA8h7fyLxM+9gn5sGXVskWbwY4TKId1FlnmLCarXz5KW1EsZN ljbZpsOCjnPu9b+f/IxH7A5z5ePJqZFgddnhWOvq4cleLTCUYDc2VbuhUJ8TEuNjmpiyxGrwaHU V7t4Aszksa0z6KQaXUmLBi8gXbb8iN0wbiv/M5MSlDifV6UPR6ksm9vBjW1c9AGcLEv2k+4ddvW 2jBs6YcvlQYUweJJtMaPLLHlVY9+Jh9HdqUYr1fcBRJWsUCqzPTT4X7XI8LKP6JzCrGPjEL6RLj g6sKwtGRd3r3j4PcwKmr9MrIm5CtoTprICNAOygojGFwNOwdFsBTmDbDwUrpt0894tV6dksuHQH 0RhL+PrpgYhLrMufxOIpdxA== X-Google-Smtp-Source: AGHT+IHqn4tAEPgYc+nW6NOVxVDdxt9Vx+UOQZkFC9cJaTvzxaVLk2lXNPEErPPHH3ALfmNFXQfnFw== X-Received: by 2002:a05:600c:5185:b0:453:59c2:e4f8 with SMTP id 5b1f17b1804b1-45359c2e6f1mr60408825e9.1.1750344918502; Thu, 19 Jun 2025 07:55:18 -0700 (PDT) Received: from toyger.tail248178.ts.net ([2a0e:c5c1:0:100:b058:b8f5:b561:423c]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4535ebced8asm31343715e9.40.2025.06.19.07.55.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Jun 2025 07:55:18 -0700 (PDT) From: Casey Connolly Date: Thu, 19 Jun 2025 16:55:10 +0200 Subject: [PATCH 02/11] arm64: dts: qcom: sdm845-oneplus-*: set constant-charge-current-max-microamp Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250619-smb2-smb5-support-v1-2-ac5dec51b6e1@linaro.org> References: <20250619-smb2-smb5-support-v1-0-ac5dec51b6e1@linaro.org> In-Reply-To: <20250619-smb2-smb5-support-v1-0-ac5dec51b6e1@linaro.org> To: Sebastian Reichel , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Bjorn Andersson , Konrad Dybcio , Kees Cook , "Gustavo A. R. Silva" Cc: linux-arm-msm@vger.kernel.org, linux-pm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Sebastian Reichel , linux-hardening@vger.kernel.org, Casey Connolly X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=2521; i=casey.connolly@linaro.org; h=from:subject:message-id; bh=qYAZCfZCRBki6rEwNto82MyVYrF2GEVO45R3Q08g/IA=; b=owEBbQKS/ZANAwAKAQWDMSsZX2S2AcsmYgBoVCTRdzCeOVoOYYIZoWDgVhy/ZEc/+H7vHO3hk 9+coi1FjLqJAjMEAAEKAB0WIQS2UaFGPGq+0GkMVc0FgzErGV9ktgUCaFQk0QAKCRAFgzErGV9k tgjFEACJoBqzSyVmNA7Zpg0bF2fnP3tcsYhpkpKhB+GRT6LikucPsFc4ySsBumxIks0HruvV5ym XBTm07V2xs+PTsMWjllFWTGsObMoPxYJXR081gxtDlhCL0Ng/A5vFdsFHiYU0zn2vK+bqtZgemt oia+SFbIUf5a+/MB1cwJUrsjodgY+OUE3iR6nVvuqlz7CnVpI0TvXxqqSzpneGfC0zxHUMjrfSy f8aR1Cc7+iLLp6VqAV6AaIS1aGQkQPQYUFB77t2gk2sTs8ByeIm2fWP0UnxbaV7vd52naJnmi4r jfcbyvihE53AY7F0RYLzl644mwnj32/INi3C/qZsfaHJYRXFyQjsaxi0DV2eZQmn3Mqq8bbc5O1 OqN8GqoHqT+N5BOhkEn/b+UAp0d4tHCW21o4FyqMsvlfAH+9GiPAZpMCfFLxdup8FHTn7cW4QMf Y8XOicvxAQentqPPUVhhOaZyB4mP0faVWN0IeA8tQHx4kQ6trbi6qeWb1fgNNJIFPwMPLBDDOCu R4c4jpKQIPEuxc2r7CYJe5jc+V77svrd454tJnurx2rlWNMFmONymTxnXftnaV3FYx/5Zr/uhBl Ha8Iv5nLMRjqDGEHTuFBDXLxDExoNqGOIaMTssY9bo9Em52vZCFs11E1HYXdcQ6TKiKFAo1/+qa GIVjesETp5LyJFg== X-Developer-Key: i=casey.connolly@linaro.org; a=openpgp; fpr=83B24DA7FE145076BC38BB250CD904EB673A7C47 Set the maximum constant charge current to use for this battery. While the battery is likely comfortably capable of 4A or so, OnePlus didn't include a secondary charger IC for parallel charging (instead they have their proprietary Dash Charging). It's possible that this value could be safely increased after some testing (and when we have support for modelling the charger as a cooling device properly), but for now this value is acceptable. This is references from qcom,usb-icl-ua property in the downstream vendor devicetree. Signed-off-by: Casey Connolly --- arch/arm64/boot/dts/qcom/sdm845-oneplus-enchilada.dts | 8 ++++++++ arch/arm64/boot/dts/qcom/sdm845-oneplus-fajita.dts | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/sdm845-oneplus-enchilada.dts b/arch/arm64/boot/dts/qcom/sdm845-oneplus-enchilada.dts index 4005e04d998a40d25a64d652a526bf93efc20332..9ab5ddc1f6cbbdcfbf793b959d199b20256be9ed 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-oneplus-enchilada.dts +++ b/arch/arm64/boot/dts/qcom/sdm845-oneplus-enchilada.dts @@ -19,8 +19,16 @@ battery: battery { charge-full-design-microamp-hours = <3300000>; voltage-min-design-microvolt = <3400000>; voltage-max-design-microvolt = <4400000>; + + /* + * Typical designs have multiple charger ICs which can handle more + * current but the OnePlus 6/T do not, hence the lower limit. This + * does not apply when using the Dash Charger, however this is not + * yet supported. + */ + constant-charge-current-max-microamp = <1800000>; }; }; &display_panel { diff --git a/arch/arm64/boot/dts/qcom/sdm845-oneplus-fajita.dts b/arch/arm64/boot/dts/qcom/sdm845-oneplus-fajita.dts index 9471ada0d6ad8bd44cc58a6efa07f7eb27921af9..1644648fb8800934e4a8a9b54380bb019dcd0059 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-oneplus-fajita.dts +++ b/arch/arm64/boot/dts/qcom/sdm845-oneplus-fajita.dts @@ -19,8 +19,16 @@ battery: battery { charge-full-design-microamp-hours = <3700000>; voltage-min-design-microvolt = <3400000>; voltage-max-design-microvolt = <4400000>; + + /* + * Typical designs have multiple charger ICs which can handle more + * current but the OnePlus 6/T do not, hence the lower limit. This + * does not apply when using the Dash Charger, however this is not + * yet supported. + */ + constant-charge-current-max-microamp = <1800000>; }; }; &display_panel { From patchwork Thu Jun 19 14:55:11 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Casey Connolly X-Patchwork-Id: 898040 Received: from mail-wr1-f53.google.com (mail-wr1-f53.google.com [209.85.221.53]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EA6BD233D92 for ; Thu, 19 Jun 2025 14:55:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750344924; cv=none; b=AoGGyPEt63Cne3TJaNTev8Iv7t1TzOq9fcOqfIKYtVuW45hl56BKMdEQWRz0unJTqwXuKwC7b9vsqi+ByiIMi7oyibe1Rm7lDWNkihWo1WlD2ouyoQYKCfFcKVmSrQwyhyekFI15rQXhb9laeoe7t3hr0x+McTQSJhudnCCspiw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750344924; c=relaxed/simple; bh=6Z4D16SkPJ8yBSytHwVl7DqQPX/xHbOuvdjyNeV7Wm4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=uJDzTYfaUV451bNxYVUEpkmX9mbpXhATQuznZhoCHWvcZxEbSTn6jX+tTeZnMFqPrtOPPRzj456HiWYS2KZhkCESfk5ecsEBa0TFRCX6pGYqxHPv5kzGWbPseCtjvMyAEVyNpn3Zha2XigIYBSypbUaSnNkHn8hDpBGVqVD24qQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=wbTjSoQ+; arc=none smtp.client-ip=209.85.221.53 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="wbTjSoQ+" Received: by mail-wr1-f53.google.com with SMTP id ffacd0b85a97d-3a54700a46eso560588f8f.1 for ; Thu, 19 Jun 2025 07:55:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1750344920; x=1750949720; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=oEHr+JFKq0mjjtdNVZ8KWmf7N7HSZ0JZspgwtDVrdBE=; b=wbTjSoQ+TSYlMS/h+iShp0+5ton1au/W30Fnq4R2IhpJO2/BmODFJ5SKIyeavg/5hb eIWDQGZyaRwok6dYCC2Zgvqwc0bEbgl0ijj18avyvtl4w896uifKXCsSKaUWsk/x4R18 4a1PJoXnaXDIfo2qm/FnBx80iXL2B9MlxkrBokXTXL8R8YYDwUQJZOhAz0C+n7adBTce LJxUxZTjAs4irM2FiZGnUEUnajy7C0H7aqR1FkwYoPqcxzXP4CYl1k0oqljCDR/QNgVM tn+aZT4IvranYYw0/ORE2rUTCuflcUQ5TV8u4nlnkKU3mrwrtovtOMXHmzT1i7YDQceC N6jA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750344920; x=1750949720; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=oEHr+JFKq0mjjtdNVZ8KWmf7N7HSZ0JZspgwtDVrdBE=; b=KtXxqCKBnoL9iphZPqZUwJh/Z2LyGG1IQA0PPpQFvDyvWt+9g+V5G7KCbZjsNgU3yY M1ysTRdfnaWx/T+FowIOip5rwKvMXrxNGOhe3slGrBUXYdJtmJcHIeoy7D6jykIfa8Sr xLdIjgyYvTdKerlCh6LRqdJYM0okW0NJWHh+g0LdpD3TWMvefLajbnI7L4BUVphA9XhS RGrJoOVaVG6ZNKaYYznBN8zFS+XyquFwzwJfm1ACfmJyaKtBNJFqE9ASee8o2Ff6Ep61 yxtuPdlRCJbRuBsMmY1XldG5k/56qySMmrqdg78HwxNh9zoTuCl0n5EgqvSiET0YU4KE 32hw== X-Gm-Message-State: AOJu0YzMhaK1GM4JNMW0c7Rs5GwzWd/uruYEyXWAfiwvcXhRRegG11qJ hcA52TvRhWVeOv1PjR45RAro7naGQ4JCKeHgPDoAyLCQyNOaPk8xiieOW8O/Ovpj3TOPW2Bdh5Q 2oM3Y X-Gm-Gg: ASbGnctOxDQKMUlUQEjeIyc64yfi4sExOeJrACJ9L/68GuTH+FFJkRCVExWDFpcTSCv 40DyQtN2sSO81MqhOfyKuMbIVYQhkjiYccDPKmKcX35foMZs0A2Xv7fk7lHMJZgGrPIdueskDdA TcM/dJvn3FNgNhWD0EvHREprOvXyDpYMOQzQNfj8tgZLK1M6lYtLf8e9lge5ydDwZNtOPYMX7bl it0U1V5PoBAb88EGmh4ahJpFW5HYcaGF68xIr4CZQJ6ZldQQDtQdQKxweagOImW3nXUSoqYYvsj eZVjHeKyHOqisC66Bd4iuhdaTel/RGPL4/lOGXqPrFomSKT8Bw/erY/ejuamKKahqnpWqtOk1jM sOBeGQnMDzHM= X-Google-Smtp-Source: AGHT+IHWbjMlG2E6TzWb22wDzJtnoqglGRvEM5is+uCoWk0J9I5KSBBT9LoIyRfmFnTQymBf3ofmdw== X-Received: by 2002:a05:6000:18aa:b0:3a4:f50b:ca2 with SMTP id ffacd0b85a97d-3a5723663c3mr16381011f8f.8.1750344919992; Thu, 19 Jun 2025 07:55:19 -0700 (PDT) Received: from toyger.tail248178.ts.net ([2a0e:c5c1:0:100:b058:b8f5:b561:423c]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4535ebced8asm31343715e9.40.2025.06.19.07.55.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Jun 2025 07:55:19 -0700 (PDT) From: Casey Connolly Date: Thu, 19 Jun 2025 16:55:11 +0200 Subject: [PATCH 03/11] power: supply: qcom_pmi8998_charger: fix wakeirq Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250619-smb2-smb5-support-v1-3-ac5dec51b6e1@linaro.org> References: <20250619-smb2-smb5-support-v1-0-ac5dec51b6e1@linaro.org> In-Reply-To: <20250619-smb2-smb5-support-v1-0-ac5dec51b6e1@linaro.org> To: Sebastian Reichel , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Bjorn Andersson , Konrad Dybcio , Kees Cook , "Gustavo A. R. Silva" Cc: linux-arm-msm@vger.kernel.org, linux-pm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Sebastian Reichel , linux-hardening@vger.kernel.org, Casey Connolly X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1378; i=casey.connolly@linaro.org; h=from:subject:message-id; bh=6Z4D16SkPJ8yBSytHwVl7DqQPX/xHbOuvdjyNeV7Wm4=; b=owEBbQKS/ZANAwAKAQWDMSsZX2S2AcsmYgBoVCTRhc+icEuxNhuT86NLqeDxQeR4vqH+O6CVX 1VOLWhF6VCJAjMEAAEKAB0WIQS2UaFGPGq+0GkMVc0FgzErGV9ktgUCaFQk0QAKCRAFgzErGV9k tmGRD/0R7yKQaE0xf7lUByZ4lt/WrVrHsd4lwLP0Knrr7xy4r0l8x++FJhew8FlK7XIXTmj+Enh KQGn7Mz7pWIFuM0PU9KhXDvL2J2NKnXljq1yVW2mok7ZQCxzIw1a8OnG2ua5jC/hine+eCOopO5 lGejGQMGussxPINrRMwSI0JKl9+ikufSc24PaxvoIf3tqgqL5ToUNlA0byiMPdkuDjt5SzE8NQw V7s++GnqrkYBoMb5yjr6+LfSVgRWGAXvDM6SzmXjy6UI3KX9FsWNxjYtxTLGzvBmqWUB1iRwQul SBI5SN6+KMLgyi6sitxK/8BY7cUwHFaH6MAUC1W36WAHiqP/5gUgbG7P0kvCAfMVQhCOtXGUN9o WU1/Ib4FkHzWIuMnLNS77ImL5kjgT1VKwkhT18hIEUmhfH5gy2ISzOD0mHV9xhyR/7A+TptTZEh VpX5OSoG26TolQdYbdexzlBdWT2eYpeepbSEzNqcvVKwmSRVNrheIeiwr3JMqTiGcHvLuaG8Kby tsxx2VjhvbjuyRhB7KZtHquxA2M6YAYHk7t/xTohzT+4Z5lRaiQ/R0IkmvrQ6Ph9qYWiHevzIr6 ALWLa02Zs/mG6XyvdmA4jUpolpYZPhdv8C1fhsy6MvH/eOb3GKcXy4YdLJczUzsk+BNu78ISCv8 nQ3uWO2t0nceVcQ== X-Developer-Key: i=casey.connolly@linaro.org; a=openpgp; fpr=83B24DA7FE145076BC38BB250CD904EB673A7C47 Unloading and reloading the driver (e.g. when built as a module) currently leads to errors trying to enable wake IRQ since it's already enabled. Use devm to manage this for us so it correctly gets disabled when removing the driver. Additionally, call device_init_wakeup() so that charger attach/remove will trigger a wakeup by default. Fixes: 8648aeb5d7b7 ("power: supply: add Qualcomm PMI8998 SMB2 Charger driver") Signed-off-by: Casey Connolly Reviewed-by: Dmitry Baryshkov --- drivers/power/supply/qcom_pmi8998_charger.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/power/supply/qcom_pmi8998_charger.c b/drivers/power/supply/qcom_pmi8998_charger.c index c2f8f2e24398316ac5c491eaaabe4c455e875c47..cd3cb473c70dd1c289cc4094e74746e3c6dc16ee 100644 --- a/drivers/power/supply/qcom_pmi8998_charger.c +++ b/drivers/power/supply/qcom_pmi8998_charger.c @@ -1015,9 +1015,11 @@ static int smb2_probe(struct platform_device *pdev) rc = smb2_init_irq(chip, &irq, "wdog-bark", smb2_handle_wdog_bark); if (rc < 0) return rc; - rc = dev_pm_set_wake_irq(chip->dev, chip->cable_irq); + devm_device_init_wakeup(chip->dev); + + rc = devm_pm_set_wake_irq(chip->dev, chip->cable_irq); if (rc < 0) return dev_err_probe(chip->dev, rc, "Couldn't set wake irq\n"); platform_set_drvdata(pdev, chip); From patchwork Thu Jun 19 14:55:12 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Casey Connolly X-Patchwork-Id: 899121 Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B346B28B519 for ; Thu, 19 Jun 2025 14:55:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750344926; cv=none; b=EXIz8orq2bPFZiEPh3W3EGXkCL+aXuFI1jE4JHitpxgkouVGzr+kR354lp3zMIqbi9H78uv5IJwoDoKZ5hUazjxR2nTqaQKzAEa+jfPEeUJBdATuU5PHlQ2aASXcd6lcdr0L1SownA7Gvsjeur5O3BrXtcbg/IMlya09z1SVjzQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750344926; c=relaxed/simple; bh=OWLz8jy0aYNhz1ULgnx3Uoo5bzB1cKuLHiMXElp54PI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=GQfMo7zKHUZ4GX3mCo3MJgmt6EDo6xGT3QWe97iSywCKQt1vXnVtSyVenO+W+v7TnaowlX7uk2yRpERVLDyklEDMDq9qCzHIy3H7Gskix3rthJfB1NWTWKtQNv4dPLmaCNp2bWZkp27jh8dF7eqVznj9rplMNq4nzSsNcn6svb8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=cAiZ0vOx; arc=none smtp.client-ip=209.85.128.53 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="cAiZ0vOx" Received: by mail-wm1-f53.google.com with SMTP id 5b1f17b1804b1-43edecbfb46so6442565e9.0 for ; Thu, 19 Jun 2025 07:55:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1750344922; x=1750949722; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=dnf+feM05FonyZlazVIOtB30dq6CHjOa2Ov1CmFsycc=; b=cAiZ0vOxo3eoBOjHhxbVtn+mmCd9v5n/dtseGM10BjPEzbC6+82oFk42xsCddDXfVA hGGUP16/wJ1ubIRZor//crD8vgg0XGIBs9/XMFKZbgVM8SsxuDyf2j3vtZ2ZdFCxJbYg JiSnoswoD4p43dhI+8OOMSR1oDQaCYfwP3PzzOBlPLLv04zr+GEmNBKCskgcNL6KTqSa wkJoTwuapbi6ZDQmlPsBZWosFnSr0/yfabq+tm8FIDdyx8Gm+SSQ+vjnW3YDtwR631ip e6swyLDqxUnkHnC2JEf0sbDTOT/sKuXR5WIj+QdZaQHfNWd1I4uh3rg3e34eJ5FzU8Gn galg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750344922; x=1750949722; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=dnf+feM05FonyZlazVIOtB30dq6CHjOa2Ov1CmFsycc=; b=mTJf8e5LkoKKzR9g0Mj3kTqzE0YbDYtUWhH5T6JvPaPIizmZqCX1gyOTZ5MivWke+Z gYnYo6Z768Y30IvEgSNrl/jJzPg7jsS8kCTwEDwB408ka/pMlnT0Rsx8xNf055+nwE6z xZ8KDyysEhoGNZp4k3mz8eCrCnH7ztatTvdP5uySmpmvIsj6FYWXm5joy8U2SXXEOhNe hX4tmRcpRK7KlllKHbQJU2A6Hwebsz6nO8Yf0EL+4qJNBTM51uAmy3FNjhVvu7JS9zoo EdcgbrT1z6WO9dDO37k9bwDe3Xcpb5Iuy+M+dB0E2GKESfwUJZguYt4nVaLeFRjcKH9I 8aEA== X-Gm-Message-State: AOJu0YwU55tMiJ0UXq/HG0rw3Htf+YuxZHwAq91NXwUgzZKH9iND9CBM vIkHQnPFRbX5dqHYfelKzzkzrCeMvYCNX3JnQP8RE3WnBv/GoxazaIuSZzQ+scm/ZCU= X-Gm-Gg: ASbGnctJJ/0bv6EXTWZcyK8QtglXDjywIKHE3OCm5ixyD4pv2qm1z3PdNPhSfkWZnhp RqVYqo9m4LAkxf+74e2eXr0nct5V/sPH7MWOJPlROrzDzhSEgkkfvbl+5IqY4ch4ViSzFLTs0FA SZaPVJDHkCvsqlsbSk9NuNyVAhUGN3DHYHmAirXsLHLD14U4tekNbxHVwWxRgQGr+/W3AXgn7dr +QjtUZPWH5XLDmk+wpNuNAMOJYyKr84g6azzz3tGi8HqJJITJSXMFk/aay0tBLVLJrrvtFSqHdC rltWhamIj1tuC9CvzrVxzTBEKHrRXnQP2+BbPeUQN1Wjlv1B4IMpB59ThXzVuoFX9qzWg9tiTtp KNw6C2qNCOdo= X-Google-Smtp-Source: AGHT+IH/e7xadtOoCFZYila+AAoZ9HnFHye/u22AteKbqkhelHkoFqJjVHtiDctthry8gjEGaxNFqw== X-Received: by 2002:a05:600c:3153:b0:442:f4a3:9388 with SMTP id 5b1f17b1804b1-45350e7c275mr122080525e9.19.1750344921855; Thu, 19 Jun 2025 07:55:21 -0700 (PDT) Received: from toyger.tail248178.ts.net ([2a0e:c5c1:0:100:b058:b8f5:b561:423c]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4535ebced8asm31343715e9.40.2025.06.19.07.55.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Jun 2025 07:55:21 -0700 (PDT) From: Casey Connolly Date: Thu, 19 Jun 2025 16:55:12 +0200 Subject: [PATCH 04/11] power: supply: pmi8998_charger: rename to qcom_smbx Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250619-smb2-smb5-support-v1-4-ac5dec51b6e1@linaro.org> References: <20250619-smb2-smb5-support-v1-0-ac5dec51b6e1@linaro.org> In-Reply-To: <20250619-smb2-smb5-support-v1-0-ac5dec51b6e1@linaro.org> To: Sebastian Reichel , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Bjorn Andersson , Konrad Dybcio , Kees Cook , "Gustavo A. R. Silva" Cc: linux-arm-msm@vger.kernel.org, linux-pm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Sebastian Reichel , linux-hardening@vger.kernel.org, Casey Connolly X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=17352; i=casey.connolly@linaro.org; h=from:subject:message-id; bh=OWLz8jy0aYNhz1ULgnx3Uoo5bzB1cKuLHiMXElp54PI=; b=owEBbQKS/ZANAwAKAQWDMSsZX2S2AcsmYgBoVCTR5QQWOfKw4wNukOAR+6QYsvQU/EnPxlc3j +oPY/FAIb6JAjMEAAEKAB0WIQS2UaFGPGq+0GkMVc0FgzErGV9ktgUCaFQk0QAKCRAFgzErGV9k ttpQEACf/dWD6EO6igozEPvUMvpjWhziJWfMyCYyN3Ce7wq8qfmaAWS5mGMu0NcrTzRTxuxP8H1 eOttX5MznBrgpT0Rr+Y/8TILIX0+SwOmJuSjXq7PSnC7XxQMlzL0fBRsc6pgtI1hRvpQw+CES7N 21ob+fiOrnzdkyV8MzVVzBhcB7nW3wHg7EuOLnHyU7rqbFso2Zj/vJOqNVhzfvv3lQ5xb8/KmvC hAfFabZaN7qtl5k6q0u8uRyVz3jQFQKIJiLe+YziDNSXVdvpH4tPslyl0tefnBwenARd7R/zWNc jja+1ON085/MuYNDFO+vlF+Fa0JodRP8/x6ODsg3JkWoGUr7OSQdSbaJK/juzMsiOql8dlQ2wcK BphQMVFvcV1FwniNstZo2kJrijEoXlfy20TMBBHhV0yDpR39v5LRxrEGD/OQPdkAJFMGsysf4aB Qwauj0q1a2xEF7qjhfyjOvHLjBU2JwBGcjiXWs0ba42Bn5btKHn1K03H7YFXCx/KY4PmFv1Q9T8 pu0WW6ycnxPSukQ22oQCF2rMtHcfwBY9V9Q+AIokcuJYPh6m/PAbJtND0Ehy6uFKF5pNjv0ofRc TLYHYzy0yxRUybTNc1U+sAya7tjhW5udvsB9beAyoYwkvWP0EpuSqYs+PG2+mSbm9Qilj2dtwXt Md1+vvTFSV1Jvrw== X-Developer-Key: i=casey.connolly@linaro.org; a=openpgp; fpr=83B24DA7FE145076BC38BB250CD904EB673A7C47 Prepare to add smb5 support by making variables and the file name more generic. Also take the opportunity to remove the "_charger" suffix since smb2 always refers to a charger. Signed-off-by: Casey Connolly --- drivers/power/supply/Makefile | 2 +- .../supply/{qcom_pmi8998_charger.c => qcom_smbx.c} | 148 ++++++++++----------- 2 files changed, 75 insertions(+), 75 deletions(-) diff --git a/drivers/power/supply/Makefile b/drivers/power/supply/Makefile index 4f5f8e3507f80da02812f0d08c2d81ddff0a272f..f943c9150b326d41ff241f82610f70298635eb08 100644 --- a/drivers/power/supply/Makefile +++ b/drivers/power/supply/Makefile @@ -119,6 +119,6 @@ obj-$(CONFIG_RN5T618_POWER) += rn5t618_power.o obj-$(CONFIG_BATTERY_ACER_A500) += acer_a500_battery.o obj-$(CONFIG_BATTERY_SURFACE) += surface_battery.o obj-$(CONFIG_CHARGER_SURFACE) += surface_charger.o obj-$(CONFIG_BATTERY_UG3105) += ug3105_battery.o -obj-$(CONFIG_CHARGER_QCOM_SMB2) += qcom_pmi8998_charger.o +obj-$(CONFIG_CHARGER_QCOM_SMB2) += qcom_smbx.o obj-$(CONFIG_FUEL_GAUGE_MM8013) += mm8013.o diff --git a/drivers/power/supply/qcom_pmi8998_charger.c b/drivers/power/supply/qcom_smbx.c similarity index 88% rename from drivers/power/supply/qcom_pmi8998_charger.c rename to drivers/power/supply/qcom_smbx.c index cd3cb473c70dd1c289cc4094e74746e3c6dc16ee..b1cb925581ec6b8cfca3897be2de5b00a336c920 100644 --- a/drivers/power/supply/qcom_pmi8998_charger.c +++ b/drivers/power/supply/qcom_smbx.c @@ -361,19 +361,19 @@ enum charger_status { INHIBIT_CHARGE, DISABLE_CHARGE, }; -struct smb2_register { +struct smb_init_register { u16 addr; u8 mask; u8 val; }; /** - * struct smb2_chip - smb2 chip structure + * struct smb_chip - smb chip structure * @dev: Device reference for power_supply * @name: The platform device name - * @base: Base address for smb2 registers + * @base: Base address for smb registers * @regmap: Register map * @batt_info: Battery data from DT * @status_change_work: Worker to handle plug/unplug events * @cable_irq: USB plugin IRQ @@ -381,9 +381,9 @@ struct smb2_register { * @usb_in_i_chan: USB_IN current measurement channel * @usb_in_v_chan: USB_IN voltage measurement channel * @chg_psy: Charger power supply instance */ -struct smb2_chip { +struct smb_chip { struct device *dev; const char *name; unsigned int base; struct regmap *regmap; @@ -398,9 +398,9 @@ struct smb2_chip { struct power_supply *chg_psy; }; -static enum power_supply_property smb2_properties[] = { +static enum power_supply_property smb_properties[] = { POWER_SUPPLY_PROP_MANUFACTURER, POWER_SUPPLY_PROP_MODEL_NAME, POWER_SUPPLY_PROP_CURRENT_MAX, POWER_SUPPLY_PROP_CURRENT_NOW, @@ -410,9 +410,9 @@ static enum power_supply_property smb2_properties[] = { POWER_SUPPLY_PROP_ONLINE, POWER_SUPPLY_PROP_USB_TYPE, }; -static int smb2_get_prop_usb_online(struct smb2_chip *chip, int *val) +static int smb_get_prop_usb_online(struct smb_chip *chip, int *val) { unsigned int stat; int rc; @@ -430,15 +430,15 @@ static int smb2_get_prop_usb_online(struct smb2_chip *chip, int *val) /* * Qualcomm "automatic power source detection" aka APSD * tells us what type of charger we're connected to. */ -static int smb2_apsd_get_charger_type(struct smb2_chip *chip, int *val) +static int smb_apsd_get_charger_type(struct smb_chip *chip, int *val) { unsigned int apsd_stat, stat; int usb_online = 0; int rc; - rc = smb2_get_prop_usb_online(chip, &usb_online); + rc = smb_get_prop_usb_online(chip, &usb_online); if (!usb_online) { *val = POWER_SUPPLY_USB_TYPE_UNKNOWN; return rc; } @@ -470,15 +470,15 @@ static int smb2_apsd_get_charger_type(struct smb2_chip *chip, int *val) return 0; } -static int smb2_get_prop_status(struct smb2_chip *chip, int *val) +static int smb_get_prop_status(struct smb_chip *chip, int *val) { unsigned char stat[2]; int usb_online = 0; int rc; - rc = smb2_get_prop_usb_online(chip, &usb_online); + rc = smb_get_prop_usb_online(chip, &usb_online); if (!usb_online) { *val = POWER_SUPPLY_STATUS_DISCHARGING; return rc; } @@ -518,9 +518,9 @@ static int smb2_get_prop_status(struct smb2_chip *chip, int *val) return rc; } } -static inline int smb2_get_current_limit(struct smb2_chip *chip, +static inline int smb_get_current_limit(struct smb_chip *chip, unsigned int *val) { int rc = regmap_read(chip->regmap, chip->base + ICL_STATUS, val); @@ -528,9 +528,9 @@ static inline int smb2_get_current_limit(struct smb2_chip *chip, *val *= CURRENT_SCALE_FACTOR; return rc; } -static int smb2_set_current_limit(struct smb2_chip *chip, unsigned int val) +static int smb_set_current_limit(struct smb_chip *chip, unsigned int val) { unsigned char val_raw; if (val > 4800000) { @@ -543,24 +543,24 @@ static int smb2_set_current_limit(struct smb2_chip *chip, unsigned int val) return regmap_write(chip->regmap, chip->base + USBIN_CURRENT_LIMIT_CFG, val_raw); } -static void smb2_status_change_work(struct work_struct *work) +static void smb_status_change_work(struct work_struct *work) { unsigned int charger_type, current_ua; int usb_online = 0; int count, rc; - struct smb2_chip *chip; + struct smb_chip *chip; - chip = container_of(work, struct smb2_chip, status_change_work.work); + chip = container_of(work, struct smb_chip, status_change_work.work); - smb2_get_prop_usb_online(chip, &usb_online); + smb_get_prop_usb_online(chip, &usb_online); if (!usb_online) return; for (count = 0; count < 3; count++) { dev_dbg(chip->dev, "get charger type retry %d\n", count); - rc = smb2_apsd_get_charger_type(chip, &charger_type); + rc = smb_apsd_get_charger_type(chip, &charger_type); if (rc != -EAGAIN) break; msleep(100); } @@ -591,13 +591,13 @@ static void smb2_status_change_work(struct work_struct *work) current_ua = SDP_CURRENT_UA; break; } - smb2_set_current_limit(chip, current_ua); + smb_set_current_limit(chip, current_ua); power_supply_changed(chip->chg_psy); } -static int smb2_get_iio_chan(struct smb2_chip *chip, struct iio_channel *chan, +static int smb_get_iio_chan(struct smb_chip *chip, struct iio_channel *chan, int *val) { int rc; union power_supply_propval status; @@ -616,9 +616,9 @@ static int smb2_get_iio_chan(struct smb2_chip *chip, struct iio_channel *chan, return iio_read_channel_processed(chan, val); } -static int smb2_get_prop_health(struct smb2_chip *chip, int *val) +static int smb_get_prop_health(struct smb_chip *chip, int *val) { int rc; unsigned int stat; @@ -650,13 +650,13 @@ static int smb2_get_prop_health(struct smb2_chip *chip, int *val) return 0; } } -static int smb2_get_property(struct power_supply *psy, +static int smb_get_property(struct power_supply *psy, enum power_supply_property psp, union power_supply_propval *val) { - struct smb2_chip *chip = power_supply_get_drvdata(psy); + struct smb_chip *chip = power_supply_get_drvdata(psy); switch (psp) { case POWER_SUPPLY_PROP_MANUFACTURER: val->strval = "Qualcomm"; @@ -664,45 +664,45 @@ static int smb2_get_property(struct power_supply *psy, case POWER_SUPPLY_PROP_MODEL_NAME: val->strval = chip->name; return 0; case POWER_SUPPLY_PROP_CURRENT_MAX: - return smb2_get_current_limit(chip, &val->intval); + return smb_get_current_limit(chip, &val->intval); case POWER_SUPPLY_PROP_CURRENT_NOW: - return smb2_get_iio_chan(chip, chip->usb_in_i_chan, + return smb_get_iio_chan(chip, chip->usb_in_i_chan, &val->intval); case POWER_SUPPLY_PROP_VOLTAGE_NOW: - return smb2_get_iio_chan(chip, chip->usb_in_v_chan, + return smb_get_iio_chan(chip, chip->usb_in_v_chan, &val->intval); case POWER_SUPPLY_PROP_ONLINE: - return smb2_get_prop_usb_online(chip, &val->intval); + return smb_get_prop_usb_online(chip, &val->intval); case POWER_SUPPLY_PROP_STATUS: - return smb2_get_prop_status(chip, &val->intval); + return smb_get_prop_status(chip, &val->intval); case POWER_SUPPLY_PROP_HEALTH: - return smb2_get_prop_health(chip, &val->intval); + return smb_get_prop_health(chip, &val->intval); case POWER_SUPPLY_PROP_USB_TYPE: - return smb2_apsd_get_charger_type(chip, &val->intval); + return smb_apsd_get_charger_type(chip, &val->intval); default: dev_err(chip->dev, "invalid property: %d\n", psp); return -EINVAL; } } -static int smb2_set_property(struct power_supply *psy, +static int smb_set_property(struct power_supply *psy, enum power_supply_property psp, const union power_supply_propval *val) { - struct smb2_chip *chip = power_supply_get_drvdata(psy); + struct smb_chip *chip = power_supply_get_drvdata(psy); switch (psp) { case POWER_SUPPLY_PROP_CURRENT_MAX: - return smb2_set_current_limit(chip, val->intval); + return smb_set_current_limit(chip, val->intval); default: dev_err(chip->dev, "No setter for property: %d\n", psp); return -EINVAL; } } -static int smb2_property_is_writable(struct power_supply *psy, +static int smb_property_is_writable(struct power_supply *psy, enum power_supply_property psp) { switch (psp) { case POWER_SUPPLY_PROP_CURRENT_MAX: @@ -711,11 +711,11 @@ static int smb2_property_is_writable(struct power_supply *psy, return 0; } } -static irqreturn_t smb2_handle_batt_overvoltage(int irq, void *data) +static irqreturn_t smb_handle_batt_overvoltage(int irq, void *data) { - struct smb2_chip *chip = data; + struct smb_chip *chip = data; unsigned int status; regmap_read(chip->regmap, chip->base + BATTERY_CHARGER_STATUS_2, &status); @@ -728,11 +728,11 @@ static irqreturn_t smb2_handle_batt_overvoltage(int irq, void *data) return IRQ_HANDLED; } -static irqreturn_t smb2_handle_usb_plugin(int irq, void *data) +static irqreturn_t smb_handle_usb_plugin(int irq, void *data) { - struct smb2_chip *chip = data; + struct smb_chip *chip = data; power_supply_changed(chip->chg_psy); schedule_delayed_work(&chip->status_change_work, @@ -740,20 +740,20 @@ static irqreturn_t smb2_handle_usb_plugin(int irq, void *data) return IRQ_HANDLED; } -static irqreturn_t smb2_handle_usb_icl_change(int irq, void *data) +static irqreturn_t smb_handle_usb_icl_change(int irq, void *data) { - struct smb2_chip *chip = data; + struct smb_chip *chip = data; power_supply_changed(chip->chg_psy); return IRQ_HANDLED; } -static irqreturn_t smb2_handle_wdog_bark(int irq, void *data) +static irqreturn_t smb_handle_wdog_bark(int irq, void *data) { - struct smb2_chip *chip = data; + struct smb_chip *chip = data; int rc; power_supply_changed(chip->chg_psy); @@ -764,24 +764,24 @@ static irqreturn_t smb2_handle_wdog_bark(int irq, void *data) return IRQ_HANDLED; } -static const struct power_supply_desc smb2_psy_desc = { +static const struct power_supply_desc smb_psy_desc = { .name = "pmi8998_charger", .type = POWER_SUPPLY_TYPE_USB, .usb_types = BIT(POWER_SUPPLY_USB_TYPE_SDP) | BIT(POWER_SUPPLY_USB_TYPE_CDP) | BIT(POWER_SUPPLY_USB_TYPE_DCP) | BIT(POWER_SUPPLY_USB_TYPE_UNKNOWN), - .properties = smb2_properties, - .num_properties = ARRAY_SIZE(smb2_properties), - .get_property = smb2_get_property, - .set_property = smb2_set_property, - .property_is_writeable = smb2_property_is_writable, + .properties = smb_properties, + .num_properties = ARRAY_SIZE(smb_properties), + .get_property = smb_get_property, + .set_property = smb_set_property, + .property_is_writeable = smb_property_is_writable, }; /* Init sequence derived from vendor downstream driver */ -static const struct smb2_register smb2_init_seq[] = { +static const struct smb_init_register smb_init_seq[] = { { .addr = AICL_RERUN_TIME_CFG, .mask = AICL_RERUN_TIME_MASK, .val = 0 }, /* * By default configure us as an upstream facing port * FIXME: This will be handled by the type-c driver @@ -881,19 +881,19 @@ static const struct smb2_register smb2_init_seq[] = { .mask = FAST_CHARGE_CURRENT_SETTING_MASK, .val = 1000000 / CURRENT_SCALE_FACTOR }, }; -static int smb2_init_hw(struct smb2_chip *chip) +static int smb_init_hw(struct smb_chip *chip) { int rc, i; - for (i = 0; i < ARRAY_SIZE(smb2_init_seq); i++) { + for (i = 0; i < ARRAY_SIZE(smb_init_seq); i++) { dev_dbg(chip->dev, "%d: Writing 0x%02x to 0x%02x\n", i, - smb2_init_seq[i].val, smb2_init_seq[i].addr); + smb_init_seq[i].val, smb_init_seq[i].addr); rc = regmap_update_bits(chip->regmap, - chip->base + smb2_init_seq[i].addr, - smb2_init_seq[i].mask, - smb2_init_seq[i].val); + chip->base + smb_init_seq[i].addr, + smb_init_seq[i].mask, + smb_init_seq[i].val); if (rc < 0) return dev_err_probe(chip->dev, rc, "%s: init command %d failed\n", __func__, i); @@ -901,9 +901,9 @@ static int smb2_init_hw(struct smb2_chip *chip) return 0; } -static int smb2_init_irq(struct smb2_chip *chip, int *irq, const char *name, +static int smb_init_irq(struct smb_chip *chip, int *irq, const char *name, irqreturn_t (*handler)(int irq, void *data)) { int irqnum; int rc; @@ -923,13 +923,13 @@ static int smb2_init_irq(struct smb2_chip *chip, int *irq, const char *name, return 0; } -static int smb2_probe(struct platform_device *pdev) +static int smb_probe(struct platform_device *pdev) { struct power_supply_config supply_config = {}; struct power_supply_desc *desc; - struct smb2_chip *chip; + struct smb_chip *chip; int rc, irq; chip = devm_kzalloc(&pdev->dev, sizeof(*chip), GFP_KERNEL); if (!chip) @@ -958,19 +958,19 @@ static int smb2_probe(struct platform_device *pdev) return dev_err_probe(chip->dev, PTR_ERR(chip->usb_in_i_chan), "Couldn't get usbin_i IIO channel\n"); } - rc = smb2_init_hw(chip); + rc = smb_init_hw(chip); if (rc < 0) return rc; supply_config.drv_data = chip; supply_config.fwnode = dev_fwnode(&pdev->dev); - desc = devm_kzalloc(chip->dev, sizeof(smb2_psy_desc), GFP_KERNEL); + desc = devm_kzalloc(chip->dev, sizeof(smb_psy_desc), GFP_KERNEL); if (!desc) return -ENOMEM; - memcpy(desc, &smb2_psy_desc, sizeof(smb2_psy_desc)); + memcpy(desc, &smb_psy_desc, sizeof(smb_psy_desc)); desc->name = devm_kasprintf(chip->dev, GFP_KERNEL, "%s-charger", (const char *)device_get_match_data(chip->dev)); if (!desc->name) @@ -987,9 +987,9 @@ static int smb2_probe(struct platform_device *pdev) return dev_err_probe(chip->dev, rc, "Failed to get battery info\n"); rc = devm_delayed_work_autocancel(chip->dev, &chip->status_change_work, - smb2_status_change_work); + smb_status_change_work); if (rc) return dev_err_probe(chip->dev, rc, "Failed to init status change work\n"); @@ -998,22 +998,22 @@ static int smb2_probe(struct platform_device *pdev) FLOAT_VOLTAGE_SETTING_MASK, rc); if (rc < 0) return dev_err_probe(chip->dev, rc, "Couldn't set vbat max\n"); - rc = smb2_init_irq(chip, &irq, "bat-ov", smb2_handle_batt_overvoltage); + rc = smb_init_irq(chip, &irq, "bat-ov", smb_handle_batt_overvoltage); if (rc < 0) return rc; - rc = smb2_init_irq(chip, &chip->cable_irq, "usb-plugin", - smb2_handle_usb_plugin); + rc = smb_init_irq(chip, &chip->cable_irq, "usb-plugin", + smb_handle_usb_plugin); if (rc < 0) return rc; - rc = smb2_init_irq(chip, &irq, "usbin-icl-change", - smb2_handle_usb_icl_change); + rc = smb_init_irq(chip, &irq, "usbin-icl-change", + smb_handle_usb_icl_change); if (rc < 0) return rc; - rc = smb2_init_irq(chip, &irq, "wdog-bark", smb2_handle_wdog_bark); + rc = smb_init_irq(chip, &irq, "wdog-bark", smb_handle_wdog_bark); if (rc < 0) return rc; devm_device_init_wakeup(chip->dev); @@ -1029,24 +1029,24 @@ static int smb2_probe(struct platform_device *pdev) return 0; } -static const struct of_device_id smb2_match_id_table[] = { +static const struct of_device_id smb_match_id_table[] = { { .compatible = "qcom,pmi8998-charger", .data = "pmi8998" }, { .compatible = "qcom,pm660-charger", .data = "pm660" }, { /* sentinal */ } }; -MODULE_DEVICE_TABLE(of, smb2_match_id_table); +MODULE_DEVICE_TABLE(of, smb_match_id_table); -static struct platform_driver qcom_spmi_smb2 = { - .probe = smb2_probe, +static struct platform_driver qcom_spmi_smb = { + .probe = smb_probe, .driver = { - .name = "qcom-pmi8998/pm660-charger", - .of_match_table = smb2_match_id_table, + .name = "qcom-smbx-charger", + .of_match_table = smb_match_id_table, }, }; -module_platform_driver(qcom_spmi_smb2); +module_platform_driver(qcom_spmi_smb); MODULE_AUTHOR("Casey Connolly "); MODULE_DESCRIPTION("Qualcomm SMB2 Charger Driver"); MODULE_LICENSE("GPL"); From patchwork Thu Jun 19 14:55:13 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Casey Connolly X-Patchwork-Id: 898039 Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.51]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6170528BAB0 for ; Thu, 19 Jun 2025 14:55:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750344928; cv=none; b=rrij3ZH0FWCmL4LiYKcM2ASYSM1tpixoNDWFWJDpn6+MI/A3tvMdd4uPYUfWMXoo2XHvkb43qrlKJEYWgjpV+/uQIzpzUDbustrEM5ZUPGvjJXSYd5v7oD3RluHodmaBOKRTKLrzoA5nECUXAzIp6ggd9g/tny+rgo3u74d+Apw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750344928; c=relaxed/simple; bh=5zLQjefFl1xoVe/hjAGrMynvu2zXA+YnEoPsGjdFfEE=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=oxo0JMqLVJeWOczIjbkKXqGdeKNO9wUSvzqm9ziJMNjJJ6jtfRwx4IvDOJdFMotstLKKdV+joyqMKOKBq3UVRMr9pWM1kX373n2N69pc8VVrhTuwtzSMpPV2qme/qY7TK6NZA3GSjhPyeraUnR20iVDdzRscWm1KNaZ/+vOWgzI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=LXV+9nc/; arc=none smtp.client-ip=209.85.221.51 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="LXV+9nc/" Received: by mail-wr1-f51.google.com with SMTP id ffacd0b85a97d-3a548a73ff2so890175f8f.0 for ; Thu, 19 Jun 2025 07:55:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1750344923; x=1750949723; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=gLzhodFNjkX+gPU6aAgcbyZ8ijaQa1ht97PNw+na+88=; b=LXV+9nc/vNCVeHlWGbgbDdZH3dLqOuPng4aK846sesQD+tVwCDrEbNGd9GY0iEbVAM iTcVa17ToqJL4kH6wmbbiwNvOzRPJ5xWJCYH8+BnJ1wNo1tIa9tTtLcr8Klxsncsx9Id qXIkCzAAmfC7m+rfBXJOzT/8XamfD+VSEP6h4geTYMWotij7lQKMeRaUWhNxzsWSKR2n Q1a4jHXwZU/FT3wqqRNw3P9yqOOm6rjlo9k194gEwt6XT8b/qp8rnfbL/Y+klom13g5R 7Ns3KFD58EuMQntKt6nzOTbNCeyr3iim41oXnfRb95gqgf6FeTGkEdvYlQ25Jna0W+0m P8rw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750344923; x=1750949723; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=gLzhodFNjkX+gPU6aAgcbyZ8ijaQa1ht97PNw+na+88=; b=IqGrUJnKlW7hfzgEHvYxwCqo1oQaw0zvFlOJFtQINd5bUJEE6goEyhtUVdJ970PJEP aClxRvJNCwkAnR97DXr2NOzfM/TWr0f8/k6X5P+KW8eCBHtob/2sXk/BWrPubMCh8aOh T1EWt9lCvJ+pVfm7N7Mv7DR5WLzmAxoJqu+WHhq5zU2EUn0yYGqoxrMw3/G1YsL0gbxp Kawvq9xpcHHfuUZp8WBWXrDUqW5cG8jzo0VmPkIuTg6STXXbPqsDFB0ziuLfjFxNRVJQ 7jDEBBudCOUD51xCK8jsku1HxfTFWGoNrwXNngShGO4qZ4nmmdmG1nCJXjLVi/PLthzJ 4nTQ== X-Gm-Message-State: AOJu0YycjRl0CipIQOnYtiH2ijf70As/MUm1/NazuSZf7SqrTQ5lszzI wu/g5myDBWOtbmT8JpJQ1JgMA8jT7nD9kiRqEiF+bPATb7aK8tcdJcFIcBkNGm3rOk8= X-Gm-Gg: ASbGncuSz5Tc5GsTJp1Htazb3+0GGJ5exheTjo0ZiUcy3qwTomG3skHbcY8IWZR+kyk dL37vC4JEhuWeXBJ2lbcl2Jh3tIeSXyPthzQmL08gUIb6/NNTp8mjM+ZddtTQgNNG9DsziTT/Z8 qgRac0N3J+ABwwU68Xqgqh8/jbyyEJVi4H3gzC4QXWagnaomD0lq2hy3T5cGT5n6RvRUMT7pAav oIubTdis4BtpJ/Q0hgEenSM6IgugMyAOfDxnlXLpdNeshyVC1wBTflUS9VhuHOCg3VaBWptsoxC 7BoumXpWHHH3ZyTMivER7L8Dz9yHRP897ccjtpRMzaB8xTrAtCNjjA1YS8FrtrPRKh9/fLwCpCv n6BfDbGqMK9w= X-Google-Smtp-Source: AGHT+IEDxOs2fv0eODh32EDd8cdAU32JALjDJpZubvkYuesAwi2i9gcqAOAB2Ga5J//4M2trs4Fd0w== X-Received: by 2002:a05:6000:210b:b0:3a5:8abe:a264 with SMTP id ffacd0b85a97d-3a58abed70emr6303048f8f.37.1750344923430; Thu, 19 Jun 2025 07:55:23 -0700 (PDT) Received: from toyger.tail248178.ts.net ([2a0e:c5c1:0:100:b058:b8f5:b561:423c]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4535ebced8asm31343715e9.40.2025.06.19.07.55.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Jun 2025 07:55:22 -0700 (PDT) From: Casey Connolly Date: Thu, 19 Jun 2025 16:55:13 +0200 Subject: [PATCH 05/11] power: supply: qcom_smbx: allow disabling charging Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250619-smb2-smb5-support-v1-5-ac5dec51b6e1@linaro.org> References: <20250619-smb2-smb5-support-v1-0-ac5dec51b6e1@linaro.org> In-Reply-To: <20250619-smb2-smb5-support-v1-0-ac5dec51b6e1@linaro.org> To: Sebastian Reichel , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Bjorn Andersson , Konrad Dybcio , Kees Cook , "Gustavo A. R. Silva" Cc: linux-arm-msm@vger.kernel.org, linux-pm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Sebastian Reichel , linux-hardening@vger.kernel.org, Casey Connolly X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1357; i=casey.connolly@linaro.org; h=from:subject:message-id; bh=5zLQjefFl1xoVe/hjAGrMynvu2zXA+YnEoPsGjdFfEE=; b=owEBbQKS/ZANAwAKAQWDMSsZX2S2AcsmYgBoVCTR5g7afOe/JLNddLPQnw8+CLIW9X0RRbizc AD20INQzGuJAjMEAAEKAB0WIQS2UaFGPGq+0GkMVc0FgzErGV9ktgUCaFQk0QAKCRAFgzErGV9k tr3SEACdCNo03bzqVOxk1mrxOgrONtYGGJjUcXqLvWuPXcJs2Dngoaq/Dg3UvuhGe8oGlZwrD+I Fzo4PwcBuIqf8SOc9A/MJsNyS7FJX0oYJrpNI/ta8TSk0i32NTYFCpVtmIRPN+RZ3Fpxzr1uzAL sqHS1LXrjlth/+XJwkdtPyFavnmeKl2MiWY6GtsC/UVNaVMKLtjA0UTv7icN/ozvlSxNhKU6tEU UoLYtPz9Fqwp5QiAKn847s/tKxODhKRYFOPYA0rhB985tOyhpHkYsCk+4IPIwAczS4snyPa9uuB YKy5vRvAT0lsVAd6Vh6UGyXh+ZXIZjXwpibHxG4yRqGSsS3qztTOfeJ/C6bXLEZ6i16fx7cwZaF V/9yRpXf5Aj7TTyBq8C3mXogqE+hn7RxSdnGW+PTlwKxfmzY0LQam5UY81bxoZ8ZzcNa01EP5Zf +kkcNaaVJ3PPSpcRRsVP7UXgNotlvibEA8VFJmQnh3EqmA5Hppn3XJfHoe+BmNnOp8h/YRfH+n4 htj80jTZ3GTFjCOgH7wUAOiQt28xTy/QUPfcVWIKaavS4SKv40NQpof49aLlY2ArkCy635xjTuL Z8IcsmPymiw1jJ1zDNie+RbE6ONBiA4PQ5Q1qAx9yNC5wu5AHv2/5UsRLB+v2rk8SztZdJHlvo8 /lcBkraryspc5oA== X-Developer-Key: i=casey.connolly@linaro.org; a=openpgp; fpr=83B24DA7FE145076BC38BB250CD904EB673A7C47 Hook up USBIN_CMD_IL so that writing "0" to the status register will disable charging, this is useful to let users limit charging automatically. Signed-off-by: Casey Connolly Reviewed-by: Konrad Dybcio --- drivers/power/supply/qcom_smbx.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/power/supply/qcom_smbx.c b/drivers/power/supply/qcom_smbx.c index b1cb925581ec6b8cfca3897be2de5b00a336c920..fc2a8e20435639a9da4d966c43271beaeb57a03f 100644 --- a/drivers/power/supply/qcom_smbx.c +++ b/drivers/power/supply/qcom_smbx.c @@ -692,8 +692,11 @@ static int smb_set_property(struct power_supply *psy, { struct smb_chip *chip = power_supply_get_drvdata(psy); switch (psp) { + case POWER_SUPPLY_PROP_STATUS: + return regmap_update_bits(chip->regmap, chip->base + USBIN_CMD_IL, + USBIN_SUSPEND_BIT, !val->intval); case POWER_SUPPLY_PROP_CURRENT_MAX: return smb_set_current_limit(chip, val->intval); default: dev_err(chip->dev, "No setter for property: %d\n", psp); @@ -704,8 +707,9 @@ static int smb_set_property(struct power_supply *psy, static int smb_property_is_writable(struct power_supply *psy, enum power_supply_property psp) { switch (psp) { + case POWER_SUPPLY_PROP_STATUS: case POWER_SUPPLY_PROP_CURRENT_MAX: return 1; default: return 0; From patchwork Thu Jun 19 14:55:14 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Casey Connolly X-Patchwork-Id: 899120 Received: from mail-wm1-f43.google.com (mail-wm1-f43.google.com [209.85.128.43]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 439A528C2DB for ; Thu, 19 Jun 2025 14:55:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.43 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750344929; cv=none; b=XEKcYJTP59aJO+zFNboZYhcUp2Z+vK3tuPfjgw/tBVAxTgUMbYaqR+81KcMdCe1hgQuOgaTEMO2ruDcmXRYEoYrlqxnXUnYAIlw7z/1qo5lRTgRqTG+5lGFloT442tOwdjUodKhQNrkKAF/JVBga3AUczqoKoOlDrzlSVtW9LgE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750344929; c=relaxed/simple; bh=JemuwVrf8yUubUQ04X5WC7YM6uXAXUdph7sXz3IArE8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=euSEO8r4eD0YaIubSe6iWKJtsSw8eni5EG9R2f3iLiNx4jrzGZqaiQKBTWUdGXJ2n/c0CvZChTP+FEWX6utRJNWBgsSsQ9BoOGKFg0FPWV+98VYeazAfheKv9+TWBFKlAOibRTLPI6M4a2Cz0vAg8TAkio3kbLXaxgcaTybLFpk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=MKQwnBo5; arc=none smtp.client-ip=209.85.128.43 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="MKQwnBo5" Received: by mail-wm1-f43.google.com with SMTP id 5b1f17b1804b1-43ea40a6e98so10655645e9.1 for ; Thu, 19 Jun 2025 07:55:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1750344925; x=1750949725; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=V5fVBNslUv5VUBRyFZmw0sYPamOw5qzhbaF7o6iXTDM=; b=MKQwnBo5ycoQ/UXxhYlQBsU9BNuXvxuvbtIza5uFsskVzgo/g5NUZTb0wFpwjL/vrr DBbsTtYB22W29rDm8yoJXhTw4sP+yXQz1037p97ZYXPEfWLKxrBYItKDWzIekuc5Xtcr Y1oidYG4RHkF3h79svdqoDjtr50NeDG1yUGq+vhWUptFOIXU8dvTiarbQcm6Yu9vOoVz QHufH5OrcdelBqgsl6/p7Tql2VhUPqm9S5UTxDuJTgokZJ3Cw4sJtfpBU+RF6BXrCZJW ieF9j1Aty6+dFx28iZHz4BRhRhhdDSIE20bDrl4vC6727fvafqX8XtNr9P5obdOcVydP np8w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750344925; x=1750949725; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=V5fVBNslUv5VUBRyFZmw0sYPamOw5qzhbaF7o6iXTDM=; b=CQmJl6yo8huzeZEJvUkJZR5EK+FhkYNXVisFMtHFKYEAF3hSr7eEEFlyM2TFFlMLEi +3kJ8LWPhdi2ROgxO3X//SRl8Hovsro6VlV4PKs2+pyX0xfRCDdf21QD+QGFLyPJSmJG D1DlmOXAS29EyiU03RyaGZX3IQH7eMueq6g3/O5yKT5BjvdgCQZXaz5E45+p+Ycl/mnl QhQc2O5T1GxpwZYcusCMJpvaJm9mq5Psmao1ikPeUmESlU/zOk153yRGqQr0XxvywmWx 4UfibKj0o5p8/Xqly9udDLm5BgwC5CMXAKQUlGIEzTw7ZxIfxS51yfxdxXIV7DAXwK1j hJZA== X-Gm-Message-State: AOJu0YxQsG09ofXQDnelL8lajAKKT3fay383x7xUv4TSgyAd7ZmPFn4B 5Sn4+Schd/d6ZMs3Tbvk56DH+Fdoqtq5zP0JONe8qR86EZEfhVhN9oOVx+HO6sNLMAQ= X-Gm-Gg: ASbGncud/HOP66s03ksJVwLX7JJdD2efUPOMS4K/WIQiLrN7MRpprzy/a9xZo4XkaxP EtZ1tQKsr3BQ2TnOil9aPZ3G2hIXlpe6IkHmeG4G4K2XbMdVc2atUUVZAWSnMpLoSCcYwTeSPKw QZ0CoYZd3ECBPbUR2ykmmf5SI+tqDEeIm58bRyrHkw5zyNAAg80XkhWnYrNekUXNRnf2DAcYSp3 JXG3PaqNOKRmUOtKuEJQVhq98mH2RHAGQWDZSBeB0E5SSFZ6OEJlU6AM8IQGJylz/jSBlSfaYwf SLMn1H8DoRu2SsHi0hUPce6/3Xqtq98z+ms1CUgH8MtDTW8Y0TTszROq9eb3uTb0wyYqDw9x7yz DLrlBU+dC9oALYHaSwUxvFA== X-Google-Smtp-Source: AGHT+IGtKHGGVTcveyhymsAylUd1eIhqDyS+/H63/Vk/2Z2lAu24ERgJx0a95RwSPxwt7eNSWAKzyg== X-Received: by 2002:a05:600c:8b65:b0:44b:eb56:1d45 with SMTP id 5b1f17b1804b1-4533ca6e6a8mr234107125e9.15.1750344925237; Thu, 19 Jun 2025 07:55:25 -0700 (PDT) Received: from toyger.tail248178.ts.net ([2a0e:c5c1:0:100:b058:b8f5:b561:423c]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4535ebced8asm31343715e9.40.2025.06.19.07.55.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Jun 2025 07:55:24 -0700 (PDT) From: Casey Connolly Date: Thu, 19 Jun 2025 16:55:14 +0200 Subject: [PATCH 06/11] power: supply: qcom_smbx: respect battery charge-term-current-microamp Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250619-smb2-smb5-support-v1-6-ac5dec51b6e1@linaro.org> References: <20250619-smb2-smb5-support-v1-0-ac5dec51b6e1@linaro.org> In-Reply-To: <20250619-smb2-smb5-support-v1-0-ac5dec51b6e1@linaro.org> To: Sebastian Reichel , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Bjorn Andersson , Konrad Dybcio , Kees Cook , "Gustavo A. R. Silva" Cc: linux-arm-msm@vger.kernel.org, linux-pm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Sebastian Reichel , linux-hardening@vger.kernel.org, Casey Connolly X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1515; i=casey.connolly@linaro.org; h=from:subject:message-id; bh=JemuwVrf8yUubUQ04X5WC7YM6uXAXUdph7sXz3IArE8=; b=owEBbQKS/ZANAwAKAQWDMSsZX2S2AcsmYgBoVCTRT9U4Qg9OJkb0pSzAf9sdjAQKdeIlP+DEF qNb2vf0iUSJAjMEAAEKAB0WIQS2UaFGPGq+0GkMVc0FgzErGV9ktgUCaFQk0QAKCRAFgzErGV9k trkoD/9uMDtivCbMTOrgggGTlyDa6eGLdCUlIPlMr/C7iumj9T0+pX9tt94ykFnWvge1K153/Ic TFvf4k+NVmqWQqnDGZw8RvUT1B1uv58Av1/6G7HsTOxkWERwnOosXXYUk+OznOcVeAI8zFd0cg4 K9on/a6vvkYan6qqINynhXA/Gth3JlCwe/iImk2cx0xqioduRDFfzxcMYhQbUPqAHyvRWS9MHpM Imr/3fhnenlaX13mjqfddKkhAQUeM1dE6Lq3Kc8yNXed6rBRSPnJXj82zh3ZYg8/dkzue0TLt0T 8E5ydS/cMnzR0bIwT3tsuczQmDi2+E381QgV58rsVTu1joDTuVwgD6sVykud5TTOpgOJBGXjTE4 XlmtoBs1m5k5YkqqsLySsxPuNhm2wPq0BVj7xkUsqn8zErx73u1pPo1pCS6TEfphB8i9jJ2BKwh kQ6SAoZsLK7GkQH+A/peNERM42glBRPQiFtzALsI9lumBkZ2IOcgZ9mTD3mHThukOw8yn3bTLFy zc40iGbihYhOlY4NxbaCx1YF82AQjKAXO+m66co3u1cyy6E35kfuRuL/DrtIk/TUFoOl3r50LgK iHWqEcym98u6mv7isjQHGUN6L8hZKRkVm/mqPOAh/wyT3HvG7coz33+0qPiYK1IZKiGCxsu+Z4F lS5agEn1VU+xBsQ== X-Developer-Key: i=casey.connolly@linaro.org; a=openpgp; fpr=83B24DA7FE145076BC38BB250CD904EB673A7C47 Respect the max current limit set on the battery node, one some devices this is set conservatively to avoid overheating since they only have a single charger IC (instead of two in parallel). Signed-off-by: Casey Connolly --- drivers/power/supply/qcom_smbx.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/power/supply/qcom_smbx.c b/drivers/power/supply/qcom_smbx.c index fc2a8e20435639a9da4d966c43271beaeb57a03f..7fc232fa7260a7422ac12a48686cd7d396edd9a4 100644 --- a/drivers/power/supply/qcom_smbx.c +++ b/drivers/power/supply/qcom_smbx.c @@ -583,9 +583,9 @@ static void smb_status_change_work(struct work_struct *work) case POWER_SUPPLY_USB_TYPE_CDP: current_ua = CDP_CURRENT_UA; break; case POWER_SUPPLY_USB_TYPE_DCP: - current_ua = DCP_CURRENT_UA; + current_ua = chip->batt_info->constant_charge_current_max_ua; break; case POWER_SUPPLY_USB_TYPE_SDP: default: current_ua = SDP_CURRENT_UA; @@ -989,8 +989,10 @@ static int smb_probe(struct platform_device *pdev) rc = power_supply_get_battery_info(chip->chg_psy, &chip->batt_info); if (rc) return dev_err_probe(chip->dev, rc, "Failed to get battery info\n"); + if (chip->batt_info->constant_charge_current_max_ua == -EINVAL) + chip->batt_info->constant_charge_current_max_ua = DCP_CURRENT_UA; rc = devm_delayed_work_autocancel(chip->dev, &chip->status_change_work, smb_status_change_work); if (rc) From patchwork Thu Jun 19 14:55:15 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Casey Connolly X-Patchwork-Id: 898038 Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.45]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CC91628C869 for ; Thu, 19 Jun 2025 14:55:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.45 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750344931; cv=none; b=UU6TXSiupl5eFVBO19Al7z5YUhBcikgxDCSl45PLdYIDJmJbz3JJhboC10RgqaoP5gSmw1ZjwC16U2xxBaQIfUxxlUHpBadIOaNphutL7Khcq2R1X6AAy+T5nkwWUCY9Lky2E2ERwH4mFFNurqQ6fd3q5sD7zpMoATsUOvELMyk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750344931; c=relaxed/simple; bh=4C4/BzYVvqykLCWqBbtexksZlDrp0KmcIoZ0MxhlLow=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=aC/btg0ncIRa+PG1QsJHNOVszY9nLwM1L3gndG11UdGESlPBpQfm5rGutZOSHevr28r1XsvESaNdTRxdbh7Ro1K6Ylci0/PNnUl3dBb2wQEyztgYz/D7GwDZqdZCJxI8ziBRRJSxtc5C/bEp01gX/s8/wGrNkpmRfbksffVa3Y4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=n5NbvsIW; arc=none smtp.client-ip=209.85.221.45 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="n5NbvsIW" Received: by mail-wr1-f45.google.com with SMTP id ffacd0b85a97d-3a54690d369so882793f8f.3 for ; Thu, 19 Jun 2025 07:55:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1750344927; x=1750949727; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=uiY+DVkF0Tx7wXnhclKSYzhcL2ot81tRcGxMxTU/GtI=; b=n5NbvsIWZM5mNmIcMxSGObHD4oh/+gSoVWheGopgdWuJXJM8a8YG9YCISaLYypmqYo NmBMjnWFzU6LfSv2R5f65UljTyLoqEHddG2CFmaj+iXt9oSQW4Cdi54l599H8GIP9Pe0 b0gJNvI5ANTlTZvClbXjzKfpcnGUNEq/zepfHDSWKkajV9v9UXouc3yfHTUL4A66aT7w Gs7DY5c+JNtqSVVgTsJlhFmk0RblKTFAQC1R6jMEL76tIZ6d0UAxslSj2U44xqd3j3BT /ycPkxWGFN3Fd9MjsodMRG9L/Bb4lxOQ7rXk/mYGIB8TLSwr7QMKrkawqImOo3oId/ib hQbw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750344927; x=1750949727; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=uiY+DVkF0Tx7wXnhclKSYzhcL2ot81tRcGxMxTU/GtI=; b=DVrSHDa6Wiy0XwZNOJFNRAFyywdhdJaj6XkClFPLRAHnf03EARKqWDCk29Jse2QQGF t9cYkvp78E/l6WwZemPN9aFRO+OCiWzFmWN1MyqI6vDhYjwxBZIvN6bW0UjW9nN1Kz71 NfKxzx97kxl2G3NDKF5K99JjcKnqc1BxubpK+EJKbn5wewkw6TX4XNtJgk9ijJmd+Bg+ 4dc0WGrW8KSJOewkWQKBHNX0R+ukUVsKZsKj+VyB16oF+/cJAxhHqNoP6K6xznocoSqa 9q9Uf3SefBPzM5e/p0afhgrgwBevVLEN1No4QybVQujI0mOwlW40sTr6PJ41YH9eNIKG Apsw== X-Gm-Message-State: AOJu0YxWxGz04EheoqBXviTBTV2IXk4K1V+wHoO1lJB4oOfoZNeV/3pD P0CRwVLGLZ6frhOc9dLeOrUN0F/7dfUbCIhokkWO+w4TSktnoCbxOKNqZOk81lehEuQ= X-Gm-Gg: ASbGnct2ZxbQPPHoXr63MUjZE0aGMiuoKxkaZ8mq+bZcG53rtBQgx4z/mAWyoN4jhwG T9pfnARCEnCN/odH2D+ds2iZKRe5zKlBcopcM+9q0/H68TrXAj8C0Y6GKrNKKeHt9OzpLdnUWB2 o6UV7edCbh1NpXk09q8AWQKgG8PEoWwFJHzPydPmk5S7QDQLSKhfpgyYJ1fwIUTWvYtIEKGrULd K6L/e5qXvAEn4mtgWCsj0eErfbWIv4dx2CG4tl2xC5nduYNzZKTvAAgARxIhA2pvlo976BrJdWV F/7+4GlRA5GKcCLy/StLIPJtUMQtuQwIGcJ32BAw7BZv8RfE8H0+zTjQRgz1fuWegalVkiv4pav dn4EKHrNq+oE= X-Google-Smtp-Source: AGHT+IGgc5GkhPO/vj3LU4YDmcm6Dit5qWlLwjFG7XrsUFfqD8cTmVzqG/+/ie6nUOAJEDHqELYGwQ== X-Received: by 2002:a05:6000:2c13:b0:3a4:ef36:1f4d with SMTP id ffacd0b85a97d-3a5723a4c09mr18760617f8f.38.1750344926745; Thu, 19 Jun 2025 07:55:26 -0700 (PDT) Received: from toyger.tail248178.ts.net ([2a0e:c5c1:0:100:b058:b8f5:b561:423c]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4535ebced8asm31343715e9.40.2025.06.19.07.55.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Jun 2025 07:55:26 -0700 (PDT) From: Casey Connolly Date: Thu, 19 Jun 2025 16:55:15 +0200 Subject: [PATCH 07/11] power: supply: qcom_smbx: bump up the max current Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250619-smb2-smb5-support-v1-7-ac5dec51b6e1@linaro.org> References: <20250619-smb2-smb5-support-v1-0-ac5dec51b6e1@linaro.org> In-Reply-To: <20250619-smb2-smb5-support-v1-0-ac5dec51b6e1@linaro.org> To: Sebastian Reichel , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Bjorn Andersson , Konrad Dybcio , Kees Cook , "Gustavo A. R. Silva" Cc: linux-arm-msm@vger.kernel.org, linux-pm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Sebastian Reichel , linux-hardening@vger.kernel.org, Casey Connolly X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=2386; i=casey.connolly@linaro.org; h=from:subject:message-id; bh=4C4/BzYVvqykLCWqBbtexksZlDrp0KmcIoZ0MxhlLow=; b=owEBbQKS/ZANAwAKAQWDMSsZX2S2AcsmYgBoVCTR74CQMAmQ7VTKPiBk6x+W6w8QNhr/qM/SB 9TbzQLsqpeJAjMEAAEKAB0WIQS2UaFGPGq+0GkMVc0FgzErGV9ktgUCaFQk0QAKCRAFgzErGV9k tjg4D/49MaTCqWbRpdaxNKlfjLtTNMq6C9Bn1so6q9lsEIryZcn2Ooc0TMkBNln+4horde0iNNJ X2/ofIrJou53ToJo3p8nVgcm3F1V7K1kiEJhuaoAWV0huFC0R4EOn5MGZq4Ezs9o9uz5XiP6kQx 30i6f1fp0lsK1b9qFAP1JZGD3T2NYJOxNc8XhC5EOk03Rc/dHZZSgP+R8MLtTMo6kMCH4HevBg0 QJZICJVFDAZcDJ+bDGgRLEf9ra7byCHf0xJpavDa0tGQzbCJ41HvLZBRe75gm23DF3vNEtrRcXh 1RGcDK4tSecPLWogN9JP5uhg+791eX4EO3JatzB3IMRdqoBRqvuaTH0PHhUfDcdhxF32Jo7hBvU O59D+1xqoZZXiuu0HNJvYeAj7uqXIMzrvyRcTLBsw+49l63f6CAoj9tQ6l7TE+poi3X54VfrrVo 50EIra7sk997D/cIaGfbrwA6DFvQfCCqDiufIl9ZIN43wPHH9I6Zbc9RhoWaiUaOZ4yZsFkrWoJ fs5cytgISNmqKCoPkcbYPTr5vNxwNc3YbNmO3dm9bWtiBVWof9hhTZWSwuPYIde2Gnhd3C9Fp3c 8miD0OTi7H6GIaYNv6++MWsbUn3bHavXZ2wKR7kw8Es65a6jPDAgFo2eKcfWYeLDPiP9LF0SPT3 U0dZAP3PMslLCNQ== X-Developer-Key: i=casey.connolly@linaro.org; a=openpgp; fpr=83B24DA7FE145076BC38BB250CD904EB673A7C47 I set a super conservative current limit since we lack many of the safety features (thermal monitoring, etc) that these drivers really need. However now we have a better understanding of the hardware, it's fine to bump this limit up a bit, devices can additionally set the max current via devicetree instead. Since this is common to smb2 and smb5, move this write out of the init sequence and into probe proper. Signed-off-by: Casey Connolly --- drivers/power/supply/qcom_smbx.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/drivers/power/supply/qcom_smbx.c b/drivers/power/supply/qcom_smbx.c index 7fc232fa7260a7422ac12a48686cd7d396edd9a4..d1607674d291d6ef5762d35acd3330e2116f41a3 100644 --- a/drivers/power/supply/qcom_smbx.c +++ b/drivers/power/supply/qcom_smbx.c @@ -875,16 +875,8 @@ static const struct smb_init_register smb_init_seq[] = { */ { .addr = PRE_CHARGE_CURRENT_CFG, .mask = PRE_CHARGE_CURRENT_SETTING_MASK, .val = 500000 / CURRENT_SCALE_FACTOR }, - /* - * This overrides all of the current limit options exposed to userspace - * and prevents the device from pulling more than ~1A. This is done - * to minimise potential fire hazard risks. - */ - { .addr = FAST_CHARGE_CURRENT_CFG, - .mask = FAST_CHARGE_CURRENT_SETTING_MASK, - .val = 1000000 / CURRENT_SCALE_FACTOR }, }; static int smb_init_hw(struct smb_chip *chip) { @@ -1029,8 +1021,22 @@ static int smb_probe(struct platform_device *pdev) return dev_err_probe(chip->dev, rc, "Couldn't set wake irq\n"); platform_set_drvdata(pdev, chip); + /* + * This overrides all of the other current limits and is expected + * to be used for setting limits based on temperature. We set some + * relatively safe default value while still allowing a comfortably + * fast charging rate. Once temperature monitoring is hooked up we + * would expect this to be changed dynamically based on temperature + * reporting. + */ + rc = regmap_write(chip->regmap, chip->base + FAST_CHARGE_CURRENT_CFG, + 1950000 / CURRENT_SCALE_FACTOR); + if (rc < 0) + return dev_err_probe(chip->dev, rc, + "Couldn't write fast charge current cfg"); + /* Initialise charger state */ schedule_delayed_work(&chip->status_change_work, 0); return 0; From patchwork Thu Jun 19 14:55:16 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Casey Connolly X-Patchwork-Id: 899119 Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 629DE28D8D0 for ; Thu, 19 Jun 2025 14:55:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750344933; cv=none; b=rWYpflYAP5vurluztzLQgb3bwJjHBBvpOQkxK29rVg5PrIxcnCDj5hhEUombY/M8RW9HlSNa186V253CRAZ5mrscc6XxXS4PZlEGd1QpsB1YKz0a2BFWOyANxbmDEhgqDTjm1wdmHTH2zyh1e7QLdBq2GDbFXE7ggMGg/ZQV7dI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750344933; c=relaxed/simple; bh=hfxv1DtZdlwRviIOgnak2gccDnkJhuul0zWJ5mSgHQI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=GUXFsxDnsg1JXh7Msj6A7j4w4itoPf4rbTG1VVVbLuyHytj10ka/BXYpSExqLnIJTgaQ4Bo0/D5DGRuSbjZGjOEcpgx1o2tKayDAI/zPs6h/WQi74M2WmT5SEM2sA2vuPfmTYMymGT+W3SvfN3/I0SLWTfKtUa8+FhbWadGHgdw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=IOUf57Mu; arc=none smtp.client-ip=209.85.221.49 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="IOUf57Mu" Received: by mail-wr1-f49.google.com with SMTP id ffacd0b85a97d-3a4fea34e07so470446f8f.1 for ; Thu, 19 Jun 2025 07:55:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1750344928; x=1750949728; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=h2x2H08jDXRaXR0Yr7xxE830BP4sQoxluaMapVfIpIs=; b=IOUf57MuLLkbTBdHh+DATkmjB7sMrl68nrL4Q8XlEaloRPyxQXQnGYNFxf67HTq+xx zbj9E5cVlRqMKhqVmJJNNuaRkvhT3s2A9Uodvhx+13aDxtFUjYXwe662hl05VCuH2LBk vCOHHsFeL336DPw+XRWRzqt8+rdkI7KUXqM+xSlWYvLIIdFsJBh4Bk19yW/LHNWZqEmT fv+TrFrTPzBXygBjvHTYrnneidlgb3hRVPxcg679RX1Z7tTNG/ksb/yPApiJ07WEMHok gghI7ltV0kIQ5pV7HcoM1X2M0BuXDLUFP+hVuBOGcgehyFDdPgtz0FJc5I12XM0CWHTz /g8w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750344928; x=1750949728; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=h2x2H08jDXRaXR0Yr7xxE830BP4sQoxluaMapVfIpIs=; b=Y/K7D1rXPAU9oJ4Spjw9Yp4q7ZAB4ww/96SYgB0TeQKQVnrtE6r/7+AJl7zfeYvlAZ Ti82Yb73q31Ib23HxO65J9p8Bt7hkwjM8kUxDkbU0JnJnfHCGuzwyPvtNPo8Mv4gMuxH YRXJoIhFxGUgt370utWGTJvsOCa/LD2WxZXyTf7S9hCtryTBuxjMl3IVVnTEWeJyklSh Q9efka9raXRtekvAXfDVlM1UW/KfNi3yw7O72XNkowKUDzHVkkpyImraJHAqmT8IYxP7 qSboYKquZruXtPX1vmTk5qi8kYe/ko/V5j4Yp46jRdpaKCbi6QfQoXlY124o2KJMc27x UzhA== X-Gm-Message-State: AOJu0YyIEPBrxWMGBpoPAjoDi3oyjc5wyYW4JPuPeB2nlLNM+UrlPt2V 4+iqpw/HrNkFyG3E20o+lxZXlOTb7CMYtol9ZeJaLUdeR9gM1q/y+rPMYz4FyTf5ZxU= X-Gm-Gg: ASbGnct8E+HgChXY03pr6NGczqM6vEwLMbepA8V853VCY59CeWJeTYNRAs4+atUJUjP SXfAGyQ2wFqucTgxr1rbe0HZjw5TQwezisH/yVjX++dJ2Rj6rZ6Ny6CMMANibX0Spp5hah8AKDi jVQvrcD37PGocvXnhp3mBUgNtjgqVA/BAPt02Yg5C5+8taWqfbR8roqhGRhOXCTABgLm51OcXae /nAKEs6R/NNJrKw84NPRY2tCeBegpblBWxItR6Wh6Igu6YpC6hcR2ZRY4xhpsebqDOM3yiuSzJA Td0e2qSoq45YCRK1qBgUeeYzgEkoEb5RwqBPQnXF5kd+P6gvRR2PExA6DnlnkhGUAJsytSox+jF eaDn2cM0cqqWgeT01m0LNpw== X-Google-Smtp-Source: AGHT+IG0Myiu1GtIhNeuFtAB8WQQ1lcfVyrvJFwgX2fNT6Rbat1lEOhnWuxbqqqsxLOWIwDEmETQhw== X-Received: by 2002:a05:6000:65b:b0:3a5:88e9:a543 with SMTP id ffacd0b85a97d-3a588e9ab75mr8835780f8f.58.1750344928183; Thu, 19 Jun 2025 07:55:28 -0700 (PDT) Received: from toyger.tail248178.ts.net ([2a0e:c5c1:0:100:b058:b8f5:b561:423c]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4535ebced8asm31343715e9.40.2025.06.19.07.55.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Jun 2025 07:55:27 -0700 (PDT) From: Casey Connolly Date: Thu, 19 Jun 2025 16:55:16 +0200 Subject: [PATCH 08/11] power: supply: qcom_smbx: remove unused registers Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250619-smb2-smb5-support-v1-8-ac5dec51b6e1@linaro.org> References: <20250619-smb2-smb5-support-v1-0-ac5dec51b6e1@linaro.org> In-Reply-To: <20250619-smb2-smb5-support-v1-0-ac5dec51b6e1@linaro.org> To: Sebastian Reichel , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Bjorn Andersson , Konrad Dybcio , Kees Cook , "Gustavo A. R. Silva" Cc: linux-arm-msm@vger.kernel.org, linux-pm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Sebastian Reichel , linux-hardening@vger.kernel.org, Casey Connolly X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=12313; i=casey.connolly@linaro.org; h=from:subject:message-id; bh=hfxv1DtZdlwRviIOgnak2gccDnkJhuul0zWJ5mSgHQI=; b=owEBbQKS/ZANAwAKAQWDMSsZX2S2AcsmYgBoVCTSkrP4staRfrVo6Lmof5bKK4TE5DAIiIpII PNaPKc6RiOJAjMEAAEKAB0WIQS2UaFGPGq+0GkMVc0FgzErGV9ktgUCaFQk0gAKCRAFgzErGV9k tsnjD/4uQm9oG6R8NCMu9BFl0L/iRCn21g/iNjbnnJNqzA+cCJ/56ZroylewWKVnP4PJ8Kk/HMz 7Pv3h22pucBcDw7H4I06JNy71pEkkY2L40oJy2+JVkm8al27IL8mR0NXhP2OCI9pS5qwerJr/AV Ya11eVP5MH7O4z3LZJKZVkvGRuYMCdatHGI314SlOOtUV8w6r0bR7XlLwgp/yNoYWRcECzRewAt g0IpbZrABtDzGIU2qpkjdylF3jv3cv+y0khWkd0QXD+peLgGFA51/Q6LnVxUI+Y4cQFBplmXFYu 52Hm8TWOi+TcGWRojs7+lItfb2DDxJ4xw8bf+Ga+l9HfTl6vQHJCiLyCH948oI7ayy9dP/fh9Yb J08m4a2VeO2YgnuEp8dSLiYhUIXoA2q2jGeE2RCKQpQ4e6w/GxIw3heztj408ITwqiC5hnuJbcV B9bv/fO37tx0ooWxJlxCGaMH7V7Ceklr05w83JNofgx3apL2VBXBqESzUSjprceOG0EHgi3lhEa 6KPmta5djWAe3eRAa7qLAXy0m4zzQ5JaYpQUTjUQ5F7XvhVnus2GIErKNDjOuDe+X/FvMKZ+rbl QGGG2kJZ1rOQPPnQHqclN9oA07f6nE0jTpoIgRXXU39EmB9MInf5A9faytx+9oz6myBbT2TDvjm GxK9XUDsfWxt7fw== X-Developer-Key: i=casey.connolly@linaro.org; a=openpgp; fpr=83B24DA7FE145076BC38BB250CD904EB673A7C47 Remove registers and bits that aren't used to make things a bit more readable. Signed-off-by: Casey Connolly --- drivers/power/supply/qcom_smbx.c | 211 +-------------------------------------- 1 file changed, 4 insertions(+), 207 deletions(-) diff --git a/drivers/power/supply/qcom_smbx.c b/drivers/power/supply/qcom_smbx.c index d1607674d291d6ef5762d35acd3330e2116f41a3..10ddd33a09599decb23c0f1ccd02fa9b56602543 100644 --- a/drivers/power/supply/qcom_smbx.c +++ b/drivers/power/supply/qcom_smbx.c @@ -24,39 +24,17 @@ #include /* clang-format off */ #define BATTERY_CHARGER_STATUS_1 0x06 -#define BVR_INITIAL_RAMP_BIT BIT(7) -#define CC_SOFT_TERMINATE_BIT BIT(6) -#define STEP_CHARGING_STATUS_SHIFT 3 -#define STEP_CHARGING_STATUS_MASK GENMASK(5, 3) #define BATTERY_CHARGER_STATUS_MASK GENMASK(2, 0) #define BATTERY_CHARGER_STATUS_2 0x07 -#define INPUT_CURRENT_LIMITED_BIT BIT(7) -#define CHARGER_ERROR_STATUS_SFT_EXPIRE_BIT BIT(6) #define CHARGER_ERROR_STATUS_BAT_OV_BIT BIT(5) -#define CHARGER_ERROR_STATUS_BAT_TERM_MISSING_BIT BIT(4) -#define BAT_TEMP_STATUS_MASK GENMASK(3, 0) -#define BAT_TEMP_STATUS_SOFT_LIMIT_MASK GENMASK(3, 2) #define BAT_TEMP_STATUS_HOT_SOFT_LIMIT_BIT BIT(3) #define BAT_TEMP_STATUS_COLD_SOFT_LIMIT_BIT BIT(2) #define BAT_TEMP_STATUS_TOO_HOT_BIT BIT(1) #define BAT_TEMP_STATUS_TOO_COLD_BIT BIT(0) -#define BATTERY_CHARGER_STATUS_4 0x0A -#define CHARGE_CURRENT_POST_JEITA_MASK GENMASK(7, 0) - -#define BATTERY_CHARGER_STATUS_7 0x0D -#define ENABLE_TRICKLE_BIT BIT(7) -#define ENABLE_PRE_CHARGING_BIT BIT(6) -#define ENABLE_FAST_CHARGING_BIT BIT(5) -#define ENABLE_FULLON_MODE_BIT BIT(4) -#define TOO_COLD_ADC_BIT BIT(3) -#define TOO_HOT_ADC_BIT BIT(2) -#define HOT_SL_ADC_BIT BIT(1) -#define COLD_SL_ADC_BIT BIT(0) - #define CHARGING_ENABLE_CMD 0x42 #define CHARGING_ENABLE_CMD_BIT BIT(0) #define CHGR_CFG2 0x51 @@ -78,270 +56,89 @@ #define FLOAT_VOLTAGE_CFG 0x70 #define FLOAT_VOLTAGE_SETTING_MASK GENMASK(7, 0) #define FG_UPDATE_CFG_2_SEL 0x7D -#define SOC_LT_OTG_THRESH_SEL_BIT BIT(3) #define SOC_LT_CHG_RECHARGE_THRESH_SEL_BIT BIT(2) #define VBT_LT_CHG_RECHARGE_THRESH_SEL_BIT BIT(1) -#define IBT_LT_CHG_TERM_THRESH_SEL_BIT BIT(0) - -#define JEITA_EN_CFG 0x90 -#define JEITA_EN_HARDLIMIT_BIT BIT(4) -#define JEITA_EN_HOT_SL_FCV_BIT BIT(3) -#define JEITA_EN_COLD_SL_FCV_BIT BIT(2) -#define JEITA_EN_HOT_SL_CCC_BIT BIT(1) -#define JEITA_EN_COLD_SL_CCC_BIT BIT(0) - -#define INT_RT_STS 0x310 -#define TYPE_C_CHANGE_RT_STS_BIT BIT(7) -#define USBIN_ICL_CHANGE_RT_STS_BIT BIT(6) -#define USBIN_SOURCE_CHANGE_RT_STS_BIT BIT(5) -#define USBIN_PLUGIN_RT_STS_BIT BIT(4) -#define USBIN_OV_RT_STS_BIT BIT(3) -#define USBIN_UV_RT_STS_BIT BIT(2) -#define USBIN_LT_3P6V_RT_STS_BIT BIT(1) -#define USBIN_COLLAPSE_RT_STS_BIT BIT(0) #define OTG_CFG 0x153 -#define OTG_RESERVED_MASK GENMASK(7, 6) -#define DIS_OTG_ON_TLIM_BIT BIT(5) -#define QUICKSTART_OTG_FASTROLESWAP_BIT BIT(4) -#define INCREASE_DFP_TIME_BIT BIT(3) -#define ENABLE_OTG_IN_DEBUG_MODE_BIT BIT(2) #define OTG_EN_SRC_CFG_BIT BIT(1) -#define CONCURRENT_MODE_CFG_BIT BIT(0) - -#define OTG_ENG_OTG_CFG 0x1C0 -#define ENG_BUCKBOOST_HALT1_8_MODE_BIT BIT(0) #define APSD_STATUS 0x307 -#define APSD_STATUS_7_BIT BIT(7) -#define HVDCP_CHECK_TIMEOUT_BIT BIT(6) -#define SLOW_PLUGIN_TIMEOUT_BIT BIT(5) -#define ENUMERATION_DONE_BIT BIT(4) -#define VADP_CHANGE_DONE_AFTER_AUTH_BIT BIT(3) -#define QC_AUTH_DONE_STATUS_BIT BIT(2) -#define QC_CHARGER_BIT BIT(1) #define APSD_DTC_STATUS_DONE_BIT BIT(0) #define APSD_RESULT_STATUS 0x308 -#define ICL_OVERRIDE_LATCH_BIT BIT(7) #define APSD_RESULT_STATUS_MASK GENMASK(6, 0) -#define QC_3P0_BIT BIT(6) -#define QC_2P0_BIT BIT(5) #define FLOAT_CHARGER_BIT BIT(4) #define DCP_CHARGER_BIT BIT(3) #define CDP_CHARGER_BIT BIT(2) #define OCP_CHARGER_BIT BIT(1) #define SDP_CHARGER_BIT BIT(0) -#define TYPE_C_STATUS_1 0x30B -#define UFP_TYPEC_MASK GENMASK(7, 5) -#define UFP_TYPEC_RDSTD_BIT BIT(7) -#define UFP_TYPEC_RD1P5_BIT BIT(6) -#define UFP_TYPEC_RD3P0_BIT BIT(5) -#define UFP_TYPEC_FMB_255K_BIT BIT(4) -#define UFP_TYPEC_FMB_301K_BIT BIT(3) -#define UFP_TYPEC_FMB_523K_BIT BIT(2) -#define UFP_TYPEC_FMB_619K_BIT BIT(1) -#define UFP_TYPEC_OPEN_OPEN_BIT BIT(0) - -#define TYPE_C_STATUS_2 0x30C -#define DFP_RA_OPEN_BIT BIT(7) -#define TIMER_STAGE_BIT BIT(6) -#define EXIT_UFP_MODE_BIT BIT(5) -#define EXIT_DFP_MODE_BIT BIT(4) -#define DFP_TYPEC_MASK GENMASK(3, 0) -#define DFP_RD_OPEN_BIT BIT(3) -#define DFP_RD_RA_VCONN_BIT BIT(2) -#define DFP_RD_RD_BIT BIT(1) -#define DFP_RA_RA_BIT BIT(0) - -#define TYPE_C_STATUS_3 0x30D -#define ENABLE_BANDGAP_BIT BIT(7) -#define U_USB_GND_NOVBUS_BIT BIT(6) -#define U_USB_FLOAT_NOVBUS_BIT BIT(5) -#define U_USB_GND_BIT BIT(4) -#define U_USB_FMB1_BIT BIT(3) -#define U_USB_FLOAT1_BIT BIT(2) -#define U_USB_FMB2_BIT BIT(1) -#define U_USB_FLOAT2_BIT BIT(0) - -#define TYPE_C_STATUS_4 0x30E -#define UFP_DFP_MODE_STATUS_BIT BIT(7) -#define TYPEC_VBUS_STATUS_BIT BIT(6) -#define TYPEC_VBUS_ERROR_STATUS_BIT BIT(5) -#define TYPEC_DEBOUNCE_DONE_STATUS_BIT BIT(4) -#define TYPEC_UFP_AUDIO_ADAPT_STATUS_BIT BIT(3) -#define TYPEC_VCONN_OVERCURR_STATUS_BIT BIT(2) -#define CC_ORIENTATION_BIT BIT(1) -#define CC_ATTACHED_BIT BIT(0) - -#define TYPE_C_STATUS_5 0x30F -#define TRY_SOURCE_FAILED_BIT BIT(6) -#define TRY_SINK_FAILED_BIT BIT(5) -#define TIMER_STAGE_2_BIT BIT(4) -#define TYPEC_LEGACY_CABLE_STATUS_BIT BIT(3) -#define TYPEC_NONCOMP_LEGACY_CABLE_STATUS_BIT BIT(2) -#define TYPEC_TRYSOURCE_DETECT_STATUS_BIT BIT(1) -#define TYPEC_TRYSINK_DETECT_STATUS_BIT BIT(0) - #define CMD_APSD 0x341 -#define ICL_OVERRIDE_BIT BIT(1) #define APSD_RERUN_BIT BIT(0) #define TYPE_C_CFG 0x358 -#define APSD_START_ON_CC_BIT BIT(7) -#define WAIT_FOR_APSD_BIT BIT(6) #define FACTORY_MODE_DETECTION_EN_BIT BIT(5) -#define FACTORY_MODE_ICL_3A_4A_BIT BIT(4) -#define FACTORY_MODE_DIS_CHGING_CFG_BIT BIT(3) -#define SUSPEND_NON_COMPLIANT_CFG_BIT BIT(2) #define VCONN_OC_CFG_BIT BIT(1) -#define TYPE_C_OR_U_USB_BIT BIT(0) - -#define TYPE_C_CFG_2 0x359 -#define TYPE_C_DFP_CURRSRC_MODE_BIT BIT(7) -#define DFP_CC_1P4V_OR_1P6V_BIT BIT(6) -#define VCONN_SOFTSTART_CFG_MASK GENMASK(5, 4) -#define EN_TRY_SOURCE_MODE_BIT BIT(3) -#define USB_FACTORY_MODE_ENABLE_BIT BIT(2) -#define TYPE_C_UFP_MODE_BIT BIT(1) -#define EN_80UA_180UA_CUR_SOURCE_BIT BIT(0) - -#define TYPE_C_CFG_3 0x35A -#define TVBUS_DEBOUNCE_BIT BIT(7) -#define TYPEC_LEGACY_CABLE_INT_EN_BIT BIT(6) -#define TYPEC_NONCOMPLIANT_LEGACY_CABLE_INT_EN_B BIT(5) -#define TYPEC_TRYSOURCE_DETECT_INT_EN_BIT BIT(4) -#define TYPEC_TRYSINK_DETECT_INT_EN_BIT BIT(3) -#define EN_TRYSINK_MODE_BIT BIT(2) -#define EN_LEGACY_CABLE_DETECTION_BIT BIT(1) -#define ALLOW_PD_DRING_UFP_TCCDB_BIT BIT(0) #define USBIN_OPTIONS_1_CFG 0x362 -#define CABLE_R_SEL_BIT BIT(7) -#define HVDCP_AUTH_ALG_EN_CFG_BIT BIT(6) -#define HVDCP_AUTONOMOUS_MODE_EN_CFG_BIT BIT(5) -#define INPUT_PRIORITY_BIT BIT(4) -#define AUTO_SRC_DETECT_BIT BIT(3) #define HVDCP_EN_BIT BIT(2) -#define VADP_INCREMENT_VOLTAGE_LIMIT_BIT BIT(1) -#define VADP_TAPER_TIMER_EN_BIT BIT(0) - -#define USBIN_OPTIONS_2_CFG 0x363 -#define WIPWR_RST_EUD_CFG_BIT BIT(7) -#define SWITCHER_START_CFG_BIT BIT(6) -#define DCD_TIMEOUT_SEL_BIT BIT(5) -#define OCD_CURRENT_SEL_BIT BIT(4) -#define SLOW_PLUGIN_TIMER_EN_CFG_BIT BIT(3) -#define FLOAT_OPTIONS_MASK GENMASK(2, 0) -#define FLOAT_DIS_CHGING_CFG_BIT BIT(2) -#define SUSPEND_FLOAT_CFG_BIT BIT(1) -#define FORCE_FLOAT_SDP_CFG_BIT BIT(0) - -#define TAPER_TIMER_SEL_CFG 0x364 -#define TYPEC_SPARE_CFG_BIT BIT(7) -#define TYPEC_DRP_DFP_TIME_CFG_BIT BIT(5) -#define TAPER_TIMER_SEL_MASK GENMASK(1, 0) - -#define USBIN_LOAD_CFG 0x365 -#define USBIN_OV_CH_LOAD_OPTION_BIT BIT(7) -#define ICL_OVERRIDE_AFTER_APSD_BIT BIT(4) #define USBIN_ICL_OPTIONS 0x366 -#define CFG_USB3P0_SEL_BIT BIT(2) #define USB51_MODE_BIT BIT(1) #define USBIN_MODE_CHG_BIT BIT(0) +/* PMI8998 only */ #define TYPE_C_INTRPT_ENB_SOFTWARE_CTRL 0x368 -#define EXIT_SNK_BASED_ON_CC_BIT BIT(7) -#define VCONN_EN_ORIENTATION_BIT BIT(6) -#define TYPEC_VCONN_OVERCURR_INT_EN_BIT BIT(5) #define VCONN_EN_SRC_BIT BIT(4) #define VCONN_EN_VALUE_BIT BIT(3) #define TYPEC_POWER_ROLE_CMD_MASK GENMASK(2, 0) #define UFP_EN_CMD_BIT BIT(2) #define DFP_EN_CMD_BIT BIT(1) #define TYPEC_DISABLE_CMD_BIT BIT(0) #define USBIN_CURRENT_LIMIT_CFG 0x370 -#define USBIN_CURRENT_LIMIT_MASK GENMASK(7, 0) #define USBIN_AICL_OPTIONS_CFG 0x380 #define SUSPEND_ON_COLLAPSE_USBIN_BIT BIT(7) -#define USBIN_AICL_HDC_EN_BIT BIT(6) #define USBIN_AICL_START_AT_MAX_BIT BIT(5) -#define USBIN_AICL_RERUN_EN_BIT BIT(4) #define USBIN_AICL_ADC_EN_BIT BIT(3) #define USBIN_AICL_EN_BIT BIT(2) #define USBIN_HV_COLLAPSE_RESPONSE_BIT BIT(1) #define USBIN_LV_COLLAPSE_RESPONSE_BIT BIT(0) +// FIXME: drop these and their programming, no need to set min to 4.3v #define USBIN_5V_AICL_THRESHOLD_CFG 0x381 #define USBIN_5V_AICL_THRESHOLD_CFG_MASK GENMASK(2, 0) #define USBIN_CONT_AICL_THRESHOLD_CFG 0x384 #define USBIN_CONT_AICL_THRESHOLD_CFG_MASK GENMASK(5, 0) -#define DC_ENG_SSUPPLY_CFG2 0x4C1 -#define ENG_SSUPPLY_IVREF_OTG_SS_MASK GENMASK(2, 0) -#define OTG_SS_SLOW 0x3 - -#define DCIN_AICL_REF_SEL_CFG 0x481 -#define DCIN_CONT_AICL_THRESHOLD_CFG_MASK GENMASK(5, 0) - -#define WI_PWR_OPTIONS 0x495 -#define CHG_OK_BIT BIT(7) -#define WIPWR_UVLO_IRQ_OPT_BIT BIT(6) -#define BUCK_HOLDOFF_ENABLE_BIT BIT(5) -#define CHG_OK_HW_SW_SELECT_BIT BIT(4) -#define WIPWR_RST_ENABLE_BIT BIT(3) -#define DCIN_WIPWR_IRQ_SELECT_BIT BIT(2) -#define AICL_SWITCH_ENABLE_BIT BIT(1) -#define ZIN_ICL_ENABLE_BIT BIT(0) - #define ICL_STATUS 0x607 #define INPUT_CURRENT_LIMIT_MASK GENMASK(7, 0) #define POWER_PATH_STATUS 0x60B -#define P_PATH_INPUT_SS_DONE_BIT BIT(7) -#define P_PATH_USBIN_SUSPEND_STS_BIT BIT(6) -#define P_PATH_DCIN_SUSPEND_STS_BIT BIT(5) #define P_PATH_USE_USBIN_BIT BIT(4) -#define P_PATH_USE_DCIN_BIT BIT(3) -#define P_PATH_POWER_PATH_MASK GENMASK(2, 1) #define P_PATH_VALID_INPUT_POWER_SOURCE_STS_BIT BIT(0) #define BARK_BITE_WDOG_PET 0x643 #define BARK_BITE_WDOG_PET_BIT BIT(0) #define WD_CFG 0x651 #define WATCHDOG_TRIGGER_AFP_EN_BIT BIT(7) #define BARK_WDOG_INT_EN_BIT BIT(6) -#define BITE_WDOG_INT_EN_BIT BIT(5) -#define SFT_AFTER_WDOG_IRQ_MASK GENMASK(4, 3) -#define WDOG_IRQ_SFT_BIT BIT(2) #define WDOG_TIMER_EN_ON_PLUGIN_BIT BIT(1) -#define WDOG_TIMER_EN_BIT BIT(0) #define SNARL_BARK_BITE_WD_CFG 0x653 -#define BITE_WDOG_DISABLE_CHARGING_CFG_BIT BIT(7) -#define SNARL_WDOG_TIMEOUT_MASK GENMASK(6, 4) -#define BARK_WDOG_TIMEOUT_MASK GENMASK(3, 2) -#define BITE_WDOG_TIMEOUT_MASK GENMASK(1, 0) #define AICL_RERUN_TIME_CFG 0x661 #define AICL_RERUN_TIME_MASK GENMASK(1, 0) +#define AIC_RERUN_TIME_3_SECS 0x0 +/* FIXME: probably remove this so we get parallel charging? */ #define STAT_CFG 0x690 -#define STAT_SW_OVERRIDE_VALUE_BIT BIT(7) #define STAT_SW_OVERRIDE_CFG_BIT BIT(6) -#define STAT_PARALLEL_OFF_DG_CFG_MASK GENMASK(5, 4) -#define STAT_POLARITY_CFG_BIT BIT(3) -#define STAT_PARALLEL_CFG_BIT BIT(2) -#define STAT_FUNCTION_CFG_BIT BIT(1) -#define STAT_IRQ_PULSING_EN_BIT BIT(0) #define SDP_CURRENT_UA 500000 #define CDP_CURRENT_UA 1500000 #define DCP_CURRENT_UA 1500000 From patchwork Thu Jun 19 14:55:17 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Casey Connolly X-Patchwork-Id: 898037 Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 59D4528DB5C for ; Thu, 19 Jun 2025 14:55:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750344935; cv=none; b=KFc1EF7xrYs9WHhulTh2OwfNVFhxLqKhOU7Xemicragz3zk34sTuJjgMolZ9zdolHw7ilDilC4jfljfiBLDyqYCG3L8iKH4Ar9K8RCkgHV9TkMOhPp1X+ztc2AiKwDY0vauGuSkWpdvpoqw708rGs3qNqPwRw/53OSC6vZPiPdM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750344935; c=relaxed/simple; bh=Gh059vN04/yomWRamYHsFmOtOA8wZ9W9B2hhFqlEEeo=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=SgGmeJIRublGOtfGm26EGYF9DjwRaAviFZsLfe3tS+15dUYyFp3wEytNO3vRrqAqNjSg0MOA/msdcYWmEHM7CXKgBPFnkLpXPWahBNPDy7BDzSjUv49JhinrSZVlIwuhC7mIfGXa5jVjR8xcZb9P0XGBJDNqBa1zhpIuo+c5Fp0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=yQ4rIDwL; arc=none smtp.client-ip=209.85.128.51 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="yQ4rIDwL" Received: by mail-wm1-f51.google.com with SMTP id 5b1f17b1804b1-450cf0120cdso7231775e9.2 for ; Thu, 19 Jun 2025 07:55:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1750344930; x=1750949730; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=kPcmXvkL7pHBOkknQ/9IxvWMgzVk5GGr/MOGB3cvxGA=; b=yQ4rIDwLOcc2kCj3iXnV7qqxhZAecIE1L29o1erMJT7TKW5v7v8bnQGB1ogCzmJkSj SxDMVHZbj5ooSjfKcd7sRkxJm1qHSpx82V2pmI/RSRiBPQwmV4d1g65jdQ2p3AqYBc+J G2o/yfcK6av2M407z3jM89reQu9qon09CouEgrwyCoDkuV0nwfhZ4+i1JNA46Ui3ri/O PIY/a9ihXDTxPq+L5k8ZENAyhA3C6eKEzIEKLknJVd1OlrEOswbw2kCntIvv3uzse49t CZnb6Fb1ko/v23N4wSchHhRYOTTfBqJYlgk1lrzYcjJhF92DrBmZJ6KK++Cw23yvTbGB 2nfw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750344930; x=1750949730; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=kPcmXvkL7pHBOkknQ/9IxvWMgzVk5GGr/MOGB3cvxGA=; b=b9I2EM9s2YrsYT5D+fyvmwk/0V9ChfEvpElrSsoEUQrMNx2/j/H5YMdocdb83wplhf u5Vw9xTD+izgv0fkuO2HxeiVV3btPRma8PcGz/6oBX65ca6f3vtSHAZDkTGaonWD53bZ RLllfsBh9hmC3w0T5INOVnLW2YqRaJoMzA21A8d3Jfl+JHNfJMmGphEcYAzyPjD6LFc7 yqClaF7Pzc3MUsgEFh8ElZqfstztRQNYNoPArSrr63w68Qo8vj+bnhmFXb6qcNtHViya Hkb3w+qy1NVrE06BqVVASQwAztw6B3B/ynIQZZWThi6FVxKbkWDTR5dbn5NNpRbzs6rY DBKg== X-Gm-Message-State: AOJu0Ywcm72RXiY3vqJNHiZnNNGCpnLHB/4gh9dLO7VVcjMUgEH0NvFk E9dz9nk1qgKpiIEBLmBat6Hr4Q2VIMymM7Z4bNaUa08TixbWcGQRLKnwHnrQQYb0rww= X-Gm-Gg: ASbGncsQnLyi+pIHMrvf6VBFv66T4N4nqBAOu0juFovyKGfKQebW2Q4tS2msamAwpkq 4uANgQ9Vkwh1HAs2frA/+1C77YmRFekbTQr0ecJPH2aUlL/88wGe6Tz+nHtB8J2goTg9E8Tzmtp cpFOL6Iuh5GIHpvpuiYJXfl1Rw/1v3zW1Rbvdl2NZw4X3IaEa+nQq3TENfiuI6Ybbb2FYWrTDxv 8h+akGL8PyAygqj6aVLR62WP01gc3RV19afgEsKlhbcUeA4Hw51mMKh1cHEmEIxeMtoEzuoaUPN Y1HSmvsDp6V9P1nhy6koTLkmeeaj0VsrRGIFgE60Ksqt8Alqb2DdDrEwcuANY6HMgI0cCgSP1Z2 3EnRiK4fZ1xY= X-Google-Smtp-Source: AGHT+IE2ObqWoDCMO8WviqKvQwMgcBj5iUuOl3ZkQ4kc42xVydoPY8Y2WHctsPtlsRAhnSDQeaAz2A== X-Received: by 2002:a05:600c:1d06:b0:450:c20d:64c3 with SMTP id 5b1f17b1804b1-4533caad17fmr212544145e9.18.1750344929495; Thu, 19 Jun 2025 07:55:29 -0700 (PDT) Received: from toyger.tail248178.ts.net ([2a0e:c5c1:0:100:b058:b8f5:b561:423c]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4535ebced8asm31343715e9.40.2025.06.19.07.55.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Jun 2025 07:55:28 -0700 (PDT) From: Casey Connolly Date: Thu, 19 Jun 2025 16:55:17 +0200 Subject: [PATCH 09/11] power: supply: qcom_smbx: add smb5 support Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250619-smb2-smb5-support-v1-9-ac5dec51b6e1@linaro.org> References: <20250619-smb2-smb5-support-v1-0-ac5dec51b6e1@linaro.org> In-Reply-To: <20250619-smb2-smb5-support-v1-0-ac5dec51b6e1@linaro.org> To: Sebastian Reichel , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Bjorn Andersson , Konrad Dybcio , Kees Cook , "Gustavo A. R. Silva" Cc: linux-arm-msm@vger.kernel.org, linux-pm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Sebastian Reichel , linux-hardening@vger.kernel.org, Casey Connolly X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=21861; i=casey.connolly@linaro.org; h=from:subject:message-id; bh=Gh059vN04/yomWRamYHsFmOtOA8wZ9W9B2hhFqlEEeo=; b=owEBbQKS/ZANAwAKAQWDMSsZX2S2AcsmYgBoVCTSw0XXqPOjoSVAlw5euwE4kdZqsabuq12Kh GTDtshaV+yJAjMEAAEKAB0WIQS2UaFGPGq+0GkMVc0FgzErGV9ktgUCaFQk0gAKCRAFgzErGV9k tq+oEACNihkZDBZL+qvvHgDjmHHest6ymBW89XRVMVtHZE56OGjjlKeQI88rHfUH6//Pryg2lav lPaH0yVV7EK+9WcH6fCdP8O9ZkDcDNdXL4b5LF+fWnbi5JxPbgRXcDV++b4LO4AgWGLrkN6M5w+ PjdhVluOnbPBLOTtzqYprCysQHuw3FYxFrMJYp7AnyDlkLxzgPWSRKL5runwoBoQI25IbEyVjCX N0LZ+1lPjcpMu6PbcwWc4JNJGltbLEzGnH4WViKKPzv5oT95iF00MWVwxu/VoXu3WV9je1Frxi6 AAvsNgug5svuidKfuPqZ9y7yub/8bzAb/80UG+NKc7CceUcwGJGJOQQM323HQNcrXJrvstYjXfX CMc4P/6HIFFMb6HtJFYUW82j+dKJ+1U5OqBgxSv7j+rgdJA2RgAfNFsvawVffMGY6a041N0RZJK mePkQKJAjPAGqEi0PGjTi/P2HdURUBqOGbhSGFxm4JJg+Mxo+nyfu2VwtUX9WoaFBAnTv54if7T xZGO5/WHEaP6qiUi5u7NA5cE0hr41xvYYvF12Bgvr8R4Yg34m5LVPDFG8R53tRN8mDi1qFPWXdU MAdkb9JxLZOsQ/sCx9c9UCocaYRS+nT5aPuhtH2k52dPZRgNIut6HnAeHjDGW+XWDV02etqvDGT ZV9f6v5iwTHVHkQ== X-Developer-Key: i=casey.connolly@linaro.org; a=openpgp; fpr=83B24DA7FE145076BC38BB250CD904EB673A7C47 Introduce support for the SMB5 charger found on pm8150b and other more modern Qualcomm SoCs. SMB5 is largely similar to SMB2, with a few register differences. The main difference is the new Type-C hardware block which some registers are moved to. Signed-off-by: Casey Connolly --- drivers/power/supply/qcom_smbx.c | 367 +++++++++++++++++++++++++++++++++------ 1 file changed, 314 insertions(+), 53 deletions(-) diff --git a/drivers/power/supply/qcom_smbx.c b/drivers/power/supply/qcom_smbx.c index 10ddd33a09599decb23c0f1ccd02fa9b56602543..d902f3f43548191d3d0310ce90e699918ed0f16f 100644 --- a/drivers/power/supply/qcom_smbx.c +++ b/drivers/power/supply/qcom_smbx.c @@ -22,18 +22,32 @@ #include #include #include +enum smb_generation { + SMB2, + SMB5, +}; + +#define SMB_REG_OFFSET(smb) (smb->gen == SMB2 ? 0x600 : 0x100) + /* clang-format off */ #define BATTERY_CHARGER_STATUS_1 0x06 #define BATTERY_CHARGER_STATUS_MASK GENMASK(2, 0) #define BATTERY_CHARGER_STATUS_2 0x07 -#define CHARGER_ERROR_STATUS_BAT_OV_BIT BIT(5) -#define BAT_TEMP_STATUS_HOT_SOFT_LIMIT_BIT BIT(3) -#define BAT_TEMP_STATUS_COLD_SOFT_LIMIT_BIT BIT(2) -#define BAT_TEMP_STATUS_TOO_HOT_BIT BIT(1) -#define BAT_TEMP_STATUS_TOO_COLD_BIT BIT(0) +#define SMB2_CHARGER_ERROR_STATUS_BAT_OV_BIT BIT(5) +#define SMB2_BAT_TEMP_STATUS_HOT_SOFT_LIMIT_BIT BIT(3) +#define SMB2_BAT_TEMP_STATUS_COLD_SOFT_LIMIT_BIT BIT(2) +#define SMB2_BAT_TEMP_STATUS_TOO_HOT_BIT BIT(1) +#define SMB5_CHARGER_ERROR_STATUS_BAT_OV_BIT BIT(1) +#define SMB2_BAT_TEMP_STATUS_TOO_COLD_BIT BIT(0) + +#define BATTERY_CHARGER_STATUS_7 0x0D +#define SMB5_BAT_TEMP_STATUS_HOT_SOFT_BIT BIT(5) +#define SMB5_BAT_TEMP_STATUS_COLD_SOFT_BIT BIT(4) +#define SMB5_BAT_TEMP_STATUS_TOO_HOT_BIT BIT(3) +#define SMB5_BAT_TEMP_STATUS_TOO_COLD_BIT BIT(2) #define CHARGING_ENABLE_CMD 0x42 #define CHARGING_ENABLE_CMD_BIT BIT(0) @@ -55,11 +69,14 @@ #define FLOAT_VOLTAGE_CFG 0x70 #define FLOAT_VOLTAGE_SETTING_MASK GENMASK(7, 0) -#define FG_UPDATE_CFG_2_SEL 0x7D -#define SOC_LT_CHG_RECHARGE_THRESH_SEL_BIT BIT(2) -#define VBT_LT_CHG_RECHARGE_THRESH_SEL_BIT BIT(1) +#define SMB2_FG_UPDATE_CFG_2_SEL 0x7D +#define SMB2_SOC_LT_CHG_RECHARGE_THRESH_SEL_BIT BIT(2) +#define SMB2_VBT_LT_CHG_RECHARGE_THRESH_SEL_BIT BIT(1) + +#define SMB5_CHARGE_RCHG_SOC_THRESHOLD_CFG_REG 0x7D +#define SMB5_CHARGE_RCHG_SOC_THRESHOLD_CFG_MASK GENMASK(7, 0) #define OTG_CFG 0x153 #define OTG_EN_SRC_CFG_BIT BIT(1) @@ -73,36 +90,46 @@ #define CDP_CHARGER_BIT BIT(2) #define OCP_CHARGER_BIT BIT(1) #define SDP_CHARGER_BIT BIT(0) +#define USBIN_CMD_IL 0x340 +#define USBIN_SUSPEND_BIT BIT(0) + #define CMD_APSD 0x341 #define APSD_RERUN_BIT BIT(0) +#define CMD_ICL_OVERRIDE 0x342 +#define ICL_OVERRIDE_BIT BIT(0) + #define TYPE_C_CFG 0x358 +#define APSD_START_ON_CC_BIT BIT(7) #define FACTORY_MODE_DETECTION_EN_BIT BIT(5) #define VCONN_OC_CFG_BIT BIT(1) #define USBIN_OPTIONS_1_CFG 0x362 +#define AUTO_SRC_DETECT_BIT BIT(3) #define HVDCP_EN_BIT BIT(2) +#define USBIN_LOAD_CFG 0x65 +#define ICL_OVERRIDE_AFTER_APSD_BIT BIT(4) + #define USBIN_ICL_OPTIONS 0x366 #define USB51_MODE_BIT BIT(1) #define USBIN_MODE_CHG_BIT BIT(0) /* PMI8998 only */ #define TYPE_C_INTRPT_ENB_SOFTWARE_CTRL 0x368 -#define VCONN_EN_SRC_BIT BIT(4) +#define SMB2_VCONN_EN_SRC_BIT BIT(4) #define VCONN_EN_VALUE_BIT BIT(3) #define TYPEC_POWER_ROLE_CMD_MASK GENMASK(2, 0) -#define UFP_EN_CMD_BIT BIT(2) -#define DFP_EN_CMD_BIT BIT(1) -#define TYPEC_DISABLE_CMD_BIT BIT(0) +#define SMB5_EN_SNK_ONLY_BIT BIT(1) #define USBIN_CURRENT_LIMIT_CFG 0x370 #define USBIN_AICL_OPTIONS_CFG 0x380 #define SUSPEND_ON_COLLAPSE_USBIN_BIT BIT(7) #define USBIN_AICL_START_AT_MAX_BIT BIT(5) +#define USBIN_AICL_PERIODIC_RERUN_EN_BIT BIT(4) #define USBIN_AICL_ADC_EN_BIT BIT(3) #define USBIN_AICL_EN_BIT BIT(2) #define USBIN_HV_COLLAPSE_RESPONSE_BIT BIT(1) #define USBIN_LV_COLLAPSE_RESPONSE_BIT BIT(0) @@ -113,15 +140,41 @@ #define USBIN_CONT_AICL_THRESHOLD_CFG 0x384 #define USBIN_CONT_AICL_THRESHOLD_CFG_MASK GENMASK(5, 0) -#define ICL_STATUS 0x607 +#define ICL_STATUS(smb) (SMB_REG_OFFSET(smb) + 0x07) #define INPUT_CURRENT_LIMIT_MASK GENMASK(7, 0) -#define POWER_PATH_STATUS 0x60B +#define POWER_PATH_STATUS(smb) (SMB_REG_OFFSET(smb) + 0x0B) #define P_PATH_USE_USBIN_BIT BIT(4) #define P_PATH_VALID_INPUT_POWER_SOURCE_STS_BIT BIT(0) +/* 0x5xx region is PM8150b only Type-C registers */ + +/* Bits 2:0 match PMI8998 TYPE_C_INTRPT_ENB_SOFTWARE_CTRL */ +#define SMB5_TYPE_C_MODE_CFG 0x544 +#define SMB5_EN_TRY_SNK_BIT BIT(4) +#define SMB5_EN_SNK_ONLY_BIT BIT(1) + +#define SMB5_TYPEC_TYPE_C_VCONN_CONTROL 0x546 +#define SMB5_VCONN_EN_ORIENTATION_BIT BIT(2) +#define SMB5_VCONN_EN_VALUE_BIT BIT(1) +#define SMB5_VCONN_EN_SRC_BIT BIT(0) + + +#define SMB5_TYPE_C_DEBUG_ACCESS_SINK 0x54a +#define SMB5_TYPEC_DEBUG_ACCESS_SINK_MASK GENMASK(4, 0) + +#define SMB5_DEBUG_ACCESS_SRC_CFG 0x54C +#define SMB5_EN_UNORIENTED_DEBUG_ACCESS_SRC_BIT BIT(0) + +#define SMB5_TYPE_C_EXIT_STATE_CFG 0x550 +#define SMB5_BYPASS_VSAFE0V_DURING_ROLE_SWAP_BIT BIT(3) +#define SMB5_SEL_SRC_UPPER_REF_BIT BIT(2) +#define SMB5_EXIT_SNK_BASED_ON_CC_BIT BIT(0) + +/* Common */ + #define BARK_BITE_WDOG_PET 0x643 #define BARK_BITE_WDOG_PET_BIT BIT(0) #define WD_CFG 0x651 @@ -184,8 +237,9 @@ struct smb_chip { const char *name; unsigned int base; struct regmap *regmap; struct power_supply_battery_info *batt_info; + enum smb_generation gen; struct delayed_work status_change_work; int cable_irq; bool wakeup_enabled; @@ -195,8 +249,15 @@ struct smb_chip { struct power_supply *chg_psy; }; +struct smb_match_data { + const char *name; + enum smb_generation gen; + size_t init_seq_len; + const struct smb_init_register __counted_by(init_seq_len) *init_seq; +}; + static enum power_supply_property smb_properties[] = { POWER_SUPPLY_PROP_MANUFACTURER, POWER_SUPPLY_PROP_MODEL_NAME, POWER_SUPPLY_PROP_CURRENT_MAX, @@ -212,9 +273,9 @@ static int smb_get_prop_usb_online(struct smb_chip *chip, int *val) { unsigned int stat; int rc; - rc = regmap_read(chip->regmap, chip->base + POWER_PATH_STATUS, &stat); + rc = regmap_read(chip->regmap, chip->base + POWER_PATH_STATUS(chip), &stat); if (rc < 0) { dev_err(chip->dev, "Couldn't read power path status: %d\n", rc); return rc; } @@ -267,11 +328,37 @@ static int smb_apsd_get_charger_type(struct smb_chip *chip, int *val) return 0; } +/* Return 1 when in overvoltage state, else 0 or -errno */ +static int smbx_ov_status(struct smb_chip *chip) +{ + u16 reg; + u8 mask; + int rc; + u32 val; + + switch (chip->gen) { + case SMB2: + reg = BATTERY_CHARGER_STATUS_2; + mask = SMB2_CHARGER_ERROR_STATUS_BAT_OV_BIT; + break; + case SMB5: + reg = BATTERY_CHARGER_STATUS_7; + mask = SMB5_CHARGER_ERROR_STATUS_BAT_OV_BIT; + break; + } + + rc = regmap_read(chip->regmap, chip->base + reg, &val); + if (rc) + return rc; + + return !!(reg & mask); +} + static int smb_get_prop_status(struct smb_chip *chip, int *val) { - unsigned char stat[2]; + u32 stat; int usb_online = 0; int rc; rc = smb_get_prop_usb_online(chip, &usb_online); @@ -279,24 +366,29 @@ static int smb_get_prop_status(struct smb_chip *chip, int *val) *val = POWER_SUPPLY_STATUS_DISCHARGING; return rc; } - rc = regmap_bulk_read(chip->regmap, - chip->base + BATTERY_CHARGER_STATUS_1, &stat, 2); + rc = regmap_read(chip->regmap, + chip->base + BATTERY_CHARGER_STATUS_1, &stat); if (rc < 0) { dev_err(chip->dev, "Failed to read charging status ret=%d\n", rc); return rc; } - if (stat[1] & CHARGER_ERROR_STATUS_BAT_OV_BIT) { + rc = smbx_ov_status(chip); + if (rc < 0) + return rc; + + /* In overvoltage state */ + if (rc == 1) { *val = POWER_SUPPLY_STATUS_NOT_CHARGING; return 0; } - stat[0] = stat[0] & BATTERY_CHARGER_STATUS_MASK; + stat = stat & BATTERY_CHARGER_STATUS_MASK; - switch (stat[0]) { + switch (stat) { case TRICKLE_CHARGE: case PRE_CHARGE: case FAST_CHARGE: case FULLON_CHARGE: @@ -318,9 +410,9 @@ static int smb_get_prop_status(struct smb_chip *chip, int *val) static inline int smb_get_current_limit(struct smb_chip *chip, unsigned int *val) { - int rc = regmap_read(chip->regmap, chip->base + ICL_STATUS, val); + int rc = regmap_read(chip->regmap, chip->base + ICL_STATUS(chip), val); if (rc >= 0) *val *= CURRENT_SCALE_FACTOR; return rc; @@ -413,9 +505,46 @@ static int smb_get_iio_chan(struct smb_chip *chip, struct iio_channel *chan, return iio_read_channel_processed(chan, val); } -static int smb_get_prop_health(struct smb_chip *chip, int *val) +static int smb5_get_prop_health(struct smb_chip *chip, int *val) +{ + int rc; + unsigned int stat; + + rc = smbx_ov_status(chip); + + /* Treat any error as if we are in the overvoltage state */ + if (rc < 0) + dev_err(chip->dev, "Couldn't determine overvoltage status!"); + if (rc) { + dev_err(chip->dev, "battery over-voltage"); + *val = POWER_SUPPLY_HEALTH_OVERVOLTAGE; + return 0; + } + + rc = regmap_read(chip->regmap, chip->base + BATTERY_CHARGER_STATUS_7, + &stat); + if (rc < 0) { + dev_err(chip->dev, "Couldn't read charger status 7 rc=%d\n", rc); + return rc; + } + + if (stat & SMB5_BAT_TEMP_STATUS_TOO_COLD_BIT) + *val = POWER_SUPPLY_HEALTH_COLD; + else if (stat & SMB5_BAT_TEMP_STATUS_TOO_HOT_BIT) + *val = POWER_SUPPLY_HEALTH_OVERHEAT; + else if (stat & SMB5_BAT_TEMP_STATUS_COLD_SOFT_BIT) + *val = POWER_SUPPLY_HEALTH_COOL; + else if (stat & SMB5_BAT_TEMP_STATUS_HOT_SOFT_BIT) + *val = POWER_SUPPLY_HEALTH_WARM; + else + *val = POWER_SUPPLY_HEALTH_GOOD; + + return 0; +} + +static int smb2_get_prop_health(struct smb_chip *chip, int *val) { int rc; unsigned int stat; @@ -426,34 +555,45 @@ static int smb_get_prop_health(struct smb_chip *chip, int *val) return rc; } switch (stat) { - case CHARGER_ERROR_STATUS_BAT_OV_BIT: + case SMB2_CHARGER_ERROR_STATUS_BAT_OV_BIT: *val = POWER_SUPPLY_HEALTH_OVERVOLTAGE; return 0; - case BAT_TEMP_STATUS_TOO_COLD_BIT: + case SMB2_BAT_TEMP_STATUS_TOO_COLD_BIT: *val = POWER_SUPPLY_HEALTH_COLD; return 0; - case BAT_TEMP_STATUS_TOO_HOT_BIT: + case SMB2_BAT_TEMP_STATUS_TOO_HOT_BIT: *val = POWER_SUPPLY_HEALTH_OVERHEAT; return 0; - case BAT_TEMP_STATUS_COLD_SOFT_LIMIT_BIT: + case SMB2_BAT_TEMP_STATUS_COLD_SOFT_LIMIT_BIT: *val = POWER_SUPPLY_HEALTH_COOL; return 0; - case BAT_TEMP_STATUS_HOT_SOFT_LIMIT_BIT: + case SMB2_BAT_TEMP_STATUS_HOT_SOFT_LIMIT_BIT: *val = POWER_SUPPLY_HEALTH_WARM; return 0; default: *val = POWER_SUPPLY_HEALTH_GOOD; return 0; } } +static int smb_get_prop_health(struct smb_chip *chip, int *val) +{ + switch (chip->gen) { + case SMB2: + return smb2_get_prop_health(chip, val); + case SMB5: + return smb5_get_prop_health(chip, val); + } +} + static int smb_get_property(struct power_supply *psy, enum power_supply_property psp, union power_supply_propval *val) { struct smb_chip *chip = power_supply_get_drvdata(psy); + int ret; switch (psp) { case POWER_SUPPLY_PROP_MANUFACTURER: val->strval = "Qualcomm"; @@ -466,10 +606,15 @@ static int smb_get_property(struct power_supply *psy, case POWER_SUPPLY_PROP_CURRENT_NOW: return smb_get_iio_chan(chip, chip->usb_in_i_chan, &val->intval); case POWER_SUPPLY_PROP_VOLTAGE_NOW: - return smb_get_iio_chan(chip, chip->usb_in_v_chan, + ret = smb_get_iio_chan(chip, chip->usb_in_v_chan, &val->intval); + if (!ret) { + if (chip->gen == SMB5) + val->intval *= 16; + } + return ret; case POWER_SUPPLY_PROP_ONLINE: return smb_get_prop_usb_online(chip, &val->intval); case POWER_SUPPLY_PROP_STATUS: return smb_get_prop_status(chip, &val->intval); @@ -515,14 +660,10 @@ static int smb_property_is_writable(struct power_supply *psy, static irqreturn_t smb_handle_batt_overvoltage(int irq, void *data) { struct smb_chip *chip = data; - unsigned int status; - regmap_read(chip->regmap, chip->base + BATTERY_CHARGER_STATUS_2, - &status); - - if (status & CHARGER_ERROR_STATUS_BAT_OV_BIT) { + if (smbx_ov_status(chip) == 1) { /* The hardware stops charging automatically */ dev_err(chip->dev, "battery overvoltage detected\n"); power_supply_changed(chip->chg_psy); } @@ -566,9 +707,9 @@ static irqreturn_t smb_handle_wdog_bark(int irq, void *data) return IRQ_HANDLED; } static const struct power_supply_desc smb_psy_desc = { - .name = "pmi8998_charger", + .name = "SMB2_charger", .type = POWER_SUPPLY_TYPE_USB, .usb_types = BIT(POWER_SUPPLY_USB_TYPE_SDP) | BIT(POWER_SUPPLY_USB_TYPE_CDP) | BIT(POWER_SUPPLY_USB_TYPE_DCP) | @@ -580,18 +721,100 @@ static const struct power_supply_desc smb_psy_desc = { .property_is_writeable = smb_property_is_writable, }; /* Init sequence derived from vendor downstream driver */ -static const struct smb_init_register smb_init_seq[] = { - { .addr = AICL_RERUN_TIME_CFG, .mask = AICL_RERUN_TIME_MASK, .val = 0 }, +static const struct smb_init_register smb5_init_seq[] = { + { .addr = USBIN_CMD_IL, .mask = USBIN_SUSPEND_BIT, .val = 0 }, + /* + * By default configure us as an upstream facing port + * FIXME: This will be handled by the type-c driver + */ + { .addr = SMB5_TYPE_C_MODE_CFG, + .mask = SMB5_EN_TRY_SNK_BIT | SMB5_EN_SNK_ONLY_BIT, + .val = SMB5_EN_TRY_SNK_BIT }, + { .addr = SMB5_TYPEC_TYPE_C_VCONN_CONTROL, + .mask = SMB5_VCONN_EN_ORIENTATION_BIT | SMB5_VCONN_EN_SRC_BIT | + SMB5_VCONN_EN_VALUE_BIT, + .val = SMB2_VCONN_EN_SRC_BIT }, + { .addr = SMB5_DEBUG_ACCESS_SRC_CFG, + .mask = SMB5_EN_UNORIENTED_DEBUG_ACCESS_SRC_BIT, + .val = SMB5_EN_UNORIENTED_DEBUG_ACCESS_SRC_BIT }, + { .addr = SMB5_TYPE_C_EXIT_STATE_CFG, + .mask = SMB5_SEL_SRC_UPPER_REF_BIT, + .val = SMB5_SEL_SRC_UPPER_REF_BIT }, + /* + * Disable Type-C factory mode and stay in Attached.SRC state when VCONN + * over-current happens + */ + { .addr = TYPE_C_CFG, + .mask = APSD_START_ON_CC_BIT, + .val = 0 }, + { .addr = SMB5_TYPE_C_DEBUG_ACCESS_SINK, + .mask = SMB5_TYPEC_DEBUG_ACCESS_SINK_MASK, + .val = 0x17 }, + /* Configure VBUS for software control */ + { .addr = OTG_CFG, .mask = OTG_EN_SRC_CFG_BIT, .val = 0 }, + /* + * Recharge when State Of Charge drops below 98%. + */ + { .addr = SMB5_CHARGE_RCHG_SOC_THRESHOLD_CFG_REG, + .mask = SMB5_CHARGE_RCHG_SOC_THRESHOLD_CFG_MASK, + .val = 250 }, + /* Enable charging */ + { .addr = CHARGING_ENABLE_CMD, + .mask = CHARGING_ENABLE_CMD_BIT, + .val = CHARGING_ENABLE_CMD_BIT }, + /* Enable BC1P2 auto Src detect */ + { .addr = USBIN_OPTIONS_1_CFG, + .mask = AUTO_SRC_DETECT_BIT, + .val = AUTO_SRC_DETECT_BIT }, + /* Set the default SDP charger type to a 500ma USB 2.0 port */ + { .addr = USBIN_ICL_OPTIONS, + .mask = USBIN_MODE_CHG_BIT, + .val = USBIN_MODE_CHG_BIT }, + { .addr = CMD_ICL_OVERRIDE, + .mask = ICL_OVERRIDE_BIT, + .val = 0 }, + { .addr = USBIN_LOAD_CFG, + .mask = ICL_OVERRIDE_AFTER_APSD_BIT, + .val = 0 }, + /* Disable watchdog */ + { .addr = SNARL_BARK_BITE_WD_CFG, .mask = 0xff, .val = 0 }, + { .addr = WD_CFG, + .mask = WATCHDOG_TRIGGER_AFP_EN_BIT | WDOG_TIMER_EN_ON_PLUGIN_BIT | + BARK_WDOG_INT_EN_BIT, + .val = 0 }, + /* + * Enable Automatic Input Current Limit, this will slowly ramp up the current + * When connected to a wall charger, and automatically stop when it detects + * the charger current limit (voltage drop?) or it reaches the programmed limit. + */ + { .addr = USBIN_AICL_OPTIONS_CFG, + .mask = USBIN_AICL_PERIODIC_RERUN_EN_BIT | USBIN_AICL_ADC_EN_BIT + | USBIN_AICL_EN_BIT | SUSPEND_ON_COLLAPSE_USBIN_BIT, + .val = USBIN_AICL_PERIODIC_RERUN_EN_BIT | USBIN_AICL_ADC_EN_BIT + | USBIN_AICL_EN_BIT | SUSPEND_ON_COLLAPSE_USBIN_BIT }, + /* + * This overrides all of the other current limit configs and is + * expected to be used for setting limits based on temperature. + * We set some relatively safe default value while still allowing + * a comfortably fast charging rate. + */ + { .addr = FAST_CHARGE_CURRENT_CFG, + .mask = FAST_CHARGE_CURRENT_SETTING_MASK, + .val = 1950000 / CURRENT_SCALE_FACTOR }, +}; + +/* Init sequence derived from vendor downstream driver */ +static const struct smb_init_register smb2_init_seq[] = { /* * By default configure us as an upstream facing port * FIXME: This will be handled by the type-c driver */ { .addr = TYPE_C_INTRPT_ENB_SOFTWARE_CTRL, - .mask = TYPEC_POWER_ROLE_CMD_MASK | VCONN_EN_SRC_BIT | + .mask = TYPEC_POWER_ROLE_CMD_MASK | SMB2_VCONN_EN_SRC_BIT | VCONN_EN_VALUE_BIT, - .val = VCONN_EN_SRC_BIT }, + .val = SMB2_VCONN_EN_SRC_BIT }, /* * Disable Type-C factory mode and stay in Attached.SRC state when VCONN * over-current happens */ @@ -603,12 +826,12 @@ static const struct smb_init_register smb_init_seq[] = { /* * Use VBAT to determine the recharge threshold when battery is full * rather than the state of charge. */ - { .addr = FG_UPDATE_CFG_2_SEL, - .mask = SOC_LT_CHG_RECHARGE_THRESH_SEL_BIT | - VBT_LT_CHG_RECHARGE_THRESH_SEL_BIT, - .val = VBT_LT_CHG_RECHARGE_THRESH_SEL_BIT }, + { .addr = SMB2_FG_UPDATE_CFG_2_SEL, + .mask = SMB2_SOC_LT_CHG_RECHARGE_THRESH_SEL_BIT | + SMB2_VBT_LT_CHG_RECHARGE_THRESH_SEL_BIT, + .val = SMB2_VBT_LT_CHG_RECHARGE_THRESH_SEL_BIT }, /* Enable charging */ { .addr = USBIN_OPTIONS_1_CFG, .mask = HVDCP_EN_BIT, .val = 0 }, { .addr = CHARGING_ENABLE_CMD, .mask = CHARGING_ENABLE_CMD_BIT, @@ -674,19 +897,48 @@ static const struct smb_init_register smb_init_seq[] = { .mask = PRE_CHARGE_CURRENT_SETTING_MASK, .val = 500000 / CURRENT_SCALE_FACTOR }, }; -static int smb_init_hw(struct smb_chip *chip) +struct smb_match_data pmi8998_match_data = { + .init_seq = smb2_init_seq, + .init_seq_len = ARRAY_SIZE(smb2_init_seq), + .name = "pmi8998", + .gen = SMB2, +}; + +struct smb_match_data pm660_match_data = { + .init_seq = smb2_init_seq, + .init_seq_len = ARRAY_SIZE(smb2_init_seq), + .name = "pm660", + .gen = SMB2, +}; + +struct smb_match_data pm8150b_match_data = { + .init_seq = smb5_init_seq, + .init_seq_len = ARRAY_SIZE(smb5_init_seq), + .name = "pm8150b", + .gen = SMB5, +}; + +struct smb_match_data pm7250b_match_data = { + .init_seq = smb5_init_seq, + .init_seq_len = ARRAY_SIZE(smb5_init_seq), + .name = "pm7250b", + .gen = SMB5, +}; + + +static int smb_init_hw(struct smb_chip *chip, const struct smb_init_register *init_seq, size_t len) { int rc, i; - for (i = 0; i < ARRAY_SIZE(smb_init_seq); i++) { + for (i = 0; i < len; i++) { dev_dbg(chip->dev, "%d: Writing 0x%02x to 0x%02x\n", i, - smb_init_seq[i].val, smb_init_seq[i].addr); + init_seq[i].val, init_seq[i].addr); rc = regmap_update_bits(chip->regmap, - chip->base + smb_init_seq[i].addr, - smb_init_seq[i].mask, - smb_init_seq[i].val); + chip->base + init_seq[i].addr, + init_seq[i].mask, + init_seq[i].val); if (rc < 0) return dev_err_probe(chip->dev, rc, "%s: init command %d failed\n", __func__, i); @@ -721,8 +973,9 @@ static int smb_probe(struct platform_device *pdev) { struct power_supply_config supply_config = {}; struct power_supply_desc *desc; struct smb_chip *chip; + const struct smb_match_data *match_data; int rc, irq; chip = devm_kzalloc(&pdev->dev, sizeof(*chip), GFP_KERNEL); if (!chip) @@ -751,9 +1004,15 @@ static int smb_probe(struct platform_device *pdev) return dev_err_probe(chip->dev, PTR_ERR(chip->usb_in_i_chan), "Couldn't get usbin_i IIO channel\n"); } - rc = smb_init_hw(chip); + match_data = (const struct smb_match_data *)device_get_match_data(chip->dev); + + chip->gen = match_data->gen; + + dev_info(chip->dev, "Generation %s\n", chip->gen == SMB2 ? "SMB2" : "SMB5"); + + rc = smb_init_hw(chip, match_data->init_seq, match_data->init_seq_len); if (rc < 0) return rc; supply_config.drv_data = chip; @@ -764,9 +1023,9 @@ static int smb_probe(struct platform_device *pdev) return -ENOMEM; memcpy(desc, &smb_psy_desc, sizeof(smb_psy_desc)); desc->name = devm_kasprintf(chip->dev, GFP_KERNEL, "%s-charger", - (const char *)device_get_match_data(chip->dev)); + match_data->name); if (!desc->name) return -ENOMEM; chip->chg_psy = @@ -839,10 +1098,12 @@ static int smb_probe(struct platform_device *pdev) return 0; } static const struct of_device_id smb_match_id_table[] = { - { .compatible = "qcom,pmi8998-charger", .data = "pmi8998" }, - { .compatible = "qcom,pm660-charger", .data = "pm660" }, + { .compatible = "qcom,pmi8998-charger", .data = &pmi8998_match_data }, + { .compatible = "qcom,pm660-charger", .data = &pm660_match_data }, + { .compatible = "qcom,pm7250b-charger", .data = &pm7250b_match_data }, + { .compatible = "qcom,pm8150b-charger", .data = &pm8150b_match_data }, { /* sentinal */ } }; MODULE_DEVICE_TABLE(of, smb_match_id_table); From patchwork Thu Jun 19 14:55:18 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Casey Connolly X-Patchwork-Id: 899118 Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 80CAB28DF27 for ; Thu, 19 Jun 2025 14:55:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.46 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750344935; cv=none; b=KEO7aj3u9Uavv+ERpH1JnnWv8Dyhjmgq2Fyt6b4mERuuLPzu/Be40h+IImuqCfiyQ2PP6SBhqbfuO9xEeyalqdNqVm6Fpc8P7ivMD+/3p/xr3WLCEuPIfIAjJbSk5nIw+PTTtbQwuxN7v4FLDvOmGzZL69Z0SklvgIK11kPo9DA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750344935; c=relaxed/simple; bh=iDLIU8cKqvcbXUMIYZ0LyAHF4U27oo4VJDAhYAedWfo=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=E9IjrCn8QxKy1pK34hKmsT8EadpLh+zs7KXIVRBIiqtxL4J2m5GiVLC/OTD6Ul3sP7BLerrTMwdufzGaNDStssca7nBfSp6U/l38kpAjUlpH+3Cq/29C6w3NCP3eFnuSkPKsE/UVg7zs8nmsjapIp7mLm12CpTWN/WZU0W/SN7Y= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=XjycNjfh; arc=none smtp.client-ip=209.85.128.46 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="XjycNjfh" Received: by mail-wm1-f46.google.com with SMTP id 5b1f17b1804b1-450ce671a08so5631175e9.3 for ; Thu, 19 Jun 2025 07:55:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1750344931; x=1750949731; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=e9GucHfZPCayxh1y8Bqgadbm6OXspkCQUE4SSbOEVnA=; b=XjycNjfhOvt2kNBpm+RHazbZfv9Q0LvHUmDtRIhyaXZo8JODRgLZYD4WjBzsVuktxH TS/+a0im5wzY7CpSzvFxl9jkg2kSJ48xrgWVRAFIyFSfqA8dBthJvQcb4tk6ofaaz4EO fdyrPALL2DbpZwmDiFHYUHlCas3WS9AA7ydMwWSLxspaTge4ikOdZYDnWzl3traVaidE 1ZbXx6y5AnS/nqES6y+seHadVm09zhhjBeld1mGIGD83vXQAisFrDlXhmEwegFjZn9lr 89b0dng7Ll88OzkYn5YnZ01TX0OMc/HeQ+MGuKUSS123cmLrcu95S98qbF48UDcrRP8w m8cw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750344931; x=1750949731; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=e9GucHfZPCayxh1y8Bqgadbm6OXspkCQUE4SSbOEVnA=; b=e4CO9TClV3a6kQ8/OgcK6kOljnY0HcZO1GDELBmV2pKwaLIGMGZoG5PTb1J0z2qOZs mjBaAuHzWt6ri54jT4LlCmUkyH6zutuRwW0c/5qIDR+LKbrrahWyZ4TdsCYFIM9UkyuJ xMauUVPiChDORvOzyKI+ItRKpUPizqU6t2QhXtdPDwBw18sZJhLN+ag3JncaZ153l1EC R2AI1RsS5BtEo2DkGzLuALo89jlwMScZqKhHaiflfTw3jG4SeIURrEquZ+bI+2iTCEv1 gOdnMgg7gVaFeAot5YcEk0ka+tBnSuuaisn0suNoOWaz/c2RMS50BC0CV6NJJIEFr1iC vZvg== X-Gm-Message-State: AOJu0YxQNzxvB1j8O7juQd0DMjV0Dy9GPtSlI80QaT26fHkvDJaEAF8d ida2VHsXiU536FtgvRF1tGmQABVoVpqFf9JFARkX3R+dxakkXxsVqEcnLDDEtqJx/A8= X-Gm-Gg: ASbGncvKeFXW0tJFVQBeiAiQyapuNou9wqmBdsPm0MFw4MebmKy7siBa99aHaw3WDTg 54eeI9jQLCMbYpWtd+A6Dz7orusdUV139sHubt+jGYWG4zGRX8KTW1KyY/AyQp5O964Qeppx/ym UVyJwofBqCvJGhzt4hMngKoLizwKxP9Up2QiDYT9OKx/PWWa3H1XgffcXzGzqVKqbnDh5J7Fup2 i0hL/EEwo/bqhmkvkabrEd8ZhwK9YL3RNmFOFfsQ53RoNvD0x0Zl84C8iiVsgjaGqvi4dnE+Ht0 trjJVD1bGXqdWlRisyMm2DFe4q3dauMCg0G5IUqWe73+/04d1GHuWKVM5U4SJkqtPj2QNtVpqho VdobQkeJEIAVmZYtmFUw54g== X-Google-Smtp-Source: AGHT+IGGobIpKkCLpRzDl1QxoCvpwI+jTHKHBg4d9lnILMNs8XoDrDP97vfxlViyNKxyIg5xdhuMjw== X-Received: by 2002:a05:600c:5025:b0:43e:afca:808f with SMTP id 5b1f17b1804b1-4533cb5ddabmr223699075e9.31.1750344930711; Thu, 19 Jun 2025 07:55:30 -0700 (PDT) Received: from toyger.tail248178.ts.net ([2a0e:c5c1:0:100:b058:b8f5:b561:423c]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4535ebced8asm31343715e9.40.2025.06.19.07.55.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Jun 2025 07:55:30 -0700 (PDT) From: Casey Connolly Date: Thu, 19 Jun 2025 16:55:18 +0200 Subject: [PATCH 10/11] MAINTAINERS: add myself as smbx charger driver maintainer Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250619-smb2-smb5-support-v1-10-ac5dec51b6e1@linaro.org> References: <20250619-smb2-smb5-support-v1-0-ac5dec51b6e1@linaro.org> In-Reply-To: <20250619-smb2-smb5-support-v1-0-ac5dec51b6e1@linaro.org> To: Sebastian Reichel , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Bjorn Andersson , Konrad Dybcio , Kees Cook , "Gustavo A. R. Silva" Cc: linux-arm-msm@vger.kernel.org, linux-pm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Sebastian Reichel , linux-hardening@vger.kernel.org, Casey Connolly X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=971; i=casey.connolly@linaro.org; h=from:subject:message-id; bh=iDLIU8cKqvcbXUMIYZ0LyAHF4U27oo4VJDAhYAedWfo=; b=owEBbQKS/ZANAwAKAQWDMSsZX2S2AcsmYgBoVCTSU5Fs57qbeZWVqSoR+0UKygRpv6l1Ryj9+ AffIy9CL9KJAjMEAAEKAB0WIQS2UaFGPGq+0GkMVc0FgzErGV9ktgUCaFQk0gAKCRAFgzErGV9k tu2VD/0bwY7vbtIlaRWJOFEsK2l1vGsoZuolMH38cKaAlU+IG2W1Fyq7WlUOc2DUn81OGrnksUG yr9FjFGovg0DW/ycFt2vSbP6LA7yLbYPanceKT5Plpoj04RZjUbpHkwBACBHVFFo9N9Hy6S+gpd g4Srrq5bUjcAKOiSoJO/XIDkoxNV3rdRsJHgBwcoAlMfjoLbGM/soOrqLKhoz/JQqGJUxLsxVL+ 5xU/dSpdXppIkgbzQ6Bjifldq+0v1l7ScdXUTo2Buew2c8zf5nVBkeniJnZ3F6zWXwnaMfBfNBb Bq0SYmvymuQeXCYEKqfIUzC+Y0XbTK04cjjeTDwswET04SL2LwBOsmOX0EBIYhum1QjaF6QiGVm QJYn35ZyzKMTDoZCO/V6huqhrp8h6t9UGwVfk+YJlJp1NQgH+4sAXTaFqRQzuaUAMsN+wv3GJqV kpwMVH4S21qj41ZgWQrHd+QM7Xk4I61d5mXkZt6afscFVFax4lCIRnjUWcn9NbVlACvCJ6fVsLT Iwgamw41FbjE6dCtXHRuYKEcssWNZ0trX+cZZhkQyFi9pdyXHMmXQwMKIXDW6IjCsS3ry8F3Qvr 61LmxgvrbQC5+ViIxKJcQzemtaZisZlI0/HzjEaCGTpCYdTVBmDtMGhV6RSh18t5bE0Dc3D2Ttx c1Wm6jRS/gyDmfg== X-Developer-Key: i=casey.connolly@linaro.org; a=openpgp; fpr=83B24DA7FE145076BC38BB250CD904EB673A7C47 Missed when this originally went upstream, add myself to the MAINTAINERS file for this driver. Signed-off-by: Casey Connolly --- MAINTAINERS | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index c2b570ed5f2f28341a3bcb7b699cbb250ffa2a88..a32e53d89c29cacf6e456258c4c7c0206cf8abf2 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -20565,8 +20565,15 @@ L: linux-arm-msm@vger.kernel.org S: Maintained F: Documentation/devicetree/bindings/mtd/qcom,nandc.yaml F: drivers/mtd/nand/raw/qcom_nandc.c +QUALCOMM SMB2 CHARGER DRIVER +M: Casey Connolly +L: linux-arm-msm@vger.kernel.org +S: Maintained +F: Documentation/devicetree/bindings/power/supply/qcom,pmi8998-charger.yaml +F: drivers/power/supply/qcom_smbx_charger.c + QUALCOMM QSEECOM DRIVER M: Maximilian Luz L: linux-arm-msm@vger.kernel.org S: Maintained From patchwork Thu Jun 19 14:55:19 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Casey Connolly X-Patchwork-Id: 898036 Received: from mail-wm1-f44.google.com (mail-wm1-f44.google.com [209.85.128.44]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A9E3B246760 for ; Thu, 19 Jun 2025 14:55:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750344937; cv=none; b=gHJivRnMN4kK+RYbZ9vZ//ptXMS2eYdR12tCWUWqVLYZf4Npf/sA8lj+dp7lG6hQEnizXVc0G0CiO92bqOL9f17kzZwoE+WC5zOqlES4Uc5fd+AJVBOXF4JT0cAZJxeHzn8gEvAoUNVWMnRo9IrELMMGXeaRDv4WW4qaMEohdEE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750344937; c=relaxed/simple; bh=YP0zt4hpy/+QohBC/5B6cnpj8boqADRBumXOjSIf4CU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=ZP9f4+stM4EYu5Qi0ObYHavvPp3z6pqMfncdfsEFXe+VXhyJzlVBCU2+QmAAUNsNTI862lLaQWx6vhB9JSM5zcp7el8CsGbhT3tR1CZkEZS0zYFlZCPCPJKyzboVbGXLIyVzpEClxt2CK5i7SOTVuHUm8XUYfzsPjfraBl1lccw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=rlHJ+7f5; arc=none smtp.client-ip=209.85.128.44 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="rlHJ+7f5" Received: by mail-wm1-f44.google.com with SMTP id 5b1f17b1804b1-450d668c2a1so13256665e9.0 for ; Thu, 19 Jun 2025 07:55:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1750344932; x=1750949732; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=dBJGB2IFTRq6tKiBkTAUGMtzlXPxtbC3+kWone/1CwQ=; b=rlHJ+7f5KSTeauWalJ2t90BaHdHKQAgq/lrvN1OtMXUkzgzfXBj0twZqp1ydbVPvXK 6jt7L93h9gr5Py+g1wh+n6BUzSgbwL0xWxLEthvSb/J05W77sN0/I6sTWlGKm1GIIayS jjCvfW+0N4k2ejoAPCKmyLwgyUJ40SFf2DPvBapzubjeExQPSSZN6Z49ceM470QryrAj FoD6as8ZoCLX5KOxEE4TtXE7gk+tg0O6TfvIbR7cG/SrkwyqdEnV3EBFOEipZU3InFzB 2cEcEydeBfTY2gm4tnc/QE3U140ZikfTrRkp4pPgI8F1SMHRLpjj6D/WQOJAvA9+WNw6 n32w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750344932; x=1750949732; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=dBJGB2IFTRq6tKiBkTAUGMtzlXPxtbC3+kWone/1CwQ=; b=gAsgE/oT+LcMwM4JDXIec3x+2P9M7mgYtDmUnOEejqQqSY01mFwicoNI1W3EDScsdG zy/GQ7usD8gO7VCQfLhFO9XTCwwxPLDfqc3kqe4ELH8PFNUVLlPfG9u0cxlJUaU2/6CZ 7Udiwuv5f9K1jsNo6YL0Ri3oQINoTH620Z5Ez/gHdmFj6s9xqOHkJ5xpw1rXmsZKS6Pm p1zI9nYMmatW7nY0wDAlz60LDyZg1jV84dilF+kH5lRKV9O3m8AKKPsR2IzA9CsJihn+ FfSuAjK3kkcA1khsMQGOdf1sw0PVHFTWcmGaQgk2jTE2UC5FwYRGCrP4DRSIt2mLLHgb 9ldA== X-Gm-Message-State: AOJu0YxYPIE6sRpe6byFGaVfc9MxK1iK4VHT44WB8dPcc/XmUci774+/ uADYhvHLm60DEuxIur8nNCAv5VQcnLxY746/7qJbGEZllM3M6QqPqmGu9X1EBVlKZqU= X-Gm-Gg: ASbGncuBpsTUObf5xuqxUUSdrHM3YGk23iAmg/iziNUi87pmv5L/evOs2lwQF5qJtab Yg+wFXfZJUbOaz81kshago8BMFIokHS2HqHvCu4+HXeNrcGMhU2YqwvKZH2BTAO3AyMC7NS+r0s vYPWza9mSfE+xrkCnmqv0efkvMqKc8U1WbjXnqpiETH4rGtjt+bBsk0nNL3Sex6jcen0jz2CC77 bJo4+b65ffNfCjF6nGyahWqnAsmp7z4r2xPDjn8EMPTnnrM7FD5JUiPrvEgt7mwzkl5rSJaFWqE YUR4NnVhf7xNg8fQi2iebGptHbfy+/d50kQv7Hi0aSCK8COT0z1QiYbqqFgJJByF7BxQRA6hqAD kTD6wICs5c/0= X-Google-Smtp-Source: AGHT+IEpgGoxp+M5mGhGo5r5ZpYgsM8+xMnfypnt8FDho/UvFufoTJ42LhVuCalDv5DlLjJTI36G7A== X-Received: by 2002:a05:600c:1c0e:b0:450:d79d:3b16 with SMTP id 5b1f17b1804b1-4536039db67mr27292135e9.14.1750344931932; Thu, 19 Jun 2025 07:55:31 -0700 (PDT) Received: from toyger.tail248178.ts.net ([2a0e:c5c1:0:100:b058:b8f5:b561:423c]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4535ebced8asm31343715e9.40.2025.06.19.07.55.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Jun 2025 07:55:31 -0700 (PDT) From: Casey Connolly Date: Thu, 19 Jun 2025 16:55:19 +0200 Subject: [PATCH 11/11] power: supply: qcom_smbx: program aicl rerun time Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250619-smb2-smb5-support-v1-11-ac5dec51b6e1@linaro.org> References: <20250619-smb2-smb5-support-v1-0-ac5dec51b6e1@linaro.org> In-Reply-To: <20250619-smb2-smb5-support-v1-0-ac5dec51b6e1@linaro.org> To: Sebastian Reichel , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Bjorn Andersson , Konrad Dybcio , Kees Cook , "Gustavo A. R. Silva" Cc: linux-arm-msm@vger.kernel.org, linux-pm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Sebastian Reichel , linux-hardening@vger.kernel.org, Casey Connolly X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1175; i=casey.connolly@linaro.org; h=from:subject:message-id; bh=YP0zt4hpy/+QohBC/5B6cnpj8boqADRBumXOjSIf4CU=; b=owEBbQKS/ZANAwAKAQWDMSsZX2S2AcsmYgBoVCTSy356L9shN5c24CVtxUhXn7Isx/OY3glPA Njrh6FHrbiJAjMEAAEKAB0WIQS2UaFGPGq+0GkMVc0FgzErGV9ktgUCaFQk0gAKCRAFgzErGV9k ths1D/416VKScj4SMjUY0dv9PE8DXWzElEj6lwhr74bkfBMEyXyWErzFcn7p+c26A0xyw4LPSli cCXOvIZdoQrrxI8PDRNaZ73fzrRNgtDuzLxwCrfXcQRiCH9SO0ieiIRI+5fPXHdEaoEI5Ann9Dx CLlkOlVjDNm66reyGz6UwnEC/tcjTxQotB8YSymDjsECxum0T7XNMlUFVz1vfyrC/nDNhqbhOGj X8fZPAw5aYA3X6f3CmXSvRPNU/7x6RDVwnGTEpJxwn7mPxFq8cb2nTOje1WHK1m7fQN9E5xrAOn LkpPn2Eipam0XOjMbZi2nBaFevKkBndswNwCzPAl+WvGwN410CGlFlMkKFDU/SYnfnzeeeOTImP SOr96Q7my98Y7z0I2muRuO8uRZXiELIXPDSLowsQpo+sbZJecbb2Enn3MJjcxDetCJqW/+kZs64 djtXTLk8GI5HiMUeg68zIT47TZqBTOxvcnvvkKiRfDGuRaXPLrAdqLuX+/1MG3BE/xunB9bQBfo j7qcLS7tknMx7AKLUS1PxopW3jBf7no8aur/cdd12ZDXXoGkdEETI7oNC5v+lRE9KCGXi4xlWpU Altxv4gCDNJCGnPAZUvq6yRsaE9lb2NXIWSrS4MsBjFA6P8Bxvk6awFpy24FFDhGe+Dyai0qcBD e0wbf419TZNGD7A== X-Developer-Key: i=casey.connolly@linaro.org; a=openpgp; fpr=83B24DA7FE145076BC38BB250CD904EB673A7C47 We don't know what the bootloader programmed here, but we want to have a consistent value. Program the automatic input current limit detection to re-run every 3 seconds. This seems to be necessary at least for smb5. Signed-off-by: Casey Connolly --- drivers/power/supply/qcom_smbx.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/power/supply/qcom_smbx.c b/drivers/power/supply/qcom_smbx.c index d902f3f43548191d3d0310ce90e699918ed0f16f..b723dba5b86daefb238ee6aae19b1b7e5236fce3 100644 --- a/drivers/power/supply/qcom_smbx.c +++ b/drivers/power/supply/qcom_smbx.c @@ -1091,8 +1091,14 @@ static int smb_probe(struct platform_device *pdev) if (rc < 0) return dev_err_probe(chip->dev, rc, "Couldn't write fast charge current cfg"); + rc = regmap_write_bits(chip->regmap, chip->base + AICL_RERUN_TIME_CFG, + AICL_RERUN_TIME_MASK, AIC_RERUN_TIME_3_SECS); + if (rc < 0) + return dev_err_probe(chip->dev, rc, + "Couldn't write fast AICL rerun time"); + /* Initialise charger state */ schedule_delayed_work(&chip->status_change_work, 0); return 0;