From patchwork Wed Jan 25 00:06:35 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Furquan Shaikh X-Patchwork-Id: 9536223 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 BE6616046A for ; Wed, 25 Jan 2017 00:08:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B139C271BC for ; Wed, 25 Jan 2017 00:08:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A462C27D29; Wed, 25 Jan 2017 00:08:28 +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.3 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, 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 0AF31271BC for ; Wed, 25 Jan 2017 00:08:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750950AbdAYAG4 (ORCPT ); Tue, 24 Jan 2017 19:06:56 -0500 Received: from mail-pf0-f172.google.com ([209.85.192.172]:34151 "EHLO mail-pf0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751013AbdAYAGx (ORCPT ); Tue, 24 Jan 2017 19:06:53 -0500 Received: by mail-pf0-f172.google.com with SMTP id e4so53281767pfg.1 for ; Tue, 24 Jan 2017 16:06:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=fawFyOFOaTN1pwwOTEY7AjvviZYzREz4UA43m4BBFiI=; b=gR/mFuzoBMwZukNU5RctA3kXhZA7RZ30AwUwNBXpduNQaI8xSS1F/9m19ADe7VwINv z0i4ITUe9GvpTG+EQaQtx3WPfOwrh/JoJI2u9mEdHdZhWy8dQeuQrzKrlsji7rEF5bFs /xNSeXrsueFLbKj8xPqpi6aEAcXMminjEM5fY= 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; bh=fawFyOFOaTN1pwwOTEY7AjvviZYzREz4UA43m4BBFiI=; b=jMh/YVmm3AeNWbqUgFrLOmZdfmqHBwqP0w9VK8OWBNxajzPvd8U70qoxBEfsBqNowP 0tnj+6vU09WxGSodnRdp8k2dgX9iqwb3yniStOa4Q5XHeQoLiz9wXESVD2qzZP2MfoW9 MqQ4dh/mISeKWGXA8KGIYuHcb2fy8RNvjqtga0LdHc8N7VddR0zwpKa88L+Kql8lD9Dz DRA03vC48m7IxXrZ6rnQiHYtgm610wqspVetgUppJtkJsQtA3BLSfHj7e7/3FsWmlGwb /spl5ZIgYNsD9CLq7BQ4JpoX/kdeAWfh7XWtUQXkh0Di3D4rB99AnjhYxVSQWqTmsp0B NBoA== X-Gm-Message-State: AIkVDXJkwIzm+Kzc6aJaiqV8ETJfjF9bxM0aBumCfPnK9hAO0vhruJgtqWjziat+LCOSTahU X-Received: by 10.99.239.5 with SMTP id u5mr1126437pgh.166.1485302812344; Tue, 24 Jan 2017 16:06:52 -0800 (PST) Received: from furquan-linux.mtv.corp.google.com ([172.22.152.37]) by smtp.gmail.com with ESMTPSA id f3sm8206081pga.34.2017.01.24.16.06.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 24 Jan 2017 16:06:51 -0800 (PST) From: Furquan Shaikh To: "Rafael J . Wysocki" , Mark Brown Cc: Liam Girdwood , Tony Lindgren , Dmitry Torokhov , Len Brown , Greg Kroah-Hartman , Lorenzo Pieralisi , Hanjun Guo , Will Deacon , Rob Herring , Sathyanarayana Nujella , Heikki Krogerus , Adam Thomson , Linus Walleij , Alexandre Courbot , linux-gpio@vger.kernel.org, linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, linux-omap@vger.kernel.org, Furquan Shaikh Subject: [PATCH 1/7] drivers/regulator: Rename of_map_mode to map_mode in regulator desc Date: Tue, 24 Jan 2017 16:06:35 -0800 Message-Id: <20170125000641.25520-2-furquan@chromium.org> X-Mailer: git-send-email 2.11.0.483.g087da7b7c-goog In-Reply-To: <20170125000641.25520-1-furquan@chromium.org> References: <20170125000641.25520-1-furquan@chromium.org> Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP In order to extend regulator support to ACPI, it is necessary that all the regulator descriptor structure members are generic and not tied to just DeviceTree (OF). Thus, rename of_map_mode to map_mode to allow drivers using ACPI regulators to define required map_mode callback. Signed-off-by: Furquan Shaikh --- drivers/regulator/max77802-regulator.c | 12 ++++++------ drivers/regulator/of_regulator.c | 8 ++++---- drivers/regulator/qcom_spmi-regulator.c | 2 +- drivers/regulator/twl-regulator.c | 6 +++--- drivers/regulator/twl6030-regulator.c | 2 +- include/linux/regulator/driver.h | 5 +++-- 6 files changed, 18 insertions(+), 17 deletions(-) diff --git a/drivers/regulator/max77802-regulator.c b/drivers/regulator/max77802-regulator.c index 1d3539324d9a..ccacc492f6ff 100644 --- a/drivers/regulator/max77802-regulator.c +++ b/drivers/regulator/max77802-regulator.c @@ -379,7 +379,7 @@ static struct regulator_ops max77802_buck_dvs_ops = { .vsel_mask = MAX77802_VSEL_MASK, \ .enable_reg = MAX77802_REG_LDO1CTRL1 + num - 1, \ .enable_mask = MAX77802_OPMODE_MASK << MAX77802_OPMODE_SHIFT_LDO, \ - .of_map_mode = max77802_map_mode, \ + .map_mode = max77802_map_mode, \ } /* LDOs 1, 2, 8, 15, 17, 27, 30, 35 */ @@ -400,7 +400,7 @@ static struct regulator_ops max77802_buck_dvs_ops = { .vsel_mask = MAX77802_VSEL_MASK, \ .enable_reg = MAX77802_REG_LDO1CTRL1 + num - 1, \ .enable_mask = MAX77802_OPMODE_MASK << MAX77802_OPMODE_SHIFT_LDO, \ - .of_map_mode = max77802_map_mode, \ + .map_mode = max77802_map_mode, \ } /* BUCKs 1, 6 */ @@ -421,7 +421,7 @@ static struct regulator_ops max77802_buck_dvs_ops = { .vsel_mask = MAX77802_DVS_VSEL_MASK, \ .enable_reg = MAX77802_REG_BUCK ## num ## CTRL, \ .enable_mask = MAX77802_OPMODE_MASK, \ - .of_map_mode = max77802_map_mode, \ + .map_mode = max77802_map_mode, \ } /* BUCKS 2-4 */ @@ -443,7 +443,7 @@ static struct regulator_ops max77802_buck_dvs_ops = { .enable_reg = MAX77802_REG_BUCK ## num ## CTRL1, \ .enable_mask = MAX77802_OPMODE_MASK << \ MAX77802_OPMODE_BUCK234_SHIFT, \ - .of_map_mode = max77802_map_mode, \ + .map_mode = max77802_map_mode, \ } /* BUCK 5 */ @@ -464,7 +464,7 @@ static struct regulator_ops max77802_buck_dvs_ops = { .vsel_mask = MAX77802_VSEL_MASK, \ .enable_reg = MAX77802_REG_BUCK5CTRL, \ .enable_mask = MAX77802_OPMODE_MASK, \ - .of_map_mode = max77802_map_mode, \ + .map_mode = max77802_map_mode, \ } /* BUCKs 7-10 */ @@ -485,7 +485,7 @@ static struct regulator_ops max77802_buck_dvs_ops = { .vsel_mask = MAX77802_VSEL_MASK, \ .enable_reg = MAX77802_REG_BUCK7CTRL + (num - 7) * 3, \ .enable_mask = MAX77802_OPMODE_MASK, \ - .of_map_mode = max77802_map_mode, \ + .map_mode = max77802_map_mode, \ } static const struct regulator_desc regulators[] = { diff --git a/drivers/regulator/of_regulator.c b/drivers/regulator/of_regulator.c index 4f613ec99500..13d4dc2c287e 100644 --- a/drivers/regulator/of_regulator.c +++ b/drivers/regulator/of_regulator.c @@ -100,8 +100,8 @@ static void of_get_regulation_constraints(struct device_node *np, } if (!of_property_read_u32(np, "regulator-initial-mode", &pval)) { - if (desc && desc->of_map_mode) { - ret = desc->of_map_mode(pval); + if (desc && desc->map_mode) { + ret = desc->map_mode(pval); if (ret == -EINVAL) pr_err("%s: invalid mode %u\n", np->name, pval); else @@ -139,8 +139,8 @@ static void of_get_regulation_constraints(struct device_node *np, if (!of_property_read_u32(suspend_np, "regulator-mode", &pval)) { - if (desc && desc->of_map_mode) { - ret = desc->of_map_mode(pval); + if (desc && desc->map_mode) { + ret = desc->map_mode(pval); if (ret == -EINVAL) pr_err("%s: invalid mode %u\n", np->name, pval); diff --git a/drivers/regulator/qcom_spmi-regulator.c b/drivers/regulator/qcom_spmi-regulator.c index 16c5f84e06a7..54fe4aadd350 100644 --- a/drivers/regulator/qcom_spmi-regulator.c +++ b/drivers/regulator/qcom_spmi-regulator.c @@ -1679,7 +1679,7 @@ static int qcom_spmi_regulator_probe(struct platform_device *pdev) vreg->desc.supply_name = reg->supply; vreg->desc.of_match = reg->name; vreg->desc.of_parse_cb = spmi_regulator_of_parse; - vreg->desc.of_map_mode = spmi_regulator_of_map_mode; + vreg->desc.map_mode = spmi_regulator_of_map_mode; ret = spmi_regulator_match(vreg, reg->force_type); if (ret) diff --git a/drivers/regulator/twl-regulator.c b/drivers/regulator/twl-regulator.c index 6c9ec84121bd..023aa28c8a0f 100644 --- a/drivers/regulator/twl-regulator.c +++ b/drivers/regulator/twl-regulator.c @@ -466,7 +466,7 @@ static const struct twlreg_info TWL4030_INFO_##label = { \ .type = REGULATOR_VOLTAGE, \ .owner = THIS_MODULE, \ .enable_time = turnon_delay, \ - .of_map_mode = twl4030reg_map_mode, \ + .map_mode = twl4030reg_map_mode, \ }, \ } @@ -482,7 +482,7 @@ static const struct twlreg_info TWL4030_INFO_##label = { \ .type = REGULATOR_VOLTAGE, \ .owner = THIS_MODULE, \ .enable_time = turnon_delay, \ - .of_map_mode = twl4030reg_map_mode, \ + .map_mode = twl4030reg_map_mode, \ }, \ } @@ -501,7 +501,7 @@ static const struct twlreg_info TWLFIXED_INFO_##label = { \ .owner = THIS_MODULE, \ .min_uV = mVolts * 1000, \ .enable_time = turnon_delay, \ - .of_map_mode = twl4030reg_map_mode, \ + .map_mode = twl4030reg_map_mode, \ }, \ } diff --git a/drivers/regulator/twl6030-regulator.c b/drivers/regulator/twl6030-regulator.c index 4864b9d742c0..d7be72869f52 100644 --- a/drivers/regulator/twl6030-regulator.c +++ b/drivers/regulator/twl6030-regulator.c @@ -569,7 +569,7 @@ static const struct twlreg_info TWLFIXED_INFO_##label = { \ .owner = THIS_MODULE, \ .min_uV = mVolts * 1000, \ .enable_time = turnon_delay, \ - .of_map_mode = NULL, \ + .map_mode = NULL, \ }, \ } diff --git a/include/linux/regulator/driver.h b/include/linux/regulator/driver.h index dac8e7b16bc6..b50592a6f050 100644 --- a/include/linux/regulator/driver.h +++ b/include/linux/regulator/driver.h @@ -296,7 +296,8 @@ 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 * - * @of_map_mode: Maps a hardware mode defined in a DeviceTree to a standard mode + * @map_mode: Maps a hardware mode defined in device properties to a standard + * mode. */ struct regulator_desc { const char *name; @@ -350,7 +351,7 @@ struct regulator_desc { unsigned int off_on_delay; - unsigned int (*of_map_mode)(unsigned int mode); + unsigned int (*map_mode)(unsigned int mode); }; /**