From patchwork Wed Oct 30 21:30:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dzmitry Sankouski X-Patchwork-Id: 839754 Received: from mail-ej1-f51.google.com (mail-ej1-f51.google.com [209.85.218.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 135FA1CF287; Wed, 30 Oct 2024 21:30:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730323854; cv=none; b=f664JVhIVfScJ/vzZ80ikkROtYvxp1mYzEI2E3gEguZcaVyaF01hpEE7izGs45Q3X21r8gGqRBzcvP3BuBumBGcWFW1M+Iz68SIP+704jbn9l9qokaa4UwGLeHt4Q49xkfqde0+fiOW26fQTKkf4lNFTX7Q0T0NIJr10JuVITBI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730323854; c=relaxed/simple; bh=9UW1cvl5fc/o0lPUsMCSThR3Opb7ot8+tEk54fve0oI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=ni/aha+dVG+/sZ+ww/hYBGvb4it0zngCcciB5Kv3OMauovMzP/wejpZBgF/uNSSwdPmaMzpIZom8KNXww0c0Si8H8aGXrtZn1sA43n6de439a4JbOlXSpNSQGsvFkxNVX2FEeG+49jhwJOaY4KZIGR38z0B6UFScZpJFQjcTfkM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=U7y4/E0I; arc=none smtp.client-ip=209.85.218.51 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="U7y4/E0I" Received: by mail-ej1-f51.google.com with SMTP id a640c23a62f3a-a9a1b71d7ffso34703266b.1; Wed, 30 Oct 2024 14:30:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1730323850; x=1730928650; 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=rzYPPNmwMAOnmhVBWnuCcEPg8fi588V+f5ZFW+F4qNc=; b=U7y4/E0IhtU2eqzcbuMpY4g2/2TTwQWRa0X+9oikxYWMnB8BgvAUuTsELuvMWoSiBG +9VyaxCO5zOdgLt5UfphIHpxkN0lq3cVwnIbszz876I42cpcoEh5Lv6YmIE46qOzFHiX aOSpN9rrJee5ux/Tc4BEexQs4PAJ4frUmCF7Z9daxTXZXlpra2Cv5gbHFX+v7qh7hevZ hMpXYBio2Nmv/1lZjDNR64Y7PaTHPOmknh75JSOpebE7BjIep2JHcqJTYaVBpZAibhNP kP1LoK2FF3BfcE9YFHAg1ROaXa0xsiTlEMGXO6dYd57nDaIjw/MmqcF5cuf264xXTNet PVbA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730323850; x=1730928650; 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=rzYPPNmwMAOnmhVBWnuCcEPg8fi588V+f5ZFW+F4qNc=; b=XaQvHUKUaHJIpEDK66UPsKSCj+IP5xVPdKvMiU+LCXaOqpLzFdJUSIfIaET4p0kJEC rdPALLSfBcc1/ArzINvHlfFRKfyO4+u09L7i4JbVsblBLRNubm4TE/oR6jSrCuw6vuIj c3ypIBVmMOPO4L+qQQsFIaIk3SoRuXaMD4rOgQGKXcutOrdBblfbMNYBarfTrGUAVpfW ++nlEZzfnHqLt9VNA9RhHpMlUiMKAhmQPUQEs2FQ2Wng7oWybrcZktK0psG3q/IC9avT Ibi98F/12yjZkB2P0BMqR1W1yEr28R54e8ma5l03nlPhmBcMeepKFCbrF9pnMte4yNx9 A24Q== X-Forwarded-Encrypted: i=1; AJvYcCVA+egQhrx/6p9gzyLcNWkHqF/76sxOzMyCEXGu4wZQG25kd9V+fd/f8W2UQ860qcfZldG8r0DRR10d3aw=@vger.kernel.org, AJvYcCVT2JQZmV/2Rh4b9hWoHWgL2MQ1SEdHTvfaSIkgXx/XQmFVubHw+uk6B1OuwXx155/umn04m5I5pFJtesVQ@vger.kernel.org, AJvYcCVssaPEfJZj1ao21mp9Iv2vEZOCIe78jVCqcMyWkLKfljzsO1zpO4SL+2c1bH11EvHx8IGwJ7NAaqTP@vger.kernel.org, AJvYcCWipGh/sBH2qTVHmjvMI6fmvXb9rZYLS7h8f93rARNLIz1zGOIuBj04nU+0HMeiTvZbIJXfxgy6D5qlTQ==@vger.kernel.org X-Gm-Message-State: AOJu0YxZBt9tlrBJQptEzlCOzCEPdCpmH/JPjf13p0Gs/Oxy/AvWukqp f458HTqsuk+vjDKbfnqQCOgxxxZi0xim7jwk4lMfdhziGyvxKDdf X-Google-Smtp-Source: AGHT+IFq4SG6PXsFx3QnMuWXPit6YWiHOW9v7DLV2g/eAVpAm/FkBvlCK81Zh4suocXEfzpW+heY2g== X-Received: by 2002:a17:907:970e:b0:a9a:2a56:91e with SMTP id a640c23a62f3a-a9e3a574f2cmr424880566b.6.1730323848651; Wed, 30 Oct 2024 14:30:48 -0700 (PDT) Received: from [127.0.1.1] (leased-line-46-53-189-50.telecom.by. [46.53.189.50]) by smtp.googlemail.com with ESMTPSA id a640c23a62f3a-a9e564c5410sm687266b.57.2024.10.30.14.30.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Oct 2024 14:30:47 -0700 (PDT) From: Dzmitry Sankouski Date: Thu, 31 Oct 2024 00:30:37 +0300 Subject: [PATCH v8 2/7] dt-bindings: mfd: add maxim,max77705 Precedence: bulk X-Mailing-List: linux-pm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20241031-starqltechn_integration_upstream-v8-2-2fa666c2330e@gmail.com> References: <20241031-starqltechn_integration_upstream-v8-0-2fa666c2330e@gmail.com> In-Reply-To: <20241031-starqltechn_integration_upstream-v8-0-2fa666c2330e@gmail.com> To: Sebastian Reichel , Chanwoo Choi , Krzysztof Kozlowski , Lee Jones , Rob Herring , Conor Dooley , Dmitry Torokhov , Pavel Machek Cc: linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, linux-input@vger.kernel.org, linux-leds@vger.kernel.org, Dzmitry Sankouski X-Mailer: b4 0.14.0 X-Developer-Signature: v=1; a=ed25519-sha256; t=1730323840; l=6203; i=dsankouski@gmail.com; s=20240619; h=from:subject:message-id; bh=9UW1cvl5fc/o0lPUsMCSThR3Opb7ot8+tEk54fve0oI=; b=RV9JQ+lf9eyZw5zWYUDiJjQep7yPnHDgE78IGjZciUN5XwJraAIpO8CojM2GTERfEdH1z/CwE 33LqJutctzQDooVh/PNyi573zzZnJuhFvoBwNATjKpb2l6An/YpxqTR X-Developer-Key: i=dsankouski@gmail.com; a=ed25519; pk=YJcXFcN1EWrzBYuiE2yi5Mn6WLn6L1H71J+f7X8fMag= Add maxim,max77705 core binding part. Reviewed-by: Rob Herring (Arm) Signed-off-by: Dzmitry Sankouski --- Changes in v8: - fix leds compatible Changes in v6: - unevaluatedProperties must be false - drop excessive sentence from description, just describe the device - change leds compatible to maxim,max77705-rgb Changes in v5: - formatting changes - add unevaluatedProperties: false for nodes referencing common schemas - remove additionalProperties on nodes with unevaluatedProperties: false - add min and max to led index Changes in v4: - change dts example intendation from tabs to spaces - remove interrupt-names property - remove obvious reg description - split long(>80) lines --- Documentation/devicetree/bindings/mfd/maxim,max77705.yaml | 174 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ MAINTAINERS | 1 + 2 files changed, 175 insertions(+) diff --git a/Documentation/devicetree/bindings/mfd/maxim,max77705.yaml b/Documentation/devicetree/bindings/mfd/maxim,max77705.yaml new file mode 100644 index 000000000000..5e7bb837c9f3 --- /dev/null +++ b/Documentation/devicetree/bindings/mfd/maxim,max77705.yaml @@ -0,0 +1,174 @@ +# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/mfd/maxim,max77705.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Maxim MAX77705 Companion Power Management IC and USB Type-C interface IC + +maintainers: + - Dzmitry Sankouski + +description: | + The Maxim MAX77705 is a Companion Power Management and Type-C + interface IC which includes charger, fuelgauge, LED, haptic motor driver and + Type-C management IC. + +properties: + compatible: + const: maxim,max77705 + + reg: + maxItems: 1 + + interrupts: + maxItems: 1 + + charger: + $ref: /schemas/power/supply/power-supply.yaml + unevaluatedProperties: false + properties: + compatible: + const: maxim,max77705-charger + + required: + - compatible + - monitored-battery + + fuel-gauge: + $ref: /schemas/power/supply/power-supply.yaml + type: object + unevaluatedProperties: false + description: MAX77705 fuel gauge with ModelGauge m5 EZ algorithm support. + + properties: + compatible: + const: maxim,max77705-fuel-gauge + + shunt-resistor-micro-ohms: + description: + The value of current sense resistor in microohms. + + required: + - compatible + - shunt-resistor-micro-ohms + - monitored-battery + - power-supplies + + haptic: + type: object + additionalProperties: false + + properties: + compatible: + const: maxim,max77705-haptic + + haptic-supply: true + + pwms: + maxItems: 1 + + required: + - compatible + - haptic-supply + - pwms + + leds: + type: object + additionalProperties: false + description: + Up to 4 LEDs supported. One LED is represented by one child node. + + properties: + compatible: + const: maxim,max77705-rgb + + "#address-cells": + const: 1 + + "#size-cells": + const: 0 + + patternProperties: + "^led@[0-3]$": + $ref: /schemas/leds/common.yaml# + type: object + unevaluatedProperties: false + + properties: + reg: + description: LED index. + minimum: 0 + maximum: 3 + + required: + - reg + + required: + - compatible + - "#address-cells" + - "#size-cells" + +required: + - compatible + +additionalProperties: false + +examples: + - | + #include + #include + + i2c { + #address-cells = <1>; + #size-cells = <0>; + + pmic@66 { + compatible = "maxim,max77705"; + reg = <0x66>; + interrupt-parent = <&pm8998_gpios>; + interrupts = <11 IRQ_TYPE_LEVEL_LOW>; + pinctrl-0 = <&chg_int_default>; + pinctrl-names = "default"; + + leds { + compatible = "maxim,max77705-rgb"; + #address-cells = <1>; + #size-cells = <0>; + + led@1 { + reg = <1>; + label = "red:usr1"; + }; + + led@2 { + reg = <2>; + label = "green:usr2"; + }; + + led@3 { + reg = <3>; + label = "blue:usr3"; + }; + }; + + max77705_charger: charger { + compatible = "maxim,max77705-charger"; + monitored-battery = <&battery>; + }; + + fuel-gauge { + compatible = "maxim,max77705-fuel-gauge"; + monitored-battery = <&battery>; + power-supplies = <&max77705_charger>; + shunt-resistor-micro-ohms = <5000>; + }; + + + haptic { + compatible = "maxim,max77705-haptic"; + haptic-supply = <&vib_regulator>; + pwms = <&vib_pwm 0 50000>; + }; + }; + }; diff --git a/MAINTAINERS b/MAINTAINERS index 3b9c6763f679..e92160703880 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -14131,6 +14131,7 @@ B: mailto:linux-samsung-soc@vger.kernel.org F: Documentation/devicetree/bindings/*/maxim,max14577.yaml F: Documentation/devicetree/bindings/*/maxim,max77686.yaml F: Documentation/devicetree/bindings/*/maxim,max77693.yaml +F: Documentation/devicetree/bindings/*/maxim,max77705*.yaml F: Documentation/devicetree/bindings/*/maxim,max77843.yaml F: Documentation/devicetree/bindings/clock/maxim,max77686.txt F: drivers/*/*max77843.c From patchwork Wed Oct 30 21:30:39 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dzmitry Sankouski X-Patchwork-Id: 839753 Received: from mail-ej1-f52.google.com (mail-ej1-f52.google.com [209.85.218.52]) (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 82294218954; Wed, 30 Oct 2024 21:30:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730323858; cv=none; b=qGRTrsV/JWC+fBm6EdvAQ8/EFFFlUR0lxSamjoS2Hykx4YrN584K3MGYwjb1hp//zV/kK9d+38t8+82JfDypEcLDalu4oO6XknCIOiETsZ4yJ+JNUIyiPbMEHpkKf43TRhkOZXTPoWVFowStfpYke1eDJ1fDCwZ7yZb/S2nOSsk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730323858; c=relaxed/simple; bh=XJYEk/mCiry62oVQMajkS7XejvIef8TuTfCRS3x2m5g=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=iMrVv9LbAvPmJ+vhopLWkpY0oe0Oa9tOtNPozX4F6pmczOJR36n2TpVD/CEdraqjfxW2HKGZ0z0mPxDq5uLfB1oQHXM9LGp7mA1IoQXNOWopBFp5T+cBPjXJnmLRB8uCWeFqFA9k6K2xZV7mhBkuBqM0JiUoLRJoXSpGbeaCFXY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=bEdi1XQn; arc=none smtp.client-ip=209.85.218.52 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="bEdi1XQn" Received: by mail-ej1-f52.google.com with SMTP id a640c23a62f3a-a9a68480164so33644866b.3; Wed, 30 Oct 2024 14:30:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1730323855; x=1730928655; 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=JV5gv50tNIl9j7OCpfl/gJrWPboaYw/v/JR/D33ZJrY=; b=bEdi1XQndUNZjwjJ/vWF+ZynFRZx5PRtXV+hqM5FVB8jofjlw5eZXb4k1G/0a8aB/B WFfD47Y/a2GHSPeACjS9vZdUh5OMazTx4FVNiBEHcfvuC8KBQqD5GObtQeFqVS7ulkh/ +3PqBsVYXlNledPEYXVqirSaZi+XuEJ+EsPAgnEeWjjGGAnhcjgHZqTRNeLZCwfpziwK QHy7PyIKpiw8dZNrr0F/HKmQ2q/LIvyKLm+PhLck8cc04pmJV6OnXDmLWOLUzBjuOj2B vrX3VliVpyETDPswdwvx2IL/B4FTz7YQ5RsTI2tCqDRYal3zUuaktdbwrBzpIS5Ih0Fw LkOg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730323855; x=1730928655; 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=JV5gv50tNIl9j7OCpfl/gJrWPboaYw/v/JR/D33ZJrY=; b=XhjGiY5nzxyfmn12AvGUtjcdAXa35MdzFCLXhYJwJKaVLuQgpuypZykN6ICJewNzd5 q5hVDnKfwkHWQhamnOd1LcSptq2/MwLczA9afdTcTDqZPsRR7ZOwc13KAQOc9Q50BhNS ZPzDe9Mlx4ViGN3KQ3hSsO0iPLaPme1XrxcW/k5hWIkhgLk6b1Hz43Ecc7WKOmdEV+Ww aUjxceharHYOiNIRtaOHLbFaJ7G+HmCMcP2KosnAXoOF8hax/CUwl9vXKCP+q16m9ah1 JiHBA8sm9SKwXjzR2InrSsk+OzkVfiihUK1aRxPKO+3YVa78dSyXW2onOuhVUozhJ9eK VB9A== X-Forwarded-Encrypted: i=1; AJvYcCUc560c4fYfe9ichg2JQO2IkjHuQA+KNd8bTWOX7n1dH4p4w9If8doiC9GIfvzfQqRi4dhuT96HFVTCCLU=@vger.kernel.org, AJvYcCV8BZPoCE/Sygq3M9PqZ3MJSrTQcWD0/2mGQfzaakqVKHFg1DWYxFT/O/CBnn3xtgwQG2jzHTB9nQeH@vger.kernel.org, AJvYcCVt6/QNffJtkeVuNkSf6r8uSz01AjnCnVhSUc9D/AkcsvPEDIPL1IPAVyt91HFolH2JmIQJz+pPTlGFpA==@vger.kernel.org, AJvYcCXY5Fmmbb+VjYJzOTAxLoPRNzxqVojNk2iM4AF2Dkd3Xa6+adjuLnbQa6Q6PXoQ8me+qTM3ZmxxwOhDHgcv@vger.kernel.org X-Gm-Message-State: AOJu0Yyk5QOkHcIuziMSMqa09ribdLxqoQkrpQkjqhp+ZN2OQV3GwhaJ WpKuiTUOnbaIDVu4fkvj9Jksu+1op31q7meesxwaA6K1PKhOdlE5 X-Google-Smtp-Source: AGHT+IGa7s7Bc91D1CrLYShWirMId7zSbZN0ZXh9HYw8f6G+BtK6TGl752fbfnJyEUGZyOFKdH89dA== X-Received: by 2002:a17:907:1c22:b0:a9a:7899:eb87 with SMTP id a640c23a62f3a-a9de5c90d54mr1708475666b.13.1730323854446; Wed, 30 Oct 2024 14:30:54 -0700 (PDT) Received: from [127.0.1.1] (leased-line-46-53-189-50.telecom.by. [46.53.189.50]) by smtp.googlemail.com with ESMTPSA id a640c23a62f3a-a9e564c5410sm687266b.57.2024.10.30.14.30.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Oct 2024 14:30:53 -0700 (PDT) From: Dzmitry Sankouski Date: Thu, 31 Oct 2024 00:30:39 +0300 Subject: [PATCH v8 4/7] input: max77693: add max77705 haptic support Precedence: bulk X-Mailing-List: linux-pm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20241031-starqltechn_integration_upstream-v8-4-2fa666c2330e@gmail.com> References: <20241031-starqltechn_integration_upstream-v8-0-2fa666c2330e@gmail.com> In-Reply-To: <20241031-starqltechn_integration_upstream-v8-0-2fa666c2330e@gmail.com> To: Sebastian Reichel , Chanwoo Choi , Krzysztof Kozlowski , Lee Jones , Rob Herring , Conor Dooley , Dmitry Torokhov , Pavel Machek Cc: linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, linux-input@vger.kernel.org, linux-leds@vger.kernel.org, Dzmitry Sankouski X-Mailer: b4 0.14.0 X-Developer-Signature: v=1; a=ed25519-sha256; t=1730323840; l=4280; i=dsankouski@gmail.com; s=20240619; h=from:subject:message-id; bh=XJYEk/mCiry62oVQMajkS7XejvIef8TuTfCRS3x2m5g=; b=TjCQFUccNRWTMExX2aRMW7LfQq1My352HAXCJgk2cx210cFmz8ZwbhyO492CORIQOGdq4V3YS i/sL9DDfJF/A4MsFMsDXx78SqrV0E8d3lcJxvqNxfc5jNxPPKRxDRq6 X-Developer-Key: i=dsankouski@gmail.com; a=ed25519; pk=YJcXFcN1EWrzBYuiE2yi5Mn6WLn6L1H71J+f7X8fMag= Add support for haptic controller on MAX77705 Multifunction device. This driver supports external pwm and LRA (Linear Resonant Actuator) motor. User can control the haptic device via force feedback framework. Acked-by: Dmitry Torokhov Signed-off-by: Dzmitry Sankouski --- Changes in v4: - add max77705 haptic support to max77693 driver - delete max77705-haptic --- drivers/input/misc/Kconfig | 4 ++-- drivers/input/misc/Makefile | 1 + drivers/input/misc/max77693-haptic.c | 15 ++++++++++++++- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig index 6a852c76331b..b4515c4e5cf6 100644 --- a/drivers/input/misc/Kconfig +++ b/drivers/input/misc/Kconfig @@ -241,11 +241,11 @@ config INPUT_MAX77650_ONKEY config INPUT_MAX77693_HAPTIC tristate "MAXIM MAX77693/MAX77843 haptic controller support" - depends on (MFD_MAX77693 || MFD_MAX77843) && PWM + depends on (MFD_MAX77693 || MFD_MAX77705 || MFD_MAX77843) && PWM select INPUT_FF_MEMLESS help This option enables support for the haptic controller on - MAXIM MAX77693 and MAX77843 chips. + MAXIM MAX77693, MAX77705 and MAX77843 chips. To compile this driver as module, choose M here: the module will be called max77693-haptic. diff --git a/drivers/input/misc/Makefile b/drivers/input/misc/Makefile index 4f7f736831ba..3e3532b27990 100644 --- a/drivers/input/misc/Makefile +++ b/drivers/input/misc/Makefile @@ -53,6 +53,7 @@ obj-$(CONFIG_INPUT_KXTJ9) += kxtj9.o obj-$(CONFIG_INPUT_M68K_BEEP) += m68kspkr.o obj-$(CONFIG_INPUT_MAX77650_ONKEY) += max77650-onkey.o obj-$(CONFIG_INPUT_MAX77693_HAPTIC) += max77693-haptic.o +obj-$(CONFIG_INPUT_MAX77705_HAPTIC) += max77705-haptic.o obj-$(CONFIG_INPUT_MAX8925_ONKEY) += max8925_onkey.o obj-$(CONFIG_INPUT_MAX8997_HAPTIC) += max8997_haptic.o obj-$(CONFIG_INPUT_MC13783_PWRBUTTON) += mc13783-pwrbutton.o diff --git a/drivers/input/misc/max77693-haptic.c b/drivers/input/misc/max77693-haptic.c index 0e646f1b257b..c3b9d33608d7 100644 --- a/drivers/input/misc/max77693-haptic.c +++ b/drivers/input/misc/max77693-haptic.c @@ -23,6 +23,7 @@ #include #include #include +#include #include #define MAX_MAGNITUDE_SHIFT 16 @@ -115,6 +116,13 @@ static int max77693_haptic_configure(struct max77693_haptic *haptic, MAX77693_HAPTIC_PWM_DIVISOR_128); config_reg = MAX77693_HAPTIC_REG_CONFIG2; break; + case TYPE_MAX77705: + value = ((haptic->type << MAX77693_CONFIG2_MODE) | + (enable << MAX77693_CONFIG2_MEN) | + (haptic->mode << MAX77693_CONFIG2_HTYP) | + MAX77693_HAPTIC_PWM_DIVISOR_128); + config_reg = MAX77705_PMIC_REG_MCONFIG; + break; case TYPE_MAX77843: value = (haptic->type << MCONFIG_MODE_SHIFT) | (enable << MCONFIG_MEN_SHIFT) | @@ -312,6 +320,9 @@ static int max77693_haptic_probe(struct platform_device *pdev) case TYPE_MAX77693: haptic->regmap_haptic = max77693->regmap_haptic; break; + case TYPE_MAX77705: + haptic->regmap_haptic = max77693->regmap; + break; case TYPE_MAX77843: haptic->regmap_haptic = max77693->regmap; break; @@ -407,6 +418,7 @@ static DEFINE_SIMPLE_DEV_PM_OPS(max77693_haptic_pm_ops, static const struct platform_device_id max77693_haptic_id[] = { { "max77693-haptic", }, + { "max77705-haptic", }, { "max77843-haptic", }, {}, }; @@ -414,6 +426,7 @@ MODULE_DEVICE_TABLE(platform, max77693_haptic_id); static const struct of_device_id of_max77693_haptic_dt_match[] = { { .compatible = "maxim,max77693-haptic", }, + { .compatible = "maxim,max77705-haptic", }, { .compatible = "maxim,max77843-haptic", }, { /* sentinel */ }, }; @@ -432,5 +445,5 @@ module_platform_driver(max77693_haptic_driver); MODULE_AUTHOR("Jaewon Kim "); MODULE_AUTHOR("Krzysztof Kozlowski "); -MODULE_DESCRIPTION("MAXIM 77693/77843 Haptic driver"); +MODULE_DESCRIPTION("MAXIM 77693/77705/77843 Haptic driver"); MODULE_LICENSE("GPL"); From patchwork Wed Oct 30 21:30:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dzmitry Sankouski X-Patchwork-Id: 839752 Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) (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 3F515219CBB; Wed, 30 Oct 2024 21:31:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730323864; cv=none; b=lij4wnEZLcEDD6Q4JcvbKckUgyYz+Teyp5hSNxJ/QSzGD20MwvwwkSm3Lz5m3AmdKSUPdgrZkqaF0uq2S4P97KRLNo6Gg9FhaBltcFjdEzSYzFVc5AaAslE3dK3ITne+rUIx6uWyvX2WON8gzbEVurYOFcKvrQHqfsayYOglCpk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730323864; c=relaxed/simple; bh=TtolUFToQLvjN+1MKw9O6QOw3JMP6euhZQNjPcbws5I=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=eTYi5sZ9u4Ypjn7mAeyteKeYFEBJjMDjMdRJNE7knrh/aVOSFUQGllB7rrKW8i4jE7zoQH494fQa8FfmlntoWdaY6+RGLc0CXIfgG0nxDf3O0EmND68lQMqhDsGk7nDoYV1IGG60pLxkMdc+UgYChbp2rWTkbFw/X0oVp8HsbXY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=gx2BFkKr; arc=none smtp.client-ip=209.85.128.52 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="gx2BFkKr" Received: by mail-wm1-f52.google.com with SMTP id 5b1f17b1804b1-43162cf1eaaso3151885e9.0; Wed, 30 Oct 2024 14:31:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1730323859; x=1730928659; 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=cOXDf5pSXjmqA3hw+YKSRVac8nthbz+as2AXECsjOII=; b=gx2BFkKrnhasaeN8Z51Moyte6NMFIZY4Yak/+Tt4J4J1LmWM3fhai7BPeOSEVJOjaI Ok5+XqJTdKUa4UoVM7hv2mwojv6ph8snyr8j9eogXvO4x0XeUgonJA9AWHab05GkeZmH 0jib0Xo/MZ+8ERz9hWcmci7FvUGjm4kCROGKJ+WnF68uXSPxzsDur3KHl9CZSBbMDvFn aaF8yWl1Vvby70y56R6gO1ZwMA4ywruxBaRYIgEQ6nvdVhbS19xM/LZ6PjYycLI96Aup 7KgL5y3xUsWQoi/N2WEPypWPqpgrpFqT9RqF8gLc8DyLUlU50h0ddSW/DWXRiPVMoHP2 0kCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730323859; x=1730928659; 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=cOXDf5pSXjmqA3hw+YKSRVac8nthbz+as2AXECsjOII=; b=X0qitq130i6e0NH84ycr/3yNQxOdrhcig7+mdruxcBdrjm4fqOitqoP6o+xmmdD8uC UGfFn+01YspdTpfDa1ibP79ySmgys2VtCUIH/kPtWFZRG+0emlIvraB8xwEgYMA1/AmF dh8k6e4Htq8TNatmkjrz/UFSRQ4WTXi2UClb63a3mlEzdcugLWELPlG+lIolTv6Q+PZ8 /RcRJLbDcO4+XgVmUWUc7P7bNbSjpQUXUHLSViaEPhxyM2kREMrl8zDJ56qTnLBjGmlj Pl86qoIat7WR6+G+I3k1Wg1183tEaq0YqNU2M9pbP7v5gqym8LDlKW0491Qp2kdSHp0/ CqPg== X-Forwarded-Encrypted: i=1; AJvYcCUA4rHRIc2GAFT5AnQFCWyIvevE0KfFFtzi0j5CG4QGJ0DUBppploOENi09wDMFBLM9gIAE7ncetSvF@vger.kernel.org, AJvYcCUng064Ts71fN3K5HgD+agt25Ty4mPoTZ5Qf9aYzq4Q7BcrqpURRdq8ZoH6vDKTBo7IKG7AA7uECn9u72Fd@vger.kernel.org, AJvYcCWg+ckmC5AvSukc6dQnvS7lLyAZEBbZK89AboCY+QxGl+PbV68MzpnaLttpiO8F5jv5BMl2B/H//sqMCw==@vger.kernel.org, AJvYcCWyAwdo7Ua3KyCQ/O97JxYqnCPY2MoDDJuITMtm4T8m4FWxmjqX3ZPFzwTeNuHpzx6vK88H/1MN4jyVO0s=@vger.kernel.org X-Gm-Message-State: AOJu0Yx5z2lGCTURdEiz1jVwUyMqHBx6iZJa6qhbhpAwVzI9QlJ8v/4k qfVoaDVF2o4F2xK17KR3J2oz7ABGvzVXSeCJeZiR3snl69a7EZtf X-Google-Smtp-Source: AGHT+IHekXYr+Efv0kHGOXxVG/E9noIFAUcpeI9neCG6qK8PTvQZamcuUEeiuiPqMzHY6aaskVoffA== X-Received: by 2002:a05:600c:4e86:b0:431:5f8c:ccb9 with SMTP id 5b1f17b1804b1-4319acacd75mr220949295e9.17.1730323859346; Wed, 30 Oct 2024 14:30:59 -0700 (PDT) Received: from [127.0.1.1] (leased-line-46-53-189-50.telecom.by. [46.53.189.50]) by smtp.googlemail.com with ESMTPSA id a640c23a62f3a-a9e564c5410sm687266b.57.2024.10.30.14.30.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Oct 2024 14:30:58 -0700 (PDT) From: Dzmitry Sankouski Date: Thu, 31 Oct 2024 00:30:41 +0300 Subject: [PATCH v8 6/7] power: supply: max77705: Add fuel gauge driver for Maxim 77705 Precedence: bulk X-Mailing-List: linux-pm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20241031-starqltechn_integration_upstream-v8-6-2fa666c2330e@gmail.com> References: <20241031-starqltechn_integration_upstream-v8-0-2fa666c2330e@gmail.com> In-Reply-To: <20241031-starqltechn_integration_upstream-v8-0-2fa666c2330e@gmail.com> To: Sebastian Reichel , Chanwoo Choi , Krzysztof Kozlowski , Lee Jones , Rob Herring , Conor Dooley , Dmitry Torokhov , Pavel Machek Cc: linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, linux-input@vger.kernel.org, linux-leds@vger.kernel.org, Dzmitry Sankouski X-Mailer: b4 0.14.0 X-Developer-Signature: v=1; a=ed25519-sha256; t=1730323840; l=16197; i=dsankouski@gmail.com; s=20240619; h=from:subject:message-id; bh=TtolUFToQLvjN+1MKw9O6QOw3JMP6euhZQNjPcbws5I=; b=eXE6YPQBFHDI6ziG43ysiW2RH8Kpb098ORYiTSFZlUOLFykCeCG2eY4BYtH3Zo2OqLLvMaD8f mXULFPGeQYvB+EuwbaAjiO0wZZ+cG4Mpn1SvzICErN9DNxXtARx4pAS X-Developer-Key: i=dsankouski@gmail.com; a=ed25519; pk=YJcXFcN1EWrzBYuiE2yi5Mn6WLn6L1H71J+f7X8fMag= Add driver for Maxim 77705 fuel gauge (part of max77705 PMIC) providing power supply class information to userspace. The driver is configured through DTS (battery and system related settings). Signed-off-by: Dzmitry Sankouski --- Changes for v8: - join line where possible to fit in 100 chars - change comment style C++ -> C - fix kernel-doc comments Changes for v6: - add i2c init in driver - initialize unintialized ret value with 0 - remove unused CAPACITY_SCALE_* constants - max77705_*_convert: replace multiplication and divison with mult_frac helper to fix https://lore.kernel.org/oe-kbuild-all/202410111913.5ADtNHNM-lkp@intel.com/ - max77705_battery_settings: move out battery settings gathering and rename function - probe: do regmap setup last, because if power_supply_get_battery_info fails, we're going to probe again and fail with i2c bus busy error - remove MFD from commit message Changes for v5: - fix license - use same hardware name in Kconfig and module descriptions - fix email, and module author Changes for v4: - rework driver from scratch - change word delimiters in filenames to "_" - remove debugfs code - cleanup header --- drivers/power/supply/Kconfig | 7 +++ drivers/power/supply/Makefile | 1 + drivers/power/supply/max77705_fuel_gauge.c | 363 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ include/linux/power/max77705_fuelgauge.h | 71 +++++++++++++++++++++++++++ 4 files changed, 442 insertions(+) diff --git a/drivers/power/supply/Kconfig b/drivers/power/supply/Kconfig index 66264036b65d..9a3b17036ddc 100644 --- a/drivers/power/supply/Kconfig +++ b/drivers/power/supply/Kconfig @@ -589,6 +589,13 @@ config CHARGER_MAX77705 help Say Y to enable support for the Maxim MAX77705 battery charger. +config FUEL_GAUGE_MAX77705 + tristate "Maxim MAX77705 fuel gauge driver" + depends on MFD_MAX77705 + default n + help + Say Y to enable support for MAXIM MAX77705 fuel gauge driver. + config CHARGER_MAX77976 tristate "Maxim MAX77976 battery charger driver" depends on I2C diff --git a/drivers/power/supply/Makefile b/drivers/power/supply/Makefile index 85d65b7aee1c..997049fc1795 100644 --- a/drivers/power/supply/Makefile +++ b/drivers/power/supply/Makefile @@ -81,6 +81,7 @@ obj-$(CONFIG_CHARGER_DETECTOR_MAX14656) += max14656_charger_detector.o obj-$(CONFIG_CHARGER_MAX77650) += max77650-charger.o obj-$(CONFIG_CHARGER_MAX77693) += max77693_charger.o obj-$(CONFIG_CHARGER_MAX77705) += max77705_charger.o +obj-$(CONFIG_FUEL_GAUGE_MAX77705) += max77705_fuel_gauge.o obj-$(CONFIG_CHARGER_MAX77976) += max77976_charger.o obj-$(CONFIG_CHARGER_MAX8997) += max8997_charger.o obj-$(CONFIG_CHARGER_MAX8998) += max8998_charger.o diff --git a/drivers/power/supply/max77705_fuel_gauge.c b/drivers/power/supply/max77705_fuel_gauge.c new file mode 100644 index 000000000000..43feeb77b47a --- /dev/null +++ b/drivers/power/supply/max77705_fuel_gauge.c @@ -0,0 +1,363 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright (C) 2024 Dzmitry Sankouski + * + * Fuel gauge driver for MAXIM 77705 charger/power-supply. + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#define I2C_ADDR_FG 0x36 + +static const char *max77705_fuelgauge_model = "max77705"; +static const char *max77705_fuelgauge_manufacturer = "Maxim Integrated"; + +static const struct regmap_config max77705_fg_regmap_config = { + .reg_bits = 8, + .val_bits = 8, + .max_register = MAX77705_FG_END, +}; + +static enum power_supply_property max77705_fuelgauge_props[] = { + POWER_SUPPLY_PROP_STATUS, + POWER_SUPPLY_PROP_PRESENT, + POWER_SUPPLY_PROP_VOLTAGE_NOW, + POWER_SUPPLY_PROP_VOLTAGE_OCV, + POWER_SUPPLY_PROP_VOLTAGE_AVG, + POWER_SUPPLY_PROP_CURRENT_NOW, + POWER_SUPPLY_PROP_CURRENT_AVG, + POWER_SUPPLY_PROP_CHARGE_NOW, + POWER_SUPPLY_PROP_CHARGE_FULL, + POWER_SUPPLY_PROP_CHARGE_FULL_DESIGN, + POWER_SUPPLY_PROP_CAPACITY, + POWER_SUPPLY_PROP_TEMP, + POWER_SUPPLY_PROP_TIME_TO_EMPTY_NOW, + POWER_SUPPLY_PROP_TIME_TO_FULL_NOW, +}; + +static int max77705_fg_read_reg(struct max77705_fuelgauge_data *fuelgauge, + unsigned int reg, unsigned int *val) +{ + struct regmap *regmap = fuelgauge->regmap; + u8 data[2]; + int ret; + + ret = regmap_noinc_read(regmap, reg, data, sizeof(data)); + if (ret < 0) + return ret; + + *val = (data[1] << 8) + data[0]; + + return 0; +} + +static int max77705_fg_read_temp(struct max77705_fuelgauge_data *fuelgauge, + int *val) +{ + struct regmap *regmap = fuelgauge->regmap; + u8 data[2] = { 0, 0 }; + int ret, temperature = 0; + + ret = regmap_noinc_read(regmap, TEMPERATURE_REG, data, sizeof(data)); + if (ret < 0) + return ret; + + if (data[1] & BIT(7)) + temperature = ((~(data[1])) & 0xFF) + 1; + else + temperature = data[1] & 0x7f; + + temperature *= 10; + temperature += data[0] * 10 / 256; + *val = temperature; + + return 0; +} + +static int max77705_fg_check_battery_present(struct max77705_fuelgauge_data + *fuelgauge, int *val) +{ + struct regmap *regmap = fuelgauge->regmap; + u8 status_data[2]; + int ret; + + ret = regmap_noinc_read(regmap, STATUS_REG, status_data, sizeof(status_data)); + if (ret < 0) + return ret; + + *val = !(status_data[0] & MAX77705_BAT_ABSENT_MASK); + + return 0; +} + +static int max77705_battery_get_status(struct max77705_fuelgauge_data *fuelgauge, + int *val) +{ + int current_now; + int am_i_supplied; + int ret; + unsigned int soc_rep; + + am_i_supplied = power_supply_am_i_supplied(fuelgauge->psy_fg); + if (am_i_supplied) { + if (am_i_supplied == -ENODEV) { + dev_err(fuelgauge->dev, + "power supply not found, fall back to current-based method\n"); + } else { + *val = POWER_SUPPLY_STATUS_CHARGING; + return 0; + } + } + ret = max77705_fg_read_reg(fuelgauge, SOCREP_REG, &soc_rep); + if (ret) + return ret; + + if (soc_rep < 100) { + ret = max77705_fg_read_reg(fuelgauge, CURRENT_REG, ¤t_now); + if (ret) + return ret; + + if (current_now > 0) + *val = POWER_SUPPLY_STATUS_CHARGING; + else if (current_now < 0) + *val = POWER_SUPPLY_STATUS_DISCHARGING; + else + *val = POWER_SUPPLY_STATUS_NOT_CHARGING; + } else { + *val = POWER_SUPPLY_STATUS_FULL; + } + + return 0; +} + +static void max77705_unit_adjustment(struct max77705_fuelgauge_data *fuelgauge, + enum power_supply_property psp, + union power_supply_propval *val) +{ + const unsigned int base_unit_conversion = 1000; + + switch (psp) { + case POWER_SUPPLY_PROP_VOLTAGE_NOW: + case POWER_SUPPLY_PROP_VOLTAGE_OCV: + case POWER_SUPPLY_PROP_VOLTAGE_AVG: + val->intval = max77705_fg_vs_convert(val->intval); + break; + case POWER_SUPPLY_PROP_CURRENT_NOW: + case POWER_SUPPLY_PROP_CURRENT_AVG: + val->intval = max77705_fg_cs_convert(val->intval, + fuelgauge->rsense_conductance); + break; + case POWER_SUPPLY_PROP_CHARGE_NOW: + case POWER_SUPPLY_PROP_CHARGE_FULL: + case POWER_SUPPLY_PROP_CHARGE_FULL_DESIGN: + val->intval *= base_unit_conversion; + break; + case POWER_SUPPLY_PROP_CAPACITY: + val->intval = min(val->intval, 100); + break; + default: + dev_dbg(fuelgauge->dev, + "%s: no need for unit conversion %d\n", __func__, psp); + } +} + +static int max77705_fg_get_property(struct power_supply *psy, + enum power_supply_property psp, + union power_supply_propval *val) +{ + struct max77705_fuelgauge_data *fuelgauge = + power_supply_get_drvdata(psy); + int ret = 0; + + switch (psp) { + case POWER_SUPPLY_PROP_STATUS: + ret = max77705_battery_get_status(fuelgauge, &val->intval); + break; + case POWER_SUPPLY_PROP_PRESENT: + ret = max77705_fg_check_battery_present(fuelgauge, &val->intval); + break; + case POWER_SUPPLY_PROP_VOLTAGE_NOW: + ret = max77705_fg_read_reg(fuelgauge, VCELL_REG, &val->intval); + break; + case POWER_SUPPLY_PROP_VOLTAGE_OCV: + ret = max77705_fg_read_reg(fuelgauge, VFOCV_REG, &val->intval); + break; + case POWER_SUPPLY_PROP_VOLTAGE_AVG: + ret = max77705_fg_read_reg(fuelgauge, AVR_VCELL_REG, &val->intval); + break; + case POWER_SUPPLY_PROP_CURRENT_NOW: + ret = max77705_fg_read_reg(fuelgauge, CURRENT_REG, &val->intval); + break; + case POWER_SUPPLY_PROP_CURRENT_AVG: + ret = max77705_fg_read_reg(fuelgauge, AVG_CURRENT_REG, &val->intval); + break; + case POWER_SUPPLY_PROP_CHARGE_NOW: + ret = max77705_fg_read_reg(fuelgauge, REMCAP_REP_REG, &val->intval); + break; + case POWER_SUPPLY_PROP_CHARGE_FULL: + ret = max77705_fg_read_reg(fuelgauge, FULLCAP_REP_REG, &val->intval); + break; + case POWER_SUPPLY_PROP_CHARGE_FULL_DESIGN: + ret = max77705_fg_read_reg(fuelgauge, DESIGNCAP_REG, &val->intval); + break; + case POWER_SUPPLY_PROP_CAPACITY: + ret = max77705_fg_read_reg(fuelgauge, SOCREP_REG, &val->intval); + break; + case POWER_SUPPLY_PROP_TEMP: + ret = max77705_fg_read_temp(fuelgauge, &val->intval); + break; + case POWER_SUPPLY_PROP_TIME_TO_EMPTY_NOW: + ret = max77705_fg_read_reg(fuelgauge, TIME_TO_EMPTY_REG, &val->intval); + break; + case POWER_SUPPLY_PROP_TIME_TO_FULL_NOW: + ret = max77705_fg_read_reg(fuelgauge, TIME_TO_FULL_REG, &val->intval); + break; + case POWER_SUPPLY_PROP_CYCLE_COUNT: + ret = max77705_fg_read_reg(fuelgauge, CYCLES_REG, &val->intval); + break; + case POWER_SUPPLY_PROP_MODEL_NAME: + val->strval = max77705_fuelgauge_model; + break; + case POWER_SUPPLY_PROP_MANUFACTURER: + val->strval = max77705_fuelgauge_manufacturer; + break; + default: + return -EINVAL; + } + + if (ret) + return ret; + + max77705_unit_adjustment(fuelgauge, psp, val); + + return 0; +} + +static const struct power_supply_desc max77705_fg_desc = { + .name = "max77705-fuel-gauge", + .type = POWER_SUPPLY_TYPE_BATTERY, + .properties = max77705_fuelgauge_props, + .num_properties = ARRAY_SIZE(max77705_fuelgauge_props), + .get_property = max77705_fg_get_property, +}; + +static int max77705_fg_set_charge_design(struct regmap *regmap, int value) +{ + u8 data[2]; + int value_mah; + + value_mah = value / 1000; + data[0] = value_mah & 0xFF; + data[1] = (value_mah >> 8) & 0xFF; + + return regmap_noinc_write(regmap, DESIGNCAP_REG, data, sizeof(data)); +} + +static int max77705_write_bat_info(struct max77705_fuelgauge_data *fuelgauge) +{ + struct power_supply_battery_info *info = fuelgauge->bat_info; + + if (info->energy_full_design_uwh != info->charge_full_design_uah) { + if (info->charge_full_design_uah == -EINVAL) + dev_warn(fuelgauge->dev, "missing battery:charge-full-design-microamp-hours\n"); + return max77705_fg_set_charge_design(fuelgauge->regmap, + info->charge_full_design_uah); + } + + return 0; +} + +static int max77705_fuelgauge_parse_dt(struct max77705_fuelgauge_data + *fuelgauge) +{ + struct device *dev = fuelgauge->dev; + struct device_node *np = dev->of_node; + int ret; + unsigned int rsense; + + if (!np) { + dev_err(dev, "no fuelgauge OF node\n"); + return -EINVAL; + } + ret = of_property_read_u32(np, "shunt-resistor-micro-ohms", + &rsense); + if (ret < 0) { + dev_warn(dev, "No shunt-resistor-micro-ohms property, assume default\n"); + fuelgauge->rsense_conductance = 100; + } else + fuelgauge->rsense_conductance = 1000000 / rsense; /* rsense conductance in Ohm^-1 */ + + return 0; +} + +static int max77705_fuelgauge_probe(struct platform_device *pdev) +{ + struct i2c_client *i2c_fg; + struct max77693_dev *max77705 = dev_get_drvdata(pdev->dev.parent); + struct max77705_fuelgauge_data *fuelgauge; + struct power_supply_config fuelgauge_cfg = { }; + struct device *dev = &pdev->dev; + int ret = 0; + + fuelgauge = devm_kzalloc(dev, sizeof(*fuelgauge), GFP_KERNEL); + if (!fuelgauge) + return -ENOMEM; + + fuelgauge->dev = dev; + + ret = max77705_fuelgauge_parse_dt(fuelgauge); + if (ret < 0) + return ret; + + fuelgauge_cfg.drv_data = fuelgauge; + fuelgauge_cfg.of_node = fuelgauge->dev->of_node; + + fuelgauge->psy_fg = devm_power_supply_register(&pdev->dev, + &max77705_fg_desc, + &fuelgauge_cfg); + + if (IS_ERR(fuelgauge->psy_fg)) + return PTR_ERR(fuelgauge->psy_fg); + + ret = power_supply_get_battery_info(fuelgauge->psy_fg, + &fuelgauge->bat_info); + + if (ret) + return ret; + + i2c_fg = devm_i2c_new_dummy_device(max77705->dev, max77705->i2c->adapter, I2C_ADDR_FG); + + if (IS_ERR(i2c_fg)) + return PTR_ERR(i2c_fg); + + fuelgauge->regmap = devm_regmap_init_i2c(i2c_fg, &max77705_fg_regmap_config); + + return max77705_write_bat_info(fuelgauge); +} + +static const struct of_device_id max77705_fg_of_match[] = { + { .compatible = "maxim,max77705-fuel-gauge" }, + { } +}; +MODULE_DEVICE_TABLE(of, max77705_fg_of_match); + +static struct platform_driver max77705_fuelgauge_driver = { + .driver = { + .name = "max77705-fuel-gauge", + .of_match_table = max77705_fg_of_match, + }, + .probe = max77705_fuelgauge_probe, +}; +module_platform_driver(max77705_fuelgauge_driver); + +MODULE_DESCRIPTION("Maxim MAX77705 Fuel Gauge Driver"); +MODULE_AUTHOR("Dzmitry Sankouski "); +MODULE_LICENSE("GPL"); diff --git a/include/linux/power/max77705_fuelgauge.h b/include/linux/power/max77705_fuelgauge.h new file mode 100644 index 000000000000..4c9f0f38f773 --- /dev/null +++ b/include/linux/power/max77705_fuelgauge.h @@ -0,0 +1,71 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * Copyright (C) 2024 Dzmitry Sankouski + * + * Fuel gauge driver header for MAXIM 77705 charger/power-supply. + */ + +#ifndef __MAX77705_FUELGAUGE_H +#define __MAX77705_FUELGAUGE_H __FILE__ + +#include +#include +#include + +#define ALERT_EN 4 +/* + * Current and capacity values are displayed as a voltage + * and must be divided by the sense resistor to determine Amps or Amp-hours. + * This should be applied to all current, charge, energy registers, + * except ModelGauge m5 Algorithm related ones. + * current sense resolution + */ +#define MAX77705_FG_CS_ADC_RESOLUTION 15625 /* 1.5625 microvolts */ +/* voltage sense resolution */ +#define MAX77705_FG_VS_ADC_RESOLUTION 78125 /* 78.125 microvolts */ +/* CONFIG_REG register */ +#define MAX77705_SOC_ALERT_EN_MASK BIT(2) +/* When set to 1, external temperature measurements should be written from the host */ +#define MAX77705_TEX_MASK BIT(8) +/* Enable Thermistor */ +#define MAX77705_ETHRM_MASK BIT(5) +/* CONFIG2_REG register */ +#define MAX77705_AUTO_DISCHARGE_EN_MASK BIT(9) +/* STATUS_REG register */ +#define MAX77705_BAT_ABSENT_MASK BIT(3) + +/** + * max77705_fg_vs_convert() - Convert voltage register value to micro volts. + * + * @reg_val: Register value. + * + * Return: Voltage in micro Volts. + */ +inline u64 max77705_fg_vs_convert(u16 reg_val) +{ + return mult_frac(reg_val, MAX77705_FG_VS_ADC_RESOLUTION, 1000); +} + +/** + * max77705_fg_cs_convert() - Convert current register value to micro volts. + * + * @reg_val: Register value. + * @rsense_conductance: Current sense resistor conductance in Ohm^-1. + * + * Return: Current in micro Volts. + */ +inline s32 max77705_fg_cs_convert(s16 reg_val, u32 rsense_conductance) +{ + return mult_frac(reg_val * rsense_conductance, MAX77705_FG_CS_ADC_RESOLUTION, + 10000); +} + +struct max77705_fuelgauge_data { + struct device *dev; + struct regmap *regmap; + struct power_supply *psy_fg; + struct power_supply_battery_info *bat_info; + u32 rsense_conductance; +}; + +#endif /* __MAX77705_FUELGAUGE_H */