From patchwork Tue Jul 19 13:51:26 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 9237497 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id D624D6075D for ; Tue, 19 Jul 2016 13:52:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C5ADB27165 for ; Tue, 19 Jul 2016 13:52:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BA28827569; Tue, 19 Jul 2016 13:52:03 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2CE5B271FD for ; Tue, 19 Jul 2016 13:52:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754068AbcGSNvu (ORCPT ); Tue, 19 Jul 2016 09:51:50 -0400 Received: from mail-wm0-f44.google.com ([74.125.82.44]:33804 "EHLO mail-wm0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754001AbcGSNvm (ORCPT ); Tue, 19 Jul 2016 09:51:42 -0400 Received: by mail-wm0-f44.google.com with SMTP id q128so16980375wma.1 for ; Tue, 19 Jul 2016 06:51:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=JxDAhmwIIEZ/nBccRDx3+U1ToH8M1oCvzj49J1MYI4I=; b=czNdgy7Y7Me5PltQCq5ZAw0HTHk2MF6VNMtxu3lPyYMYc1X01gG5dQEE8epGq4SmPF rMSfvYpMntlOc8mRAXSvz670WifxDBHMC9XmL1EChxtjGClgAbK4fwWsD8vSAZqoPXYS /NYS9e+m1c8K0uVtmIHhva3fbqwhKRlgRYFo/viyU0ZVvbEZGhZVhQK6S7fiEnNDYOBi zRAPkentd9ve54Iqb+p5wFkKcX2IKxlzZkFB69UD2J9CisSwW0L86SUFnULBt2aa9I4c 8VDxy3HbEAAzAtEoqoLSk5osv09Lxv+9qvwFM4VAUJrLYDOZ+qEDt7DckT/H4Jmbsj7T noSA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=JxDAhmwIIEZ/nBccRDx3+U1ToH8M1oCvzj49J1MYI4I=; b=NZPoF1RAbeoLaArXEyJhZ8D2EtxTftxtxRaE7hutkgxtXefqW9fi0hNVXKDqfuijCT 6WDSVT0lynHPZ4AKRaRYgMcjG0yhTFuZyoUzgapSgF5Zo/vXUF/q+gTkyGM2INuG011Z bcluzmGjdo42DEruZZm879oB5oO95kjj9uEzXNIGj7qPTJEApjQu2GbCYwzo2FcuOVWM +79PJbkHqJYENLW+lU47Am6ng+zHczeTZx7Yh77lV0pfFyncS8e4Zp9ovgGOGAKFDTxc JvXUXx0C9LXRxD2zpchG07FM/ukpGmK9iwEncLFVaDQjiI5KKOvHzDMgTGCBjebYPbrv X/Eg== X-Gm-Message-State: ALyK8tKOsLs/MxLVf1Gk+nBxnV/l1uG79zJhw8iddOVXPDAFj2Fa+k0Oc3cbUQfQ+PCChMct X-Received: by 10.28.51.21 with SMTP id z21mr4676788wmz.24.1468936300493; Tue, 19 Jul 2016 06:51:40 -0700 (PDT) Received: from localhost.localdomain ([90.63.244.31]) by smtp.gmail.com with ESMTPSA id 17sm2971949wmf.6.2016.07.19.06.51.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 19 Jul 2016 06:51:39 -0700 (PDT) From: Neil Armstrong To: andy.gross@linaro.org, david.brown@linaro.org, lee.jones@linaro.org, lgirdwood@gmail.com, broonie@kernel.org, a.zummo@towertech.it, alexandre.belloni@free-electrons.com Cc: Neil Armstrong , linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-soc@vger.kernel.org, rtc-linux@googlegroups.com Subject: [PATCH v3 4/4] regulator: qcom_rpm-regulator: Add support for pm8018 rpm regulator Date: Tue, 19 Jul 2016 15:51:26 +0200 Message-Id: <1468936286-2710-5-git-send-email-narmstrong@baylibre.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1468936286-2710-1-git-send-email-narmstrong@baylibre.com> References: <1468936286-2710-1-git-send-email-narmstrong@baylibre.com> Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP In order to support eh Qualcomm MDM9615 SoC, add support for the PM8018 RPM regulator in the qcom_rpm-regulator driver. Acked-by: Mark Brown Signed-off-by: Neil Armstrong --- Documentation/devicetree/bindings/mfd/qcom-rpm.txt | 14 +++ drivers/regulator/qcom_rpm-regulator.c | 100 +++++++++++++++++++++ 2 files changed, 114 insertions(+) diff --git a/Documentation/devicetree/bindings/mfd/qcom-rpm.txt b/Documentation/devicetree/bindings/mfd/qcom-rpm.txt index 72d68d4..485bc59 100644 --- a/Documentation/devicetree/bindings/mfd/qcom-rpm.txt +++ b/Documentation/devicetree/bindings/mfd/qcom-rpm.txt @@ -60,6 +60,7 @@ Regulator nodes are identified by their compatible: "qcom,rpm-pm8058-regulators" "qcom,rpm-pm8901-regulators" "qcom,rpm-pm8921-regulators" + "qcom,rpm-pm8018-regulators" - vdd_l0_l1_lvs-supply: - vdd_l2_l11_l12-supply: @@ -138,6 +139,15 @@ Regulator nodes are identified by their compatible: Definition: reference to regulator supplying the input pin, as described in the data sheet +- vin_lvs1-supply: +- vdd_l7-supply: +- vdd_l8-supply: +- vdd_l9_l10_l11_l12-supply: + Usage: optional (pm8018 only) + Value type: + Definition: reference to regulator supplying the input pin, as + described in the data sheet + The regulator node houses sub-nodes for each regulator within the device. Each sub-node is identified using the node's name, with valid values listed for each of the pmics below. @@ -157,6 +167,10 @@ pm8921: l29, lvs1, lvs2, lvs3, lvs4, lvs5, lvs6, lvs7, usb-switch, hdmi-switch, ncp +pm8018: + s1, s2, s3, s4, s5, , l1, l2, l3, l4, l5, l6, l7, l8, l9, l10, l11, + l12, l14, lvs1 + The content of each sub-node is defined by the standard binding for regulators - see regulator.txt - with additional custom properties described below: diff --git a/drivers/regulator/qcom_rpm-regulator.c b/drivers/regulator/qcom_rpm-regulator.c index e254272..0734a5f 100644 --- a/drivers/regulator/qcom_rpm-regulator.c +++ b/drivers/regulator/qcom_rpm-regulator.c @@ -70,6 +70,40 @@ struct qcom_rpm_reg { bool supports_force_mode_bypass; }; +static struct rpm_reg_parts rpm8018_ldo_parts = { + .request_len = 2, + .uV = { 0, 0x007FFFFF, 0}, + .pd = { 0, 0x00800000, 23}, + .pc = { 0, 0x0F000000, 24}, + .pf = { 0, 0xF0000000, 28}, + .ip = { 1, 0x000003FF, 0}, + .ia = { 1, 0x000FFC00, 10}, + .fm = { 1, 0x00700000, 20}, +}; + +static struct rpm_reg_parts rpm8018_smps_parts = { + .request_len = 2, + .uV = { 0, 0x007FFFFF, 0}, + .pd = { 0, 0x00800000, 23}, + .pc = { 0, 0x0F000000, 24}, + .pf = { 0, 0xF0000000, 28}, + .ip = { 1, 0x000003FF, 0}, + .ia = { 1, 0x000FFC00, 10}, + .fm = { 1, 0x00700000, 20}, + .pm = { 1, 0x00800000, 23}, + .freq = { 1, 0x1F000000, 24}, + .freq_clk_src = { 1, 0x60000000, 29}, +}; + +static struct rpm_reg_parts rpm8018_switch_parts = { + .request_len = 1, + .enable_state = { 0, 0x00000001, 0}, + .pd = { 0, 0x00000002, 1}, + .pc = { 0, 0x0000003C, 2}, + .pf = { 0, 0x000003C0, 6}, + .hpm = { 0, 0x00000C00, 10}, +}; + static const struct rpm_reg_parts rpm8660_ldo_parts = { .request_len = 2, .mV = { 0, 0x00000FFF, 0 }, @@ -448,6 +482,44 @@ static struct regulator_ops switch_ops = { }; /* + * PM8018 regulators + */ +static const struct qcom_rpm_reg pm8018_pldo = { + .desc.linear_ranges = pldo_ranges, + .desc.n_linear_ranges = ARRAY_SIZE(pldo_ranges), + .desc.n_voltages = 161, + .desc.ops = &uV_ops, + .parts = &rpm8018_ldo_parts, + .supports_force_mode_auto = false, + .supports_force_mode_bypass = false, +}; + +static const struct qcom_rpm_reg pm8018_nldo = { + .desc.linear_ranges = nldo_ranges, + .desc.n_linear_ranges = ARRAY_SIZE(nldo_ranges), + .desc.n_voltages = 64, + .desc.ops = &uV_ops, + .parts = &rpm8018_ldo_parts, + .supports_force_mode_auto = false, + .supports_force_mode_bypass = false, +}; + +static const struct qcom_rpm_reg pm8018_smps = { + .desc.linear_ranges = smps_ranges, + .desc.n_linear_ranges = ARRAY_SIZE(smps_ranges), + .desc.n_voltages = 154, + .desc.ops = &uV_ops, + .parts = &rpm8018_smps_parts, + .supports_force_mode_auto = false, + .supports_force_mode_bypass = false, +}; + +static const struct qcom_rpm_reg pm8018_switch = { + .desc.ops = &switch_ops, + .parts = &rpm8018_switch_parts, +}; + +/* * PM8058 regulators */ static const struct qcom_rpm_reg pm8058_pldo = { @@ -755,6 +827,32 @@ struct rpm_regulator_data { const char *supply; }; +static const struct rpm_regulator_data rpm_pm8018_regulators[] = { + { "s1", QCOM_RPM_PM8018_SMPS1, &pm8018_smps, "vdd_s1" }, + { "s2", QCOM_RPM_PM8018_SMPS2, &pm8018_smps, "vdd_s2" }, + { "s3", QCOM_RPM_PM8018_SMPS3, &pm8018_smps, "vdd_s3" }, + { "s4", QCOM_RPM_PM8018_SMPS4, &pm8018_smps, "vdd_s4" }, + { "s5", QCOM_RPM_PM8018_SMPS5, &pm8018_smps, "vdd_s5" }, + + { "l2", QCOM_RPM_PM8018_LDO2, &pm8018_pldo, "vdd_l2" }, + { "l3", QCOM_RPM_PM8018_LDO3, &pm8018_pldo, "vdd_l3" }, + { "l4", QCOM_RPM_PM8018_LDO4, &pm8018_pldo, "vdd_l4" }, + { "l5", QCOM_RPM_PM8018_LDO5, &pm8018_pldo, "vdd_l5" }, + { "l6", QCOM_RPM_PM8018_LDO6, &pm8018_pldo, "vdd_l7" }, + { "l7", QCOM_RPM_PM8018_LDO7, &pm8018_pldo, "vdd_l7" }, + { "l8", QCOM_RPM_PM8018_LDO8, &pm8018_nldo, "vdd_l8" }, + { "l9", QCOM_RPM_PM8018_LDO9, &pm8921_nldo1200, + "vdd_l9_l10_l11_l12" }, + { "l10", QCOM_RPM_PM8018_LDO10, &pm8018_nldo, "vdd_l9_l10_l11_l12" }, + { "l11", QCOM_RPM_PM8018_LDO11, &pm8018_nldo, "vdd_l9_l10_l11_l12" }, + { "l12", QCOM_RPM_PM8018_LDO12, &pm8018_nldo, "vdd_l9_l10_l11_l12" }, + { "l14", QCOM_RPM_PM8018_LDO14, &pm8018_pldo, "vdd_l14" }, + + { "lvs1", QCOM_RPM_PM8018_LVS1, &pm8018_switch, "lvs1_in" }, + + { } +}; + static const struct rpm_regulator_data rpm_pm8058_regulators[] = { { "l0", QCOM_RPM_PM8058_LDO0, &pm8058_nldo, "vdd_l0_l1_lvs" }, { "l1", QCOM_RPM_PM8058_LDO1, &pm8058_nldo, "vdd_l0_l1_lvs" }, @@ -870,6 +968,8 @@ static const struct rpm_regulator_data rpm_pm8921_regulators[] = { }; static const struct of_device_id rpm_of_match[] = { + { .compatible = "qcom,rpm-pm8018-regulators", + .data = &rpm_pm8018_regulators }, { .compatible = "qcom,rpm-pm8058-regulators", .data = &rpm_pm8058_regulators }, { .compatible = "qcom,rpm-pm8901-regulators", .data = &rpm_pm8901_regulators }, { .compatible = "qcom,rpm-pm8921-regulators", .data = &rpm_pm8921_regulators },