regulator: s2mps11: Copy supported regulators from initconst

[firefly-linux-kernel-4.4.55.git] / drivers / regulator / s2mps11.c

diff --git a/drivers/regulator/s2mps11.c b/drivers/regulator/s2mps11.c
index 189038aecbf5672b03e6f82a186092cc55c28b38..ca66fc56fa581e1d1e9ddf411727b234490026ad 100644 (file)
--- a/drivers/regulator/s2mps11.c
+++ b/drivers/regulator/s2mps11.c
@@ -25,9 +25,8 @@
 #include <linux/mfd/samsung/core.h>
 #include <linux/mfd/samsung/s2mps11.h>
 
-#define S2MPS11_REGULATOR_CNT ARRAY_SIZE(regulators)
-
 struct s2mps11_info {
+       unsigned int rdev_num;
        int ramp_delay2;
        int ramp_delay34;
        int ramp_delay5;
@@ -343,7 +342,7 @@ static struct regulator_ops s2mps11_buck_ops = {
        .enable_mask    = S2MPS11_ENABLE_MASK                   \
 }
 
-static const struct regulator_desc regulators[] = {
+static const struct regulator_desc s2mps11_regulators[] __initconst = {
        regulator_desc_ldo2(1),
        regulator_desc_ldo1(2),
        regulator_desc_ldo1(3),
@@ -394,21 +393,62 @@ static const struct regulator_desc regulators[] = {
        regulator_desc_buck10,
 };
 
+/*
+ * Allocates memory under 'regulators' pointer and copies there array
+ * of regulator_desc for given device.
+ *
+ * Returns number of regulators or negative ERRNO on error.
+ */
+static int __init
+s2mps11_pmic_init_regulators_desc(struct platform_device *pdev,
+               struct regulator_desc **regulators)
+{
+       const struct regulator_desc *regulators_init;
+       enum sec_device_type dev_type;
+       int rdev_num;
+
+       dev_type = platform_get_device_id(pdev)->driver_data;
+       switch (dev_type) {
+       case S2MPS11X:
+               rdev_num = ARRAY_SIZE(s2mps11_regulators);
+               regulators_init = s2mps11_regulators;
+               break;
+       default:
+               dev_err(&pdev->dev, "Invalid device type: %u\n", dev_type);
+               return -EINVAL;
+       };
+
+       *regulators = devm_kzalloc(&pdev->dev,
+                       sizeof(**regulators) * rdev_num, GFP_KERNEL);
+       if (!*regulators)
+               return -ENOMEM;
+
+       memcpy(*regulators, regulators_init, sizeof(**regulators) * rdev_num);
+
+       return rdev_num;
+}
+
 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 sec_platform_data *pdata = iodev->pdata;
+       struct of_regulator_match *rdata = NULL;
        struct device_node *reg_np = NULL;
        struct regulator_config config = { };
        struct s2mps11_info *s2mps11;
-       int i, ret;
+       int i, ret = 0;
+       struct regulator_desc *regulators = NULL;
+       int rdev_num;
 
        s2mps11 = devm_kzalloc(&pdev->dev, sizeof(struct s2mps11_info),
                                GFP_KERNEL);
        if (!s2mps11)
                return -ENOMEM;
 
+       rdev_num = s2mps11_pmic_init_regulators_desc(pdev, &regulators);
+       if (rdev_num < 0)
+               return rdev_num;
+
        if (!iodev->dev->of_node) {
                if (pdata) {
                        goto common_reg;
@@ -419,24 +459,30 @@ static int s2mps11_pmic_probe(struct platform_device *pdev)
                }
        }
 
-       for (i = 0; i < S2MPS11_REGULATOR_CNT; i++)
+       rdata = kzalloc(sizeof(*rdata) * rdev_num, GFP_KERNEL);
+       if (!rdata)
+               return -ENOMEM;
+
+       for (i = 0; i < rdev_num; i++)
                rdata[i].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;
+               ret = -EINVAL;
+               goto out;
        }
 
-       of_regulator_match(&pdev->dev, reg_np, rdata, S2MPS11_REGULATOR_MAX);
+       of_regulator_match(&pdev->dev, reg_np, rdata, rdev_num);
 
 common_reg:
        platform_set_drvdata(pdev, s2mps11);
+       s2mps11->rdev_num = rdev_num;
 
        config.dev = &pdev->dev;
        config.regmap = iodev->regmap_pmic;
        config.driver_data = s2mps11;
-       for (i = 0; i < S2MPS11_REGULATOR_MAX; i++) {
+       for (i = 0; i < rdev_num; i++) {
                struct regulator_dev *regulator;
 
                if (!reg_np) {
@@ -453,15 +499,18 @@ common_reg:
                        ret = PTR_ERR(regulator);
                        dev_err(&pdev->dev, "regulator init failed for %d\n",
                                i);
-                       return ret;
+                       goto out;
                }
        }
 
-       return 0;
+out:
+       kfree(rdata);
+
+       return ret;
 }
 
 static const struct platform_device_id s2mps11_pmic_id[] = {
-       { "s2mps11-pmic", 0},
+       { "s2mps11-pmic", S2MPS11X},
        { },
 };
 MODULE_DEVICE_TABLE(platform, s2mps11_pmic_id);