From: Furquan Shaikh <furquan@chromium.org>
To: "Rafael J . Wysocki" <rjw@rjwysocki.net>,
Mark Brown <broonie@kernel.org>
Cc: Liam Girdwood <lgirdwood@gmail.com>,
Tony Lindgren <tony@atomide.com>,
Dmitry Torokhov <dmitry.torokhov@gmail.com>,
Len Brown <lenb@kernel.org>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>,
Hanjun Guo <hanjun.guo@linaro.org>,
Will Deacon <will.deacon@arm.com>, Rob Herring <robh@kernel.org>,
Sathyanarayana Nujella <sathyanarayana.nujella@intel.com>,
Heikki Krogerus <heikki.krogerus@linux.intel.com>,
Adam Thomson <Adam.Thomson.Opensource@diasemi.com>,
Linus Walleij <linus.walleij@linaro.org>,
Alexandre Courbot <gnurou@gmail.com>,
linux-gpio@vger.kernel.org, linux-acpi@vger.kernel.org,
linux-kernel@vger.kernel.org, linux-omap@vger.kernel.org,
Furquan Shaikh <furquan@chromium.org>
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 [thread overview]
Message-ID: <20170125000641.25520-2-furquan@chromium.org> (raw)
In-Reply-To: <20170125000641.25520-1-furquan@chromium.org>
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 <furquan@chromium.org>
---
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);
};
/**
--
2.11.0.483.g087da7b7c-goog
next prev parent reply other threads:[~2017-01-25 0:06 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-25 0:06 [PATCH 0/7] Implement generic regulator constraints parsing for ACPI and OF Furquan Shaikh
2017-01-25 0:06 ` Furquan Shaikh [this message]
2017-01-25 0:06 ` [PATCH 2/7] ACPI / property: have acpi_get_next_subnode take fwnode_handle Furquan Shaikh
2017-01-25 11:00 ` kbuild test robot
2017-01-25 0:06 ` [PATCH 3/7] device property: introduce fwnode_for_each_child() Furquan Shaikh
2017-01-25 0:06 ` [PATCH 4/7] device property: introduce fwnode_get_named_child_node() Furquan Shaikh
2017-01-25 0:06 ` [PATCH 5/7] device property: Export dev_fwnode Furquan Shaikh
2017-01-25 0:06 ` [PATCH 6/7] drivers/gpio: Add and export gpiod_lookup[_index] Furquan Shaikh
2017-01-25 11:18 ` kbuild test robot
2017-01-26 15:24 ` Linus Walleij
2017-01-25 0:06 ` [PATCH 7/7] drivers/regulator: Initialize regulator init data for ACPI regulators Furquan Shaikh
2017-01-25 12:29 ` [PATCH 0/7] Implement generic regulator constraints parsing for ACPI and OF Lorenzo Pieralisi
2017-01-25 12:49 ` Mark Brown
2017-01-25 12:55 ` Rafael J. Wysocki
2017-01-25 16:56 ` Furquan Shaikh
2017-01-25 18:23 ` Mark Rutland
2017-01-25 18:29 ` Mark Brown
2017-01-25 18:34 ` Mark Rutland
2017-01-25 18:49 ` Mark Brown
2017-01-25 19:39 ` Mark Rutland
2017-01-25 18:44 ` Dmitry Torokhov
2017-01-25 19:27 ` Dmitry Torokhov
2017-01-25 20:39 ` Mark Brown
2017-01-25 21:17 ` Dmitry Torokhov
2017-01-25 21:30 ` Mark Brown
2017-01-25 22:05 ` Dmitry Torokhov
2017-01-25 22:25 ` Mark Brown
2017-01-25 21:44 ` Al Stone
2017-01-25 23:27 ` Dmitry Torokhov
2017-01-26 0:15 ` Al Stone
2017-01-26 0:33 ` Dmitry Torokhov
2017-01-26 10:35 ` Rafael J. Wysocki
2017-02-04 16:08 ` Mark Brown
2017-01-25 19:21 ` Lorenzo Pieralisi
2017-01-25 20:40 ` Mark Brown
2017-01-25 18:25 ` Mark Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170125000641.25520-2-furquan@chromium.org \
--to=furquan@chromium.org \
--cc=Adam.Thomson.Opensource@diasemi.com \
--cc=broonie@kernel.org \
--cc=dmitry.torokhov@gmail.com \
--cc=gnurou@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=hanjun.guo@linaro.org \
--cc=heikki.krogerus@linux.intel.com \
--cc=lenb@kernel.org \
--cc=lgirdwood@gmail.com \
--cc=linus.walleij@linaro.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-gpio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=lorenzo.pieralisi@arm.com \
--cc=rjw@rjwysocki.net \
--cc=robh@kernel.org \
--cc=sathyanarayana.nujella@intel.com \
--cc=tony@atomide.com \
--cc=will.deacon@arm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox