| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-id: <1372072858-6559-5-git-send-email-yadi.brar@samsung.com>
Date: Mon, 24 Jun 2013 16:50:58 +0530
From: Yadwinder Singh Brar <yadi.brar@...sung.com>
To: linux-kernel@...r.kernel.org
Cc: yadi.brar01@...il.com, sbkim73@...sung.com, broonie@...nel.org,
lgirdwood@...il.com, sameo@...ux.intel.com,
rob.herring@...xeda.com, grant.likely@...aro.org,
Yadwinder Singh Brar <yadi.brar@...sung.com>
Subject: [PATCH 4/4] regulator: s2mps11: Add device tree support
This patch adds device tree support. It parses parent's node to get regulator
constraints. This patch also rearrange code little bit.
Signed-off-by: Yadwinder Singh Brar <yadi.brar@...sung.com>
---
drivers/regulator/s2mps11.c | 116 ++++++++++++++++++++++++++++++++++++++-----
1 files changed, 104 insertions(+), 12 deletions(-)
diff --git a/drivers/regulator/s2mps11.c b/drivers/regulator/s2mps11.c
index d42ad2a..559ad7b 100644
--- a/drivers/regulator/s2mps11.c
+++ b/drivers/regulator/s2mps11.c
@@ -20,9 +20,12 @@
#include <linux/platform_device.h>
#include <linux/regulator/driver.h>
#include <linux/regulator/machine.h>
+#include <linux/regulator/of_regulator.h>
#include <linux/mfd/samsung/core.h>
#include <linux/mfd/samsung/s2mps11.h>
+#define S2MPS11_REGULATOR_CNT ARRAY_SIZE(regulators)
+
struct s2mps11_info {
struct regulator_dev *rdev[S2MPS11_REGULATOR_MAX];
@@ -287,26 +290,107 @@ static struct regulator_desc regulators[] = {
regulator_desc_buck10,
};
+static void s2mps11_pmic_set_buck_ramp(struct regulator_init_data *init_data,
+ struct s2mps11_info *s2mps11, int id)
+{
+ unsigned int ramp_rate;
+
+ if (!init_data)
+ return;
+
+ ramp_rate = init_data->constraints.ramp_delay;
+
+ switch (id) {
+ case S2MPS11_BUCK2:
+ s2mps11->ramp_delay2 = ramp_rate;
+ break;
+ case S2MPS11_BUCK3:
+ case S2MPS11_BUCK4:
+ if (ramp_rate > s2mps11->ramp_delay34)
+ s2mps11->ramp_delay34 = ramp_rate;
+ break;
+ case S2MPS11_BUCK5:
+ s2mps11->ramp_delay5 = ramp_rate;
+ break;
+ case S2MPS11_BUCK1:
+ case S2MPS11_BUCK6:
+ if (ramp_rate > s2mps11->ramp_delay16)
+ s2mps11->ramp_delay16 = ramp_rate;
+ break;
+ case S2MPS11_BUCK7:
+ case S2MPS11_BUCK8:
+ case S2MPS11_BUCK10:
+ if (ramp_rate > s2mps11->ramp_delay7810)
+ s2mps11->ramp_delay7810 = ramp_rate;
+ break;
+ case S2MPS11_BUCK9:
+ s2mps11->ramp_delay9 = ramp_rate;
+ }
+}
+
+static void s2mps11_pmic_parse_dt(struct of_regulator_match *rdata,
+ struct s2mps11_info *s2mps11)
+{
+ if (!of_find_property(rdata[S2MPS11_BUCK2].of_node,
+ "regulator-ramp-disable", NULL))
+ s2mps11->buck2_ramp = true;
+
+ if (!of_find_property(rdata[S2MPS11_BUCK3].of_node,
+ "regulator-ramp-disable", NULL))
+ s2mps11->buck3_ramp = true;
+
+ if (!of_find_property(rdata[S2MPS11_BUCK4].of_node,
+ "regulator-ramp-disable", NULL))
+ s2mps11->buck4_ramp = true;
+
+ if (!of_find_property(rdata[S2MPS11_BUCK6].of_node,
+ "regulator-ramp-disable", NULL))
+ s2mps11->buck6_ramp = true;
+}
+
static int s2mps11_pmic_probe(struct platform_device *pdev)
{
struct sec_pmic_dev *iodev = dev_get_drvdata(pdev->dev.parent);
struct sec_platform_data *pdata = dev_get_platdata(iodev->dev);
+ struct of_regulator_match rdata[S2MPS11_REGULATOR_MAX];
+ struct device_node *reg_np = NULL;
struct regulator_config config = { };
struct s2mps11_info *s2mps11;
- int i, ret;
+ int i, id, ret;
unsigned char ramp_enable, ramp_reg = 0;
- if (!pdata) {
- dev_err(pdev->dev.parent, "Platform data not supplied\n");
- return -ENODEV;
- }
-
s2mps11 = devm_kzalloc(&pdev->dev, sizeof(struct s2mps11_info),
GFP_KERNEL);
if (!s2mps11)
return -ENOMEM;
- platform_set_drvdata(pdev, s2mps11);
+ if (iodev->dev->of_node)
+ goto p_data;
+
+ for (i = 0; i < S2MPS11_REGULATOR_CNT; i++) {
+ id = regulators[i].id;
+ rdata[id].name = regulators[i].name;
+ }
+
+ reg_np = of_find_node_by_name(iodev->dev->of_node, "regulators");
+ if (!reg_np) {
+ dev_err(&pdev->dev, "could not find regulators sub-node\n");
+ return -EINVAL;
+ }
+
+ of_regulator_match(&pdev->dev, reg_np, rdata, S2MPS11_REGULATOR_MAX);
+
+ s2mps11_pmic_parse_dt(rdata, s2mps11);
+
+ for (id = S2MPS11_BUCK1; id <= S2MPS11_BUCK9; id++)
+ s2mps11_pmic_set_buck_ramp(rdata[id].init_data, s2mps11, id);
+
+ goto set_ramp;
+p_data:
+ if (!pdata) {
+ dev_err(pdev->dev.parent, "Platform data not supplied\n");
+ return -ENODEV;
+ }
s2mps11->ramp_delay2 = pdata->buck2_ramp_delay;
s2mps11->ramp_delay34 = pdata->buck34_ramp_delay;
@@ -320,6 +404,7 @@ static int s2mps11_pmic_probe(struct platform_device *pdev)
s2mps11->buck3_ramp = pdata->buck3_ramp_enable;
s2mps11->buck4_ramp = pdata->buck4_ramp_enable;
+set_ramp:
ramp_enable = (s2mps11->buck2_ramp << 3) | (s2mps11->buck3_ramp << 2) |
(s2mps11->buck4_ramp << 1) | s2mps11->buck6_ramp ;
@@ -338,12 +423,19 @@ static int s2mps11_pmic_probe(struct platform_device *pdev)
ramp_reg |= get_ramp_delay(s2mps11->ramp_delay9);
sec_reg_write(iodev, S2MPS11_REG_RAMP_BUCK, ramp_reg);
- for (i = 0; i < S2MPS11_REGULATOR_MAX; i++) {
+ platform_set_drvdata(pdev, s2mps11);
- config.dev = &pdev->dev;
- config.regmap = iodev->regmap;
- config.init_data = pdata->regulators[i].initdata;
- config.driver_data = s2mps11;
+ config.dev = &pdev->dev;
+ config.regmap = iodev->regmap;
+ config.driver_data = s2mps11;
+ for (i = 0; i < S2MPS11_REGULATOR_MAX; i++) {
+ if (reg_np) {
+ config.init_data = pdata->regulators[i].initdata;
+ } else {
+ id = regulators[i].id;
+ config.init_data = rdata[id].init_data;
+ config.of_node = rdata[id].of_node;
+ }
s2mps11->rdev[i] = regulator_register(®ulators[i], &config);
if (IS_ERR(s2mps11->rdev[i])) {
--
1.7.0.4
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists