From patchwork Fri Apr 12 12:36:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fenglin Wu via B4 Relay X-Patchwork-Id: 788601 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7DA4B54F87; Fri, 12 Apr 2024 12:36:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712925406; cv=none; b=t+/ngFnUoxZxrP/3x5cFh9WKbEl2Kr+5DnT5u1YQglGLQLylptPRsmgnxDVZdE7UoncYHNvBZn3MH1YV6zTFH2Sm+bVF+cv/dNEtSqVYtS0IJJnE2A3aepwzWbA6ZEED+XeSEtDiBzzebIRGReK9vTPqM/xuWMULKfDZCdHHGFQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712925406; c=relaxed/simple; bh=G0GWDtrUka0cfT9mQcWpAahixZ8YB0wM3L0wDhlXIfM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=pmbVJC0TOUe+g0fCgBAaOxZTbSn0FA1cCQ5L2o23oApiX9Wckn0DQicW9r8E/gcbd04bxZd1ffF/2bXVQ2smBfRduDALrTjZPUVYDd6TGObCpcaxyAEeOUmNwCScO29202SROpKEwXS+pF8WWLSgRZiEY4nL+I8RrIn6/7Fo6vc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=T8Jv7tYM; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="T8Jv7tYM" Received: by smtp.kernel.org (Postfix) with ESMTPS id 25763C113CD; Fri, 12 Apr 2024 12:36:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1712925406; bh=G0GWDtrUka0cfT9mQcWpAahixZ8YB0wM3L0wDhlXIfM=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=T8Jv7tYMh4XmHvYCk3Ef3dBLhf9ol6d6T0ZmoocOLPYNtIlYuya9wazvPzrIv0smN WXXQgLR7gEYghgkHoa14096z1pg5nfxDStr443t5AQas3eJKeG9/x5Jn2t0Fx4F5fD 1xRHplyNihOltsAFeAfGvijfNzYovUIAmNsdnbrV5yyZsYD2fFiTejnFtEnDWN83wK 07svlSPhrr5Ad/HQAMtXFxtfU2xDmqNJ3lZC2qccaAD2rlLp5BmbCEBYde2jPG7aQ9 KrR2u6tN+b3ErRh48UphRCk00FwGII67mBDQdB5H37SJJO5Qp2cXW4E7mAodv/YDgQ Q2DxbhiclIZSA== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 14B41C04FF6; Fri, 12 Apr 2024 12:36:46 +0000 (UTC) From: Fenglin Wu via B4 Relay Date: Fri, 12 Apr 2024 20:36:25 +0800 Subject: [PATCH v10 1/4] input: pm8xxx-vibrator: correct VIB_MAX_LEVELS calculation Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240412-pm8xxx-vibrator-new-design-v10-1-0ec0ad133866@quicinc.com> References: <20240412-pm8xxx-vibrator-new-design-v10-0-0ec0ad133866@quicinc.com> In-Reply-To: <20240412-pm8xxx-vibrator-new-design-v10-0-0ec0ad133866@quicinc.com> To: kernel@quicinc.com, Andy Gross , Bjorn Andersson , Konrad Dybcio , Dmitry Torokhov , Rob Herring , Krzysztof Kozlowski , Dmitry Baryshkov Cc: linux-arm-msm@vger.kernel.org, linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Fenglin Wu X-Mailer: b4 0.13-dev-83828 X-Developer-Signature: v=1; a=ed25519-sha256; t=1712925404; l=1309; i=quic_fenglinw@quicinc.com; s=20240327; h=from:subject:message-id; bh=t75pzebWYsBpS9YipaE4zw2bQKsUcZAihoKdmtGp74A=; b=YtCTA1CmZN2cm3NtM2xXw4EX1VXMqT/MDV3Qn2DTUJ+AzruJdiuW3rieHUdYCU81qymp2/gIA 5QWFyJYudKOAsl78E36sVwaZaLJD/Hmv4W3TLR9I9Gc0at5cfVhC+Dr X-Developer-Key: i=quic_fenglinw@quicinc.com; a=ed25519; pk=BF8SA4IVDk8/EBCwlBehKtn2hp6kipuuAuDAHh9s+K4= X-Endpoint-Received: by B4 Relay for quic_fenglinw@quicinc.com/20240327 with auth_id=146 X-Original-From: Fenglin Wu Reply-To: quic_fenglinw@quicinc.com From: Fenglin Wu The output voltage is inclusive hence the max level calculation is off-by-one-step. Correct it. Fixes: 11205bb63e5c ("Input: add support for pm8xxx based vibrator driver") Signed-off-by: Fenglin Wu --- drivers/input/misc/pm8xxx-vibrator.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/input/misc/pm8xxx-vibrator.c b/drivers/input/misc/pm8xxx-vibrator.c index 04cb87efd799..844ca7e1f59f 100644 --- a/drivers/input/misc/pm8xxx-vibrator.c +++ b/drivers/input/misc/pm8xxx-vibrator.c @@ -14,7 +14,8 @@ #define VIB_MAX_LEVEL_mV (3100) #define VIB_MIN_LEVEL_mV (1200) -#define VIB_MAX_LEVELS (VIB_MAX_LEVEL_mV - VIB_MIN_LEVEL_mV) +#define VIB_PER_STEP_mV (100) +#define VIB_MAX_LEVELS (VIB_MAX_LEVEL_mV - VIB_MIN_LEVEL_mV + VIB_PER_STEP_mV) #define MAX_FF_SPEED 0xff @@ -118,10 +119,10 @@ static void pm8xxx_work_handler(struct work_struct *work) vib->active = true; vib->level = ((VIB_MAX_LEVELS * vib->speed) / MAX_FF_SPEED) + VIB_MIN_LEVEL_mV; - vib->level /= 100; + vib->level /= VIB_PER_STEP_mV; } else { vib->active = false; - vib->level = VIB_MIN_LEVEL_mV / 100; + vib->level = VIB_MIN_LEVEL_mV / VIB_PER_STEP_mV; } pm8xxx_vib_set(vib, vib->active); From patchwork Fri Apr 12 12:36:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fenglin Wu via B4 Relay X-Patchwork-Id: 788600 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9CA5250A68; Fri, 12 Apr 2024 12:36:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712925406; cv=none; b=TMs/6vRbwnl6hiRjoakp0dwHUZvfpd6uCDDozB1kbbko55X2QKTdOByHhHC65LrjYQ9fJ7Gh/L7cFQC6tF1djnqD4p7tiEnBQtzOL0zctJjJTBvIUoLLpIgAlnddNjNMgb4w4ZlJjUYyK62qnKM9NQ8kMz1ryMd9KbvnrVE3wQY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712925406; c=relaxed/simple; bh=yHrtARBaJjouW6QVoijuifz4Jy/hgSa1MM7EatAgWSc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=FOUIKXd6rFy8gssgdAOCedvEz/hLLhTn4ntTN+PNfcKaND9X/AuW7bReRAgn6nCoONuEOQ3pk9BEDxU900q9oy/itsNv0V5WmSG5oT0mTNAeXsHwdbFr6ZSDIXFT5lrS8Jw4SmZfERceDXGefT0rDVYKFQzSrkfvUo+/6TGP3QI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=P9tHaJxA; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="P9tHaJxA" Received: by smtp.kernel.org (Postfix) with ESMTPS id 38095C2BD10; Fri, 12 Apr 2024 12:36:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1712925406; bh=yHrtARBaJjouW6QVoijuifz4Jy/hgSa1MM7EatAgWSc=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=P9tHaJxAdU9lS1D4u9QRjKSogr+UY1RvYnad3ymrUM44lrEzBMTuUcWsW2dCXtizl ghj0C9ByV154qjPQXseRMt/nLPpi3PedPhy1Eh083C4/oN08YBNvv2ksap3XX7e8XR 2AGuFUA3HhXp3PqSZ/OqC8kf5sX127+VmYIkyg4TuDuCpKj9AOwGzxR7r7aYZcD3er KBghrVhXK9muqkAQqyhCXdRBlP8pN4Ox2LHNW5gzt1gZiZHGR10SRkYMfAWNgjbjVn Xxzr3uYBi+5mAPUAqBd5EWsfoAX20mDZTy4Obz0qkKr+Nh7j+Uazip+t+KY2PAB3gg UTqb/yhrs5q7w== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2400EC41513; Fri, 12 Apr 2024 12:36:46 +0000 (UTC) From: Fenglin Wu via B4 Relay Date: Fri, 12 Apr 2024 20:36:26 +0800 Subject: [PATCH v10 2/4] input: pm8xxx-vibrator: refactor to support new SPMI vibrator Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240412-pm8xxx-vibrator-new-design-v10-2-0ec0ad133866@quicinc.com> References: <20240412-pm8xxx-vibrator-new-design-v10-0-0ec0ad133866@quicinc.com> In-Reply-To: <20240412-pm8xxx-vibrator-new-design-v10-0-0ec0ad133866@quicinc.com> To: kernel@quicinc.com, Andy Gross , Bjorn Andersson , Konrad Dybcio , Dmitry Torokhov , Rob Herring , Krzysztof Kozlowski , Dmitry Baryshkov Cc: linux-arm-msm@vger.kernel.org, linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Fenglin Wu X-Mailer: b4 0.13-dev-83828 X-Developer-Signature: v=1; a=ed25519-sha256; t=1712925404; l=4328; i=quic_fenglinw@quicinc.com; s=20240327; h=from:subject:message-id; bh=Z23TYMEBk9Q8HS6GaIPC6RDcCQ+axWSc4H0ISoYYLRc=; b=+vDlS5D319hE8n7YqmWl6RfFPnd9GqnpdIasC0UIGUkQBurWArorTBCrs/q84JYlsO87Wse0F ZrLKJRXqSVwD6hm6KaB5AMroB/uEgBRUSj+CDHJDHUlt+90Jfk57NWD X-Developer-Key: i=quic_fenglinw@quicinc.com; a=ed25519; pk=BF8SA4IVDk8/EBCwlBehKtn2hp6kipuuAuDAHh9s+K4= X-Endpoint-Received: by B4 Relay for quic_fenglinw@quicinc.com/20240327 with auth_id=146 X-Original-From: Fenglin Wu Reply-To: quic_fenglinw@quicinc.com From: Fenglin Wu Currently, vibrator control register addresses are hard coded, including the base address and offsets, it's not flexible to support new SPMI vibrator module which is usually included in different PMICs with different base address. Refactor it by using the base address defined in devicetree. Signed-off-by: Fenglin Wu --- drivers/input/misc/pm8xxx-vibrator.c | 41 +++++++++++++++++++++++------------- 1 file changed, 26 insertions(+), 15 deletions(-) diff --git a/drivers/input/misc/pm8xxx-vibrator.c b/drivers/input/misc/pm8xxx-vibrator.c index 844ca7e1f59f..640927f94143 100644 --- a/drivers/input/misc/pm8xxx-vibrator.c +++ b/drivers/input/misc/pm8xxx-vibrator.c @@ -20,27 +20,27 @@ #define MAX_FF_SPEED 0xff struct pm8xxx_regs { - unsigned int enable_addr; + unsigned int enable_offset; unsigned int enable_mask; - unsigned int drv_addr; + unsigned int drv_offset; unsigned int drv_mask; unsigned int drv_shift; unsigned int drv_en_manual_mask; }; static const struct pm8xxx_regs pm8058_regs = { - .drv_addr = 0x4A, + .drv_offset = 0, .drv_mask = 0xf8, .drv_shift = 3, .drv_en_manual_mask = 0xfc, }; static struct pm8xxx_regs pm8916_regs = { - .enable_addr = 0xc046, + .enable_offset = 0x46, .enable_mask = BIT(7), - .drv_addr = 0xc041, - .drv_mask = 0x1F, + .drv_offset = 0x41, + .drv_mask = 0x1f, .drv_shift = 0, .drv_en_manual_mask = 0, }; @@ -51,6 +51,8 @@ static struct pm8xxx_regs pm8916_regs = { * @work: work structure to set the vibration parameters * @regmap: regmap for register read/write * @regs: registers' info + * @enable_addr: vibrator enable register + * @drv_addr: vibrator drive strength register * @speed: speed of vibration set from userland * @active: state of vibrator * @level: level of vibration to set in the chip @@ -61,6 +63,8 @@ struct pm8xxx_vib { struct work_struct work; struct regmap *regmap; const struct pm8xxx_regs *regs; + unsigned int enable_addr; + unsigned int drv_addr; int speed; int level; bool active; @@ -83,15 +87,15 @@ static int pm8xxx_vib_set(struct pm8xxx_vib *vib, bool on) else val &= ~regs->drv_mask; - rc = regmap_write(vib->regmap, regs->drv_addr, val); + rc = regmap_write(vib->regmap, vib->drv_addr, val); if (rc < 0) return rc; vib->reg_vib_drv = val; if (regs->enable_mask) - rc = regmap_update_bits(vib->regmap, regs->enable_addr, - regs->enable_mask, on ? ~0 : 0); + rc = regmap_update_bits(vib->regmap, vib->enable_addr, + regs->enable_mask, on ? regs->enable_mask : 0); return rc; } @@ -103,11 +107,10 @@ static int pm8xxx_vib_set(struct pm8xxx_vib *vib, bool on) static void pm8xxx_work_handler(struct work_struct *work) { struct pm8xxx_vib *vib = container_of(work, struct pm8xxx_vib, work); - const struct pm8xxx_regs *regs = vib->regs; - int rc; unsigned int val; + int rc; - rc = regmap_read(vib->regmap, regs->drv_addr, &val); + rc = regmap_read(vib->regmap, vib->drv_addr, &val); if (rc < 0) return; @@ -170,7 +173,7 @@ static int pm8xxx_vib_probe(struct platform_device *pdev) struct pm8xxx_vib *vib; struct input_dev *input_dev; int error; - unsigned int val; + unsigned int val, reg_base = 0; const struct pm8xxx_regs *regs; vib = devm_kzalloc(&pdev->dev, sizeof(*vib), GFP_KERNEL); @@ -188,15 +191,23 @@ static int pm8xxx_vib_probe(struct platform_device *pdev) INIT_WORK(&vib->work, pm8xxx_work_handler); vib->vib_input_dev = input_dev; + error = fwnode_property_read_u32(pdev->dev.fwnode, "reg", ®_base); + if (error < 0) { + dev_err(&pdev->dev, "Failed to read reg address, rc=%d\n", error); + return error; + } + regs = of_device_get_match_data(&pdev->dev); + vib->enable_addr = reg_base + regs->enable_offset; + vib->drv_addr = reg_base + regs->drv_offset; /* operate in manual mode */ - error = regmap_read(vib->regmap, regs->drv_addr, &val); + error = regmap_read(vib->regmap, vib->drv_addr, &val); if (error < 0) return error; val &= regs->drv_en_manual_mask; - error = regmap_write(vib->regmap, regs->drv_addr, val); + error = regmap_write(vib->regmap, vib->drv_addr, val); if (error < 0) return error; From patchwork Fri Apr 12 12:36:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fenglin Wu via B4 Relay X-Patchwork-Id: 788599 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A0F955915C; Fri, 12 Apr 2024 12:36:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712925406; cv=none; b=GwqDNNChIsKNeEpBWuK02SNvbRZRKhQ53/VVRyVkKINVBc1iKjaDWmuCu8D8IP1hhDLDvbIptAkxpYHLULrl1ypE7yL8dQkEGyUAK/as6F8Qg97MkK/BYUcB4yi8T62ap7gAZMFbt4S37WZPEQLY+J9+4n8bVbvWcqFKzO9ksIw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712925406; c=relaxed/simple; bh=2pSJ5RtkTJUIWZtuMClF1MziyBCDcsQTg8O2HQnpmqY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Iyt5qxjx77u/oVoErF6djq2yXrXqDZAdpvwVIHz47pe7Ei9Xdy5x11qBhMw6FXTeHC0giSlEtKSB+AW4F1LPb1Lg2qpUEo7w4SOh4YT3YNrjmLve3Pp8eYCQYKJJsJDw+arI7ImyJfMwLAVShOlhekuBpwY6dlj83iGc15kflkQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=JUICEiKK; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="JUICEiKK" Received: by smtp.kernel.org (Postfix) with ESMTPS id 426ABC32786; Fri, 12 Apr 2024 12:36:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1712925406; bh=2pSJ5RtkTJUIWZtuMClF1MziyBCDcsQTg8O2HQnpmqY=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=JUICEiKKnOoqZIvtxfqJzCPmGAxqh85fGIlkZV2a+FcsDws0eOmpyh4LFihjN+JIM nNhA2vgxRazDxyr2AfSCaXEo63HxuGnAbrwerOfvClUBx9GBfoqdlTFJB1yjISF8Cj GJLrdQNd/CQaTg++fhD89qPOOtoO5cxlAu0+QFe1f5eIo1OQsQsfdFD4e2v9tmLRV/ uUeoF0hhE3M0xpDqr7NCgy2MFKhobXhTGYaUebQr1ErB3n/6JasZWJpvCQC4R7vPXT XYmKiMV/eP9dIHjYH/1/voSWaRpnlAk1HumGB6ehLFfEg8x+ZOSEF8+jJCxz9DOfwQ twtKDbRt19uhQ== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3563CC00A94; Fri, 12 Apr 2024 12:36:46 +0000 (UTC) From: Fenglin Wu via B4 Relay Date: Fri, 12 Apr 2024 20:36:27 +0800 Subject: [PATCH v10 3/4] dt-bindings: input: qcom,pm8xxx-vib: add new SPMI vibrator module Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240412-pm8xxx-vibrator-new-design-v10-3-0ec0ad133866@quicinc.com> References: <20240412-pm8xxx-vibrator-new-design-v10-0-0ec0ad133866@quicinc.com> In-Reply-To: <20240412-pm8xxx-vibrator-new-design-v10-0-0ec0ad133866@quicinc.com> To: kernel@quicinc.com, Andy Gross , Bjorn Andersson , Konrad Dybcio , Dmitry Torokhov , Rob Herring , Krzysztof Kozlowski , Dmitry Baryshkov Cc: linux-arm-msm@vger.kernel.org, linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Fenglin Wu , Krzysztof Kozlowski X-Mailer: b4 0.13-dev-83828 X-Developer-Signature: v=1; a=ed25519-sha256; t=1712925404; l=1205; i=quic_fenglinw@quicinc.com; s=20240327; h=from:subject:message-id; bh=SwnogURbBf0S1flEa633BZvpsevy5nBnFae6M+y7bFo=; b=vRAKrZLdKGJTfFBsu3P29dwOkEbXB4Ya0eUAZ4z3uV+XbhYEESaht1c+eYBQDYp2T9TH3djoy RK0FN+QV3pDClvAuA7omo6Ion1wmSXkDJwfkN3ZF1r7C/ONIWXOZK27 X-Developer-Key: i=quic_fenglinw@quicinc.com; a=ed25519; pk=BF8SA4IVDk8/EBCwlBehKtn2hp6kipuuAuDAHh9s+K4= X-Endpoint-Received: by B4 Relay for quic_fenglinw@quicinc.com/20240327 with auth_id=146 X-Original-From: Fenglin Wu Reply-To: quic_fenglinw@quicinc.com From: Fenglin Wu Add compatible strings to support vibrator module inside PMI632, PMI7250B, PM7325B, PM7550BA. Reviewed-by: Krzysztof Kozlowski Signed-off-by: Fenglin Wu --- .../devicetree/bindings/input/qcom,pm8xxx-vib.yaml | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/Documentation/devicetree/bindings/input/qcom,pm8xxx-vib.yaml b/Documentation/devicetree/bindings/input/qcom,pm8xxx-vib.yaml index c8832cd0d7da..2025d6a5423e 100644 --- a/Documentation/devicetree/bindings/input/qcom,pm8xxx-vib.yaml +++ b/Documentation/devicetree/bindings/input/qcom,pm8xxx-vib.yaml @@ -11,10 +11,18 @@ maintainers: properties: compatible: - enum: - - qcom,pm8058-vib - - qcom,pm8916-vib - - qcom,pm8921-vib + oneOf: + - enum: + - qcom,pm8058-vib + - qcom,pm8916-vib + - qcom,pm8921-vib + - qcom,pmi632-vib + - items: + - enum: + - qcom,pm7250b-vib + - qcom,pm7325b-vib + - qcom,pm7550ba-vib + - const: qcom,pmi632-vib reg: maxItems: 1 From patchwork Fri Apr 12 12:36:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fenglin Wu via B4 Relay X-Patchwork-Id: 788354 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A0F5859151; Fri, 12 Apr 2024 12:36:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712925406; cv=none; b=GGNQVs0cTZXXrCM+/B6CfjhS9ktZXmHBiIJvuZ+0+Hq9BhEUMWi32VoEdITjL3TvzO+59wq0EEwCUqDXIVYqS3qnedSvxmNxvOeGRfp39fEh0KOGfTdqKzL/NdzHHGwqVcY64SyW3hF0ISHIAZIT7yTX2qH9NHt3F66eiI7Dk/8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712925406; c=relaxed/simple; bh=xFE6yHf+ELaJ65ZtXDVDrnM3v5v9K1M4YZUAaGCz6hU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=L9D3rAODgo3mrC3PBdj9x3YzM5Bf2uKvY1oROYcBscFUjl6e5xFn9AZ3teuoMvV6K8UGesbD1wkx+ftKz61akk3Jieu2Dif4s4EjtZ3hkh9Iqtztfyg2LHO4nIr7IeIuaYBybzKL7bijNmK7CB1Bl4rPPANjq+Mt6R26F7hw22k= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=O52vpQT4; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="O52vpQT4" Received: by smtp.kernel.org (Postfix) with ESMTPS id 4EFB8C4AF0B; Fri, 12 Apr 2024 12:36:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1712925406; bh=xFE6yHf+ELaJ65ZtXDVDrnM3v5v9K1M4YZUAaGCz6hU=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=O52vpQT4trXty8+uUPyJnHsOy+z3I6QMlEx2IPUfF3Aai5WznsvNSHu1bbsHr08M8 mLJ0c1khJ5MFX31E7nLMQf+aZk4OFxKC3Ibi+wOg7s5JSNehyX8IZXPBTcmyf+w2A+ KcS5NRf/dH97k3qDDfaPs0/Z4lrWfizicfHHAAtFUTRqkw7IHW/SpOfUFOdBu8JDBw wwmqj+O+LDp8KrqX4lDwi0BikZ1jsntrsk5qkYpOlb5bKXCLoAh4ZTj9Pz3KXDgvW7 E46T4WHS1h02CWTQ5NXE5yugo6RyzEI02qtdZbWpRmldd1zy1LzxbW50rIsURwXoXa V5mVRSmz3E+Vg== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 43D2FC4345F; Fri, 12 Apr 2024 12:36:46 +0000 (UTC) From: Fenglin Wu via B4 Relay Date: Fri, 12 Apr 2024 20:36:28 +0800 Subject: [PATCH v10 4/4] input: pm8xxx-vibrator: add new SPMI vibrator support Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240412-pm8xxx-vibrator-new-design-v10-4-0ec0ad133866@quicinc.com> References: <20240412-pm8xxx-vibrator-new-design-v10-0-0ec0ad133866@quicinc.com> In-Reply-To: <20240412-pm8xxx-vibrator-new-design-v10-0-0ec0ad133866@quicinc.com> To: kernel@quicinc.com, Andy Gross , Bjorn Andersson , Konrad Dybcio , Dmitry Torokhov , Rob Herring , Krzysztof Kozlowski , Dmitry Baryshkov Cc: linux-arm-msm@vger.kernel.org, linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Fenglin Wu X-Mailer: b4 0.13-dev-83828 X-Developer-Signature: v=1; a=ed25519-sha256; t=1712925404; l=5274; i=quic_fenglinw@quicinc.com; s=20240327; h=from:subject:message-id; bh=mtvq3ksLnluW1t+bHVsls8dPe8UtzlHjlwBNRHuZr8U=; b=MWzogqUr0K1rwZQrUvkBweUGfhJxGrWFNASMzeVu+h/+6tOdmgAzJqpUNVEcOZvzVS4R3Zstd F3NANoCNFSECDM/U3ZMopW7DyO+Ae+54f9tCi4zlVnzHssUkDvPb8xr X-Developer-Key: i=quic_fenglinw@quicinc.com; a=ed25519; pk=BF8SA4IVDk8/EBCwlBehKtn2hp6kipuuAuDAHh9s+K4= X-Endpoint-Received: by B4 Relay for quic_fenglinw@quicinc.com/20240327 with auth_id=146 X-Original-From: Fenglin Wu Reply-To: quic_fenglinw@quicinc.com From: Fenglin Wu Add support for a new SPMI vibrator module which is very similar to the vibrator module inside PM8916 but has a finer drive voltage step and different output voltage range, its drive level control is expanded across 2 registers. The vibrator module can be found in following Qualcomm PMICs: PMI632, PM7250B, PM7325B, PM7550BA. Signed-off-by: Fenglin Wu --- drivers/input/misc/pm8xxx-vibrator.c | 55 ++++++++++++++++++++++++++++++------ 1 file changed, 46 insertions(+), 9 deletions(-) diff --git a/drivers/input/misc/pm8xxx-vibrator.c b/drivers/input/misc/pm8xxx-vibrator.c index 640927f94143..8b9d757d650f 100644 --- a/drivers/input/misc/pm8xxx-vibrator.c +++ b/drivers/input/misc/pm8xxx-vibrator.c @@ -12,10 +12,11 @@ #include #include -#define VIB_MAX_LEVEL_mV (3100) -#define VIB_MIN_LEVEL_mV (1200) -#define VIB_PER_STEP_mV (100) -#define VIB_MAX_LEVELS (VIB_MAX_LEVEL_mV - VIB_MIN_LEVEL_mV + VIB_PER_STEP_mV) +#define VIB_MAX_LEVEL_mV(vib) (vib->drv2_addr ? 3544 : 3100) +#define VIB_MIN_LEVEL_mV(vib) (vib->drv2_addr ? 1504 : 1200) +#define VIB_PER_STEP_mV(vib) (vib->drv2_addr ? 8 : 100) +#define VIB_MAX_LEVELS(vib) \ + (VIB_MAX_LEVEL_mV(vib) - VIB_MIN_LEVEL_mV(vib) + VIB_PER_STEP_mV(vib)) #define MAX_FF_SPEED 0xff @@ -26,7 +27,11 @@ struct pm8xxx_regs { unsigned int drv_offset; unsigned int drv_mask; unsigned int drv_shift; + unsigned int drv2_offset; + unsigned int drv2_mask; + unsigned int drv2_shift; unsigned int drv_en_manual_mask; + bool drv_in_step; }; static const struct pm8xxx_regs pm8058_regs = { @@ -34,6 +39,7 @@ static const struct pm8xxx_regs pm8058_regs = { .drv_mask = 0xf8, .drv_shift = 3, .drv_en_manual_mask = 0xfc, + .drv_in_step = true, }; static struct pm8xxx_regs pm8916_regs = { @@ -43,6 +49,20 @@ static struct pm8xxx_regs pm8916_regs = { .drv_mask = 0x1f, .drv_shift = 0, .drv_en_manual_mask = 0, + .drv_in_step = true, +}; + +static struct pm8xxx_regs pmi632_regs = { + .enable_offset = 0x46, + .enable_mask = BIT(7), + .drv_offset = 0x40, + .drv_mask = GENMASK(7, 0), + .drv_shift = 0, + .drv2_offset = 0x41, + .drv2_mask = GENMASK(3, 0), + .drv2_shift = 8, + .drv_en_manual_mask = 0, + .drv_in_step = false, }; /** @@ -53,6 +73,7 @@ static struct pm8xxx_regs pm8916_regs = { * @regs: registers' info * @enable_addr: vibrator enable register * @drv_addr: vibrator drive strength register + * @drv2_addr: vibrator drive strength upper byte register * @speed: speed of vibration set from userland * @active: state of vibrator * @level: level of vibration to set in the chip @@ -65,6 +86,7 @@ struct pm8xxx_vib { const struct pm8xxx_regs *regs; unsigned int enable_addr; unsigned int drv_addr; + unsigned int drv2_addr; int speed; int level; bool active; @@ -82,6 +104,9 @@ static int pm8xxx_vib_set(struct pm8xxx_vib *vib, bool on) unsigned int val = vib->reg_vib_drv; const struct pm8xxx_regs *regs = vib->regs; + if (regs->drv_in_step) + vib->level /= VIB_PER_STEP_mV(vib); + if (on) val |= (vib->level << regs->drv_shift) & regs->drv_mask; else @@ -93,6 +118,17 @@ static int pm8xxx_vib_set(struct pm8xxx_vib *vib, bool on) vib->reg_vib_drv = val; + if (regs->drv2_mask) { + if (on) + val = (vib->level << regs->drv2_shift) & regs->drv2_mask; + else + val = 0; + + rc = regmap_write_bits(vib->regmap, vib->drv2_addr, regs->drv2_mask, val); + if (rc < 0) + return rc; + } + if (regs->enable_mask) rc = regmap_update_bits(vib->regmap, vib->enable_addr, regs->enable_mask, on ? regs->enable_mask : 0); @@ -115,17 +151,16 @@ static void pm8xxx_work_handler(struct work_struct *work) return; /* - * pmic vibrator supports voltage ranges from 1.2 to 3.1V, so + * pmic vibrator supports voltage ranges from MIN_LEVEL to MAX_LEVEL, so * scale the level to fit into these ranges. */ if (vib->speed) { vib->active = true; - vib->level = ((VIB_MAX_LEVELS * vib->speed) / MAX_FF_SPEED) + - VIB_MIN_LEVEL_mV; - vib->level /= VIB_PER_STEP_mV; + vib->level = VIB_MIN_LEVEL_mV(vib); + vib->level += mult_frac(VIB_MAX_LEVELS(vib), vib->speed, MAX_FF_SPEED); } else { vib->active = false; - vib->level = VIB_MIN_LEVEL_mV / VIB_PER_STEP_mV; + vib->level = VIB_MIN_LEVEL_mV(vib); } pm8xxx_vib_set(vib, vib->active); @@ -200,6 +235,7 @@ static int pm8xxx_vib_probe(struct platform_device *pdev) regs = of_device_get_match_data(&pdev->dev); vib->enable_addr = reg_base + regs->enable_offset; vib->drv_addr = reg_base + regs->drv_offset; + vib->drv2_addr = reg_base + regs->drv2_offset; /* operate in manual mode */ error = regmap_read(vib->regmap, vib->drv_addr, &val); @@ -254,6 +290,7 @@ static const struct of_device_id pm8xxx_vib_id_table[] = { { .compatible = "qcom,pm8058-vib", .data = &pm8058_regs }, { .compatible = "qcom,pm8921-vib", .data = &pm8058_regs }, { .compatible = "qcom,pm8916-vib", .data = &pm8916_regs }, + { .compatible = "qcom,pmi632-vib", .data = &pmi632_regs }, { } }; MODULE_DEVICE_TABLE(of, pm8xxx_vib_id_table);