From patchwork Mon Jun 22 12:41:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sumit Semwal X-Patchwork-Id: 11617613 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 684F6912 for ; Mon, 22 Jun 2020 12:41:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4911A20732 for ; Mon, 22 Jun 2020 12:41:30 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="NkDb2DIJ" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728199AbgFVMl0 (ORCPT ); Mon, 22 Jun 2020 08:41:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40342 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728192AbgFVMl0 (ORCPT ); Mon, 22 Jun 2020 08:41:26 -0400 Received: from mail-pj1-x1043.google.com (mail-pj1-x1043.google.com [IPv6:2607:f8b0:4864:20::1043]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 23542C061795 for ; Mon, 22 Jun 2020 05:41:25 -0700 (PDT) Received: by mail-pj1-x1043.google.com with SMTP id h22so8564054pjf.1 for ; Mon, 22 Jun 2020 05:41:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=MSKivOm6p95vIF+xsCRXaxJ3RfMT5lkhjSXb8u6KQ/A=; b=NkDb2DIJjstzdPiJdgcoV7o5+9TSMEIkFBQ+LImKCcn68yw1O6jSJ0sJS3RUovdmvJ ZhrNk7JcomCIeopxGzxo/wiVYUYeX1Cv/kJoXZz0R+rpgvd1RWiMaOgaRJWIEzBK3n16 N+dxNCqAhAqJJzL5AFAITBdwNUjof2bNxUUCX5X+7CNtXBmcdO3EgO4/uEsdOTb9oSEC pf2XsmG4GkSU2lshTb0Nw++svCUpbOFDqbHUDET+TwZVa4RGien0pdR6mLLpnm5zFKDX izayXw0yxcrHkDSDqLYe+aBdXmTfUgFMsjO6XBz5cR4Fbw16ziPdWjH+Z9f1cAnEozOh eI9g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=MSKivOm6p95vIF+xsCRXaxJ3RfMT5lkhjSXb8u6KQ/A=; b=hFh8gJGjYwx6gXA6JszIXAFtBI65J2dkwsrzlNGmULTRFznfTlkjZ9ooTbCp2URjDE u0GDVp1+xfSBzJdf8jsiJDJS0pzf2UGiKzlsEIo5Tes0vBNqgdVANJez0PU3Ry0hXnAA BIGKtZ+17O2btMayBVOev2QpTp2aVZTctxZwi0etKJYk/Wc5u6ZHfMmeVBcYYfCafgt7 scEurbkCDKkCurf/VjTBDDgftMNnHRsOO1rBpAA2DuDHCWXf6CrlX1VRUYLhAsVhHWFi WHnLuIZahs77zAr13D9lRTpz68GnZdN+jP9CwhfOBlEGAhu7ya8qG06zqd6YiC5v1BJq WtaA== X-Gm-Message-State: AOAM530+jGNtoXNAEATrYLP5Huvur0C6PcF/LNflhzISp5kJFD9rhuz1 HE2yZJguDjdMwz6i6s21dz+Stw== X-Google-Smtp-Source: ABdhPJyG2/JwS7bC4HVB0uvJoH/UbZ7OpMiVe3Q06q9v0mo7oPqV1SK3siOBx609yancSdugVYIVTQ== X-Received: by 2002:a17:902:8694:: with SMTP id g20mr19560597plo.332.1592829684630; Mon, 22 Jun 2020 05:41:24 -0700 (PDT) Received: from nagraj.local ([49.206.21.239]) by smtp.gmail.com with ESMTPSA id i62sm14590581pfg.90.2020.06.22.05.41.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Jun 2020 05:41:24 -0700 (PDT) From: Sumit Semwal To: agross@kernel.org, bjorn.andersson@linaro.org, lgirdwood@gmail.com, broonie@kernel.org, robh+dt@kernel.org Cc: nishakumari@codeaurora.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, kgunda@codeaurora.org, rnayak@codeaurora.org, Sumit Semwal Subject: [PATCH v5 1/4] regulator: Allow regulators to verify enabled during enable() Date: Mon, 22 Jun 2020 18:11:07 +0530 Message-Id: <20200622124110.20971-2-sumit.semwal@linaro.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200622124110.20971-1-sumit.semwal@linaro.org> References: <20200622124110.20971-1-sumit.semwal@linaro.org> MIME-Version: 1.0 Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Some regulators might need to verify that they have indeed been enabled after the enable() call is made and enable_time delay has passed. This is implemented by repeatedly checking is_enabled() upto poll_enabled_time, waiting for the already calculated enable delay in each iteration. Signed-off-by: Sumit Semwal --- v3: addressed minor review comments, improved kernel doc v2: Address review comments, including swapping enable_time and poll_enabled_time. --- drivers/regulator/core.c | 63 +++++++++++++++++++++++++++++++- include/linux/regulator/driver.h | 5 +++ 2 files changed, 67 insertions(+), 1 deletion(-) diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index 03154f5b939f..538a2779986a 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -2347,6 +2347,37 @@ static void _regulator_enable_delay(unsigned int delay) udelay(us); } +/** + * _regulator_check_status_enabled + * + * A helper function to check if the regulator status can be interpreted + * as 'regulator is enabled'. + * @rdev: the regulator device to check + * + * Return: + * * 1 - if status shows regulator is in enabled state + * * 0 - if not enabled state + * * Error Value - as received from ops->get_status() + */ +static inline int _regulator_check_status_enabled(struct regulator_dev *rdev) +{ + int ret = rdev->desc->ops->get_status(rdev); + + if (ret < 0) { + rdev_info(rdev, "get_status returned error: %d\n", ret); + return ret; + } + + switch (ret) { + case REGULATOR_STATUS_OFF: + case REGULATOR_STATUS_ERROR: + case REGULATOR_STATUS_UNDEFINED: + return 0; + default: + return 1; + } +} + static int _regulator_do_enable(struct regulator_dev *rdev) { int ret, delay; @@ -2407,7 +2438,37 @@ static int _regulator_do_enable(struct regulator_dev *rdev) * together. */ trace_regulator_enable_delay(rdev_get_name(rdev)); - _regulator_enable_delay(delay); + /* If poll_enabled_time is set, poll upto the delay calculated + * above, delaying poll_enabled_time uS to check if the regulator + * actually got enabled. + * If the regulator isn't enabled after enable_delay has + * expired, return -ETIMEDOUT. + */ + if (rdev->desc->poll_enabled_time) { + unsigned int time_remaining = delay; + + while (time_remaining > 0) { + _regulator_enable_delay(rdev->desc->poll_enabled_time); + + if (rdev->desc->ops->get_status) { + ret = _regulator_check_status_enabled(rdev); + if (ret < 0) + return ret; + else if (ret) + break; + } else if (rdev->desc->ops->is_enabled(rdev)) + break; + + time_remaining -= rdev->desc->poll_enabled_time; + } + + if (time_remaining <= 0) { + rdev_err(rdev, "Enabled check timed out\n"); + return -ETIMEDOUT; + } + } else { + _regulator_enable_delay(delay); + } trace_regulator_enable_complete(rdev_get_name(rdev)); diff --git a/include/linux/regulator/driver.h b/include/linux/regulator/driver.h index 7eb9fea8e482..436df3ba0b2a 100644 --- a/include/linux/regulator/driver.h +++ b/include/linux/regulator/driver.h @@ -305,6 +305,9 @@ enum regulator_type { * @enable_time: Time taken for initial enable of regulator (in uS). * @off_on_delay: guard time (in uS), before re-enabling a regulator * + * @poll_enabled_time: The polling interval (in uS) to use while checking that + * the regulator was actually enabled. Max upto enable_time. + * * @of_map_mode: Maps a hardware mode defined in a DeviceTree to a standard mode */ struct regulator_desc { @@ -372,6 +375,8 @@ struct regulator_desc { unsigned int off_on_delay; + unsigned int poll_enabled_time; + unsigned int (*of_map_mode)(unsigned int mode); }; From patchwork Mon Jun 22 12:41:08 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sumit Semwal X-Patchwork-Id: 11617615 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 78F13912 for ; Mon, 22 Jun 2020 12:41:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 606D220767 for ; Mon, 22 Jun 2020 12:41:33 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="R4lWAbAy" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728225AbgFVMlc (ORCPT ); Mon, 22 Jun 2020 08:41:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40354 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726652AbgFVMl3 (ORCPT ); Mon, 22 Jun 2020 08:41:29 -0400 Received: from mail-pj1-x1041.google.com (mail-pj1-x1041.google.com [IPv6:2607:f8b0:4864:20::1041]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BE8E4C061794 for ; Mon, 22 Jun 2020 05:41:28 -0700 (PDT) Received: by mail-pj1-x1041.google.com with SMTP id d6so8554807pjs.3 for ; Mon, 22 Jun 2020 05:41:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=LrEMg7fVwuiooc5MLW1OYb4mtJllfG4D6r8RWT/b3sw=; b=R4lWAbAyHu9KxYc2D26QmPW0EzdSxRA14BMpucKfCZKXmWSS5xQPtp1KPUl/5gc1yM 45xbjqEWZNUzicGnVd0h97NXUOHwfNtutRUkkFvyF42E2HdGKQI8vyhmq0jqolso5Ubt iJy6t2lCfL/MyS3nhniaBsv/+FzEQ6FMnZ8X4NskCUTjOE9HKuMS2BPzyPKIpmBuWCNc ThozBEdrLUBljKvhN6Y4wYTaj5oBIFz/6KAGf0p364/QbGZOaG3pnWP7yXbx9Q/a8brj f/Neu1dgNDj41iC93Sv6Arqx07vjhGAUslNeIH/y0ynZwv+wE07bJEGJIOIDI3IzNGTl qRig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=LrEMg7fVwuiooc5MLW1OYb4mtJllfG4D6r8RWT/b3sw=; b=FdMNhutEq8wMrAw1NnTrqLB6grOevfmM3YLKBan0jZ7NDEkj/0Xq/L8Jy+++1u/XzY MWSAoV86F8Evr6w7MC5ETAzIxkMm+83shFOvaYxZ5HcRnqLQTw4QcOxhIEejaabgYBYd xna/jU1+Dkn3XfV7cXGdrOOYEFxYSLEcHphWfCn8DBu302X2Ub3WPpe9Y/lzYdwWeMlK Dgb5MUIM29oVkWy4rOO2Yhxzoskrz/+0kval2GPquOmIlaJqDA6hOJCsdxxL8JCogBUk bY3i4/JVZFslqaNb6tTXy+1up44NIzB8jO00XSmDG9P6iC2dGckjD8TkzuQPYpFiDL6I 5PzA== X-Gm-Message-State: AOAM533tp9EccRnyWTSTWzojUmsZiXvZPAXevMctuNRyUOwjsesAKX5i Nb8LLz8gGuN48C8oRgCKunQvqw== X-Google-Smtp-Source: ABdhPJzn8RCLDFgMrFmjXQEX4QECyCA6DythMPfZnclKCrsKrurpMrPKXQFV/t/mBRGPLI4Vjzl9fQ== X-Received: by 2002:a17:90a:5c82:: with SMTP id r2mr7768404pji.161.1592829688267; Mon, 22 Jun 2020 05:41:28 -0700 (PDT) Received: from nagraj.local ([49.206.21.239]) by smtp.gmail.com with ESMTPSA id i62sm14590581pfg.90.2020.06.22.05.41.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Jun 2020 05:41:27 -0700 (PDT) From: Sumit Semwal To: agross@kernel.org, bjorn.andersson@linaro.org, lgirdwood@gmail.com, broonie@kernel.org, robh+dt@kernel.org Cc: nishakumari@codeaurora.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, kgunda@codeaurora.org, rnayak@codeaurora.org, Sumit Semwal Subject: [PATCH v5 2/4] dt-bindings: regulator: Add labibb regulator Date: Mon, 22 Jun 2020 18:11:08 +0530 Message-Id: <20200622124110.20971-3-sumit.semwal@linaro.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200622124110.20971-1-sumit.semwal@linaro.org> References: <20200622124110.20971-1-sumit.semwal@linaro.org> MIME-Version: 1.0 Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org From: Nisha Kumari Adding the devicetree binding for labibb regulator. Signed-off-by: Nisha Kumari Signed-off-by: Sumit Semwal [sumits: cleanup as per review comments and update to yaml] Reviewed-by: Rob Herring --- v5: Addressed review comments - removed interrupt-names, changed to dual license, added unevaluatedProperties: false v4: fixed dt_binding_check issues v3: moved to yaml v2: updated for better compatible string and names. --- .../regulator/qcom-labibb-regulator.yaml | 70 +++++++++++++++++++ 1 file changed, 70 insertions(+) create mode 100644 Documentation/devicetree/bindings/regulator/qcom-labibb-regulator.yaml diff --git a/Documentation/devicetree/bindings/regulator/qcom-labibb-regulator.yaml b/Documentation/devicetree/bindings/regulator/qcom-labibb-regulator.yaml new file mode 100644 index 000000000000..085cbd1ad8d0 --- /dev/null +++ b/Documentation/devicetree/bindings/regulator/qcom-labibb-regulator.yaml @@ -0,0 +1,70 @@ +# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/regulator/qcom-labibb-regulator.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Qualcomm's LAB(LCD AMOLED Boost)/IBB(Inverting Buck Boost) Regulator + +maintainers: + - Sumit Semwal + +description: + LAB can be used as a positive boost power supply and IBB can be used as a + negative boost power supply for display panels. Currently implemented for + pmi8998. + +properties: + compatible: + const: qcom,pmi8998-lab-ibb + + lab: + type: object + + properties: + + interrupts: + maxItems: 1 + description: + Short-circuit interrupt for lab. + + required: + - interrupts + + ibb: + type: object + + properties: + + interrupts: + maxItems: 1 + description: + Short-circuit interrupt for lab. + + required: + - interrupts + +required: + - compatible + +unevaluatedProperties: false + +examples: + - | + #include + + labibb { + compatible = "qcom,pmi8998-lab-ibb"; + + lab { + interrupts = <0x3 0x0 IRQ_TYPE_EDGE_RISING>; + interrupt-names = "sc-err"; + }; + + ibb { + interrupts = <0x3 0x2 IRQ_TYPE_EDGE_RISING>; + interrupt-names = "sc-err"; + }; + }; + +... From patchwork Mon Jun 22 12:41:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sumit Semwal X-Patchwork-Id: 11617617 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id EF3EE90 for ; Mon, 22 Jun 2020 12:41:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D730420739 for ; Mon, 22 Jun 2020 12:41:37 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="ZOojp91P" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728211AbgFVMlf (ORCPT ); Mon, 22 Jun 2020 08:41:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40374 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728220AbgFVMlc (ORCPT ); Mon, 22 Jun 2020 08:41:32 -0400 Received: from mail-pf1-x442.google.com (mail-pf1-x442.google.com [IPv6:2607:f8b0:4864:20::442]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6609EC061797 for ; Mon, 22 Jun 2020 05:41:32 -0700 (PDT) Received: by mail-pf1-x442.google.com with SMTP id j1so8368768pfe.4 for ; Mon, 22 Jun 2020 05:41:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=gVIUeXQMCzWAcTP6WaAZI7/yPZyluiCjZUpguitY3Jw=; b=ZOojp91Pido+aL3yZ7zrmjtfRZ8Rj0b57hyjeHOQp6DeGl5HWGlCbn6CRDcFZ6x2TQ OGjgXQAYk9vb5Z6Pns/GOLInjxC0/4F9IVjUZpuj15j7HlFCH5reerk6T/pN0KRwU9Bb u0IQ2vcQpjjAP0z87Lus7w/xu7CknL7VSWrti80qeROkDVNoS2gM/1P7lJEnzGJzzQM9 LBbyXm4aUXqYMGPsMUFksBvsmj1K3Rcs4ic+kxJypBQ3w16Q6rm7xi0l9Ul4OM168xVh PjeK/Shfu4r4EkO4Yt9B0Jb4KqSMnjckWITV77AdmF5ymk/DolM516H29m3oan9c6RWv +jAA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=gVIUeXQMCzWAcTP6WaAZI7/yPZyluiCjZUpguitY3Jw=; b=N9y0l1jrE/LP2MgKzmSRkr3cl1zubswZVjvb7NVVZkUhJg82JoXtcIu9dudY0ttReO Nez8EV9/3AY5YQUhISJE4aeOweCq8loDIWEagQRbPjHZkM+4tjv+DlUjhk09raCRBd+1 9o+CRqtiASc7jg/ykVTgt92dYVxbLRRLPCUPtqbQNfhfBgmUCkZNvD1cOEKbj8+xOI1n BXEZkIDtaWqqIAHSte8SsMpSK2tgJPUMrc4jJHE1tC2UqbnD4L0ni4FkTuww+hAF1TBr fPbvF+0tWaLJBkNNkaojAFB38/K7PmqWv89bhHdGpHg6pjJlNpKsVbRSYI98J97TbyX8 mw/g== X-Gm-Message-State: AOAM532gnVilI+xjljUaEBnJEMMmwFPeWpcgwCe/XJg1MZ132J7yuBsI adBbC7Yb7hsNwczue7fD0uXeUrIvO72pBS16 X-Google-Smtp-Source: ABdhPJyKEJiZz5eiUolIb6ebzSomKmKeC2lbQasGljaZr3D0E5NLOjUhinZlJgNU+qTJaWl0NaR8gQ== X-Received: by 2002:aa7:96b0:: with SMTP id g16mr20562410pfk.126.1592829691927; Mon, 22 Jun 2020 05:41:31 -0700 (PDT) Received: from nagraj.local ([49.206.21.239]) by smtp.gmail.com with ESMTPSA id i62sm14590581pfg.90.2020.06.22.05.41.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Jun 2020 05:41:31 -0700 (PDT) From: Sumit Semwal To: agross@kernel.org, bjorn.andersson@linaro.org, lgirdwood@gmail.com, broonie@kernel.org, robh+dt@kernel.org Cc: nishakumari@codeaurora.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, kgunda@codeaurora.org, rnayak@codeaurora.org, Sumit Semwal Subject: [PATCH v5 3/4] arm64: dts: qcom: pmi8998: Add nodes for LAB and IBB regulators Date: Mon, 22 Jun 2020 18:11:09 +0530 Message-Id: <20200622124110.20971-4-sumit.semwal@linaro.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200622124110.20971-1-sumit.semwal@linaro.org> References: <20200622124110.20971-1-sumit.semwal@linaro.org> MIME-Version: 1.0 Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org From: Nisha Kumari This patch adds devicetree nodes for LAB and IBB regulators. Signed-off-by: Nisha Kumari Signed-off-by: Sumit Semwal [sumits: Updated for better compatible strings and names] --- v5: sumits: removed interrupt-names, since there is only one interrupt per node v4: sumits: removed labibb label which is not needed v3: sumits: updated interrupt-names as per review comments v2: sumits: updated for better compatible string and names --- arch/arm64/boot/dts/qcom/pmi8998.dtsi | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/pmi8998.dtsi b/arch/arm64/boot/dts/qcom/pmi8998.dtsi index 23f9146a161e..d016b12967eb 100644 --- a/arch/arm64/boot/dts/qcom/pmi8998.dtsi +++ b/arch/arm64/boot/dts/qcom/pmi8998.dtsi @@ -25,5 +25,17 @@ pmi8998_lsid1: pmic@3 { reg = <0x3 SPMI_USID>; #address-cells = <1>; #size-cells = <0>; + + labibb { + compatible = "qcom,pmi8998-lab-ibb"; + + ibb: ibb { + interrupts = <0x3 0xdc 0x2 IRQ_TYPE_EDGE_RISING>; + }; + + lab: lab { + interrupts = <0x3 0xde 0x0 IRQ_TYPE_EDGE_RISING>; + }; + }; }; }; From patchwork Mon Jun 22 12:41:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sumit Semwal X-Patchwork-Id: 11617619 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id DC19D912 for ; Mon, 22 Jun 2020 12:41:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id BD84320732 for ; Mon, 22 Jun 2020 12:41:38 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="iQzatJcu" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728258AbgFVMli (ORCPT ); Mon, 22 Jun 2020 08:41:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40386 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728243AbgFVMlg (ORCPT ); Mon, 22 Jun 2020 08:41:36 -0400 Received: from mail-pf1-x443.google.com (mail-pf1-x443.google.com [IPv6:2607:f8b0:4864:20::443]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 52693C061794 for ; Mon, 22 Jun 2020 05:41:36 -0700 (PDT) Received: by mail-pf1-x443.google.com with SMTP id z63so8369697pfb.1 for ; Mon, 22 Jun 2020 05:41:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=doG+Qibpx9UFueyy0W0CrVNyS15JzsuLsQupBt9QvgE=; b=iQzatJcuL9WDIP4KEVDiKSFveg8Z6pgISK4ejtUpZTwbG7IRlVUv4Mf/wnJs42D4Dv 70Hx3RD3MobgA5MXVgVPMF4k2IhgcVOecPttAD1gXYJG9jELvhVObPBiJ1o5faeRZktC 66z1azO20UW7HnLGftv1okbgf+dZ1njRKAlIJwi4Wdmzg3D5BHSbxo3MxrJV4j/R9fnX BK6cNF8RIFoZyUIAmCEMpiXh/4xH14MUZ4PDB156Uh9DXcPnj2Vr0yXVxjx5heiKHF4R aRwcIF3A8lHd+zHQO9UxGr4z4lMkFYaS2Pk1gC0ViH7fH7QodpaL3id9oKVAxlDXj0oE IEDA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=doG+Qibpx9UFueyy0W0CrVNyS15JzsuLsQupBt9QvgE=; b=mPJ1roa2Q7rsG1qbL5isLwgouF5SHwoOY4BkkOewGoOHvsaXkpXQadsusmjAA8xNxk urtfT18rQK6Yrsnh2CGrV2Ry7dB+lY3TzPjvfuMVeDcupB12KXwahye44UPR7RhtvP5/ H2h2p922w8Xjkhy+0z6u3R8sJGAYZfvR5dNZwntxdTf+jAV5dYn2g4ei+R5KdzAxCV4C Y7je/jqruCOasmXCpdx7PkT/uOLih69Yug6AfRrZscerbwHK8pLZxrZs/f3jnhH+w4WC 4JJZet+V5ZQkgIxmoLS8svJ3FCTmY6XWi1fim2e4RlXeO1Sh3uXj3WMdOGO7SkxuF7wP /yWg== X-Gm-Message-State: AOAM531Ey7dcVZH7PAkjsWvDnWHSpCPTNHFe0q/b+Nmm6UfMfrqfYb5h 693bcsTyRLls+3FKFoO3hIAC0g== X-Google-Smtp-Source: ABdhPJxCieCQSLmPNdyAB5ZCSv2fxRpAFBKFrnxFg2tSTBO3DVw+rZwT5Thxv2w8QpFlBlREe7oRMg== X-Received: by 2002:a62:8608:: with SMTP id x8mr19358832pfd.96.1592829695710; Mon, 22 Jun 2020 05:41:35 -0700 (PDT) Received: from nagraj.local ([49.206.21.239]) by smtp.gmail.com with ESMTPSA id i62sm14590581pfg.90.2020.06.22.05.41.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Jun 2020 05:41:35 -0700 (PDT) From: Sumit Semwal To: agross@kernel.org, bjorn.andersson@linaro.org, lgirdwood@gmail.com, broonie@kernel.org, robh+dt@kernel.org Cc: nishakumari@codeaurora.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, kgunda@codeaurora.org, rnayak@codeaurora.org, Sumit Semwal Subject: [PATCH v5 4/4] regulator: qcom: Add labibb driver Date: Mon, 22 Jun 2020 18:11:10 +0530 Message-Id: <20200622124110.20971-5-sumit.semwal@linaro.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200622124110.20971-1-sumit.semwal@linaro.org> References: <20200622124110.20971-1-sumit.semwal@linaro.org> MIME-Version: 1.0 Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org From: Nisha Kumari Qualcomm platforms have LAB(LCD AMOLED Boost)/IBB(Inverting Buck Boost) regulators, labibb for short, which are used as power supply for LCD Mode displays. This patch adds labibb regulator driver for pmi8998 PMIC, found on SDM845 platforms. Signed-off-by: Nisha Kumari [sumits: reworked the driver design as per upstream review] Signed-off-by: Sumit Semwal --- v5: sumits: review comments addressed - removed dev_info about registering - removed of_get_child_by_name() - changed from using STATUS1 register to using ENABLE_CTL; this allows us to use the regulator_*_regmap helpers and makes this code cleaner. (In limited testing, STATUS1 seemed to report the change faster than ENABLE_CTL, but in absence of mechanism to validate if the regulator has indeed fully ramped when STATUS1 starts flagging, broonie suggested to use the slower ENABLE_CTL path for safety). v4: sumits: address review comments from v3, including cleaning up register_labibb_regulator(), and adapted to updated meaning of poll_enabled_time. v3: sumits: addressed review comments from v2; moved to use core regulator features like enable_time, off_on_delay, and the newly added poll_enabled_time. Moved the check_enabled functionality to core framework via poll_enabled_time. v2: sumits: reworked the driver for more common code, and addressed review comments from v1 --- drivers/regulator/Kconfig | 10 ++ drivers/regulator/Makefile | 1 + drivers/regulator/qcom-labibb-regulator.c | 175 ++++++++++++++++++++++ 3 files changed, 186 insertions(+) create mode 100644 drivers/regulator/qcom-labibb-regulator.c diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig index 8f677f5d79b4..c6377df023bc 100644 --- a/drivers/regulator/Kconfig +++ b/drivers/regulator/Kconfig @@ -1178,5 +1178,15 @@ config REGULATOR_WM8994 This driver provides support for the voltage regulators on the WM8994 CODEC. +config REGULATOR_QCOM_LABIBB + tristate "QCOM LAB/IBB regulator support" + depends on SPMI || COMPILE_TEST + help + This driver supports Qualcomm's LAB/IBB regulators present on the + Qualcomm's PMIC chip pmi8998. QCOM LAB and IBB are SPMI + based PMIC implementations. LAB can be used as positive + boost regulator and IBB can be used as a negative boost regulator + for LCD display panel. + endif diff --git a/drivers/regulator/Makefile b/drivers/regulator/Makefile index e8f163371071..2c2b0861df76 100644 --- a/drivers/regulator/Makefile +++ b/drivers/regulator/Makefile @@ -88,6 +88,7 @@ obj-$(CONFIG_REGULATOR_MT6323) += mt6323-regulator.o obj-$(CONFIG_REGULATOR_MT6358) += mt6358-regulator.o obj-$(CONFIG_REGULATOR_MT6380) += mt6380-regulator.o obj-$(CONFIG_REGULATOR_MT6397) += mt6397-regulator.o +obj-$(CONFIG_REGULATOR_QCOM_LABIBB) += qcom-labibb-regulator.o obj-$(CONFIG_REGULATOR_QCOM_RPM) += qcom_rpm-regulator.o obj-$(CONFIG_REGULATOR_QCOM_RPMH) += qcom-rpmh-regulator.o obj-$(CONFIG_REGULATOR_QCOM_SMD_RPM) += qcom_smd-regulator.o diff --git a/drivers/regulator/qcom-labibb-regulator.c b/drivers/regulator/qcom-labibb-regulator.c new file mode 100644 index 000000000000..8c7dd1928380 --- /dev/null +++ b/drivers/regulator/qcom-labibb-regulator.c @@ -0,0 +1,175 @@ +// SPDX-License-Identifier: GPL-2.0-only +// Copyright (c) 2020, The Linux Foundation. All rights reserved. + +#include +#include +#include +#include +#include +#include +#include +#include + +#define REG_PERPH_TYPE 0x04 + +#define QCOM_LAB_TYPE 0x24 +#define QCOM_IBB_TYPE 0x20 + +#define PMI8998_LAB_REG_BASE 0xde00 +#define PMI8998_IBB_REG_BASE 0xdc00 + +#define REG_LABIBB_STATUS1 0x08 +#define REG_LABIBB_ENABLE_CTL 0x46 +#define LABIBB_STATUS1_VREG_OK_BIT BIT(7) +#define LABIBB_CONTROL_ENABLE BIT(7) + +#define LAB_ENABLE_CTL_MASK BIT(7) +#define IBB_ENABLE_CTL_MASK (BIT(7) | BIT(6)) + +#define LABIBB_OFF_ON_DELAY 1000 +#define LAB_ENABLE_TIME (LABIBB_OFF_ON_DELAY * 2) +#define IBB_ENABLE_TIME (LABIBB_OFF_ON_DELAY * 10) +#define LABIBB_POLL_ENABLED_TIME 1000 + +struct labibb_regulator { + struct regulator_desc desc; + struct device *dev; + struct regmap *regmap; + struct regulator_dev *rdev; + u16 base; + u8 type; +}; + +struct labibb_regulator_data { + const char *name; + u8 type; + u16 base; + struct regulator_desc *desc; +}; + +static struct regulator_ops qcom_labibb_ops = { + .enable = regulator_enable_regmap, + .disable = regulator_disable_regmap, + .is_enabled = regulator_is_enabled_regmap, +}; + +static struct regulator_desc pmi8998_lab_desc = { + .enable_mask = LAB_ENABLE_CTL_MASK, + .enable_reg = (PMI8998_LAB_REG_BASE + REG_LABIBB_ENABLE_CTL), + .enable_val = LABIBB_CONTROL_ENABLE, + .enable_time = LAB_ENABLE_TIME, + .poll_enabled_time = LABIBB_POLL_ENABLED_TIME, + .off_on_delay = LABIBB_OFF_ON_DELAY, + .owner = THIS_MODULE, + .type = REGULATOR_VOLTAGE, + .ops = &qcom_labibb_ops, +}; + +static struct regulator_desc pmi8998_ibb_desc = { + .enable_mask = IBB_ENABLE_CTL_MASK, + .enable_reg = (PMI8998_IBB_REG_BASE + REG_LABIBB_ENABLE_CTL), + .enable_val = LABIBB_CONTROL_ENABLE, + .enable_time = IBB_ENABLE_TIME, + .poll_enabled_time = LABIBB_POLL_ENABLED_TIME, + .off_on_delay = LABIBB_OFF_ON_DELAY, + .owner = THIS_MODULE, + .type = REGULATOR_VOLTAGE, + .ops = &qcom_labibb_ops, +}; + +static const struct labibb_regulator_data pmi8998_labibb_data[] = { + {"lab", QCOM_LAB_TYPE, PMI8998_LAB_REG_BASE, &pmi8998_lab_desc}, + {"ibb", QCOM_IBB_TYPE, PMI8998_IBB_REG_BASE, &pmi8998_ibb_desc}, + { }, +}; + +static const struct of_device_id qcom_labibb_match[] = { + { .compatible = "qcom,pmi8998-lab-ibb", .data = &pmi8998_labibb_data}, + { }, +}; +MODULE_DEVICE_TABLE(of, qcom_labibb_match); + +static int qcom_labibb_regulator_probe(struct platform_device *pdev) +{ + struct labibb_regulator *vreg; + struct device *dev = &pdev->dev; + struct regulator_config cfg = {}; + + const struct of_device_id *match; + const struct labibb_regulator_data *reg_data; + struct regmap *reg_regmap; + unsigned int type; + int ret; + + reg_regmap = dev_get_regmap(pdev->dev.parent, NULL); + if (!reg_regmap) { + dev_err(&pdev->dev, "Couldn't get parent's regmap\n"); + return -ENODEV; + } + + match = of_match_device(qcom_labibb_match, &pdev->dev); + if (!match) + return -ENODEV; + + for (reg_data = match->data; reg_data->name; reg_data++) { + + /* Validate if the type of regulator is indeed + * what's mentioned in DT. + */ + ret = regmap_read(reg_regmap, reg_data->base + REG_PERPH_TYPE, + &type); + if (ret < 0) { + dev_err(dev, + "Peripheral type read failed ret=%d\n", + ret); + return -EINVAL; + } + + if (WARN_ON((type != QCOM_LAB_TYPE) && (type != QCOM_IBB_TYPE)) || + WARN_ON(type != reg_data->type)) + return -EINVAL; + + vreg = devm_kzalloc(&pdev->dev, sizeof(*vreg), + GFP_KERNEL); + if (!vreg) + return -ENOMEM; + + vreg->regmap = reg_regmap; + vreg->dev = dev; + vreg->base = reg_data->base; + vreg->type = reg_data->type; + + memcpy(&vreg->desc, reg_data->desc, sizeof(vreg->desc)); + vreg->desc.of_match = reg_data->name; + vreg->desc.name = reg_data->name; + + cfg.dev = vreg->dev; + cfg.driver_data = vreg; + cfg.regmap = vreg->regmap; + + vreg->rdev = devm_regulator_register(vreg->dev, &vreg->desc, + &cfg); + + if (IS_ERR(vreg->rdev)) { + dev_err(dev, "qcom_labibb: error registering %s : %d\n", + reg_data->name, ret); + return PTR_ERR(vreg->rdev); + } + } + + return 0; +} + +static struct platform_driver qcom_labibb_regulator_driver = { + .driver = { + .name = "qcom-lab-ibb-regulator", + .of_match_table = qcom_labibb_match, + }, + .probe = qcom_labibb_regulator_probe, +}; +module_platform_driver(qcom_labibb_regulator_driver); + +MODULE_DESCRIPTION("Qualcomm labibb driver"); +MODULE_AUTHOR("Nisha Kumari "); +MODULE_AUTHOR("Sumit Semwal "); +MODULE_LICENSE("GPL v2");