mfd: vexpress: Convert custom func API to regmap

Components of the Versatile Express platform (configuration
microcontrollers on motherboard and daughterboards in particular)
talk to each other over a custom configuration bus. They
provide miscellaneous functions (from clock generator control
to energy sensors) which are represented as platform devices
(and Device Tree nodes). The transactions on the bus can
be generated by different "bridges" in the system, some
of which are universal for the whole platform (for the price
of high transfer latencies), others restricted to a subsystem
(but much faster).

Until now drivers for such functions were using custom "func"
API, which is being replaced in this patch by regmap calls.
This required:

* a rework (and move to drivers/bus directory, as suggested
  by Samuel and Arnd) of the config bus core, which is much
  simpler now and uses device model infrastructure (class)
  to keep track of the bridges; non-DT case (soon to be
  retired anyway) is simply covered by a special device
  registration function

* the new config-bus driver also takes over device population,
  so there is no need for special matching table for
  of_platform_populate nor "simple-bus" hack in the arm64
  model dtsi file (relevant bindings documentation has
  been updated); this allows all the vexpress devices
  fit into normal device model, making it possible
  to remove plenty of early inits and other hacks in
  the near future

* adaptation of the syscfg bridge implementation in the
  sysreg driver, again making it much simpler; there is
  a special case of the "energy" function spanning two
  registers, where they should be both defined in the tree
  now, but backward compatibility is maintained in the code

* modification of the relevant drivers:

  * hwmon - just a straight-forward API change
  * power/reset driver - API change
  * regulator - API change plus error handling
    simplification
  * osc clock driver - this one required larger rework
    in order to turn in into a standard platform driver

Signed-off-by: Pawel Moll <pawel.moll@arm.com>
Acked-by: Mark Brown <broonie@linaro.org>
Acked-by: Lee Jones <lee.jones@linaro.org>
Acked-by: Guenter Roeck <linux@roeck-us.net>
Acked-by: Mike Turquette <mturquette@linaro.org>

1 files changed, 12 insertions, 38 deletions

diff --git a/drivers/regulator/vexpress.c b/drivers/regulator/vexpress.c
index f3ae28a7e663..2863428813e4 100644
--- a/drivers/regulator/vexpress.c
+++ b/drivers/regulator/vexpress.c
@@ -26,14 +26,14 @@
 struct vexpress_regulator {
         struct regulator_desc desc;
         struct regulator_dev *regdev;
-        struct vexpress_config_func *func;
+        struct regmap *regmap;
 };
 
 static int vexpress_regulator_get_voltage(struct regulator_dev *regdev)
 {
         struct vexpress_regulator *reg = rdev_get_drvdata(regdev);
         u32 uV;
-        int err = vexpress_config_read(reg->func, 0, &uV);
+        int err = regmap_read(reg->regmap, 0, &uV);
 
         return err ? err : uV;
 }
@@ -43,7 +43,7 @@ static int vexpress_regulator_set_voltage(struct regulator_dev *regdev,
 {
         struct vexpress_regulator *reg = rdev_get_drvdata(regdev);
 
-        return vexpress_config_write(reg->func, 0, min_uV);
+        return regmap_write(reg->regmap, 0, min_uV);
 }
 
 static struct regulator_ops vexpress_regulator_ops_ro = {
@@ -57,22 +57,17 @@ static struct regulator_ops vexpress_regulator_ops = {
 
 static int vexpress_regulator_probe(struct platform_device *pdev)
 {
-        int err;
         struct vexpress_regulator *reg;
         struct regulator_init_data *init_data;
         struct regulator_config config = { };
 
         reg = devm_kzalloc(&pdev->dev, sizeof(*reg), GFP_KERNEL);
-        if (!reg) {
-                err = -ENOMEM;
-                goto error_kzalloc;
-        }
+        if (!reg)
+                return -ENOMEM;
 
-        reg->func = vexpress_config_func_get_by_dev(&pdev->dev);
-        if (!reg->func) {
-                err = -ENXIO;
-                goto error_get_func;
-        }
+        reg->regmap = devm_regmap_init_vexpress_config(&pdev->dev);
+        if (IS_ERR(reg->regmap))
+                return PTR_ERR(reg->regmap);
 
         reg->desc.name = dev_name(&pdev->dev);
         reg->desc.type = REGULATOR_VOLTAGE;
@@ -80,10 +75,8 @@ static int vexpress_regulator_probe(struct platform_device *pdev)
         reg->desc.continuous_voltage_range = true;
 
         init_data = of_get_regulator_init_data(&pdev->dev, pdev->dev.of_node);
-        if (!init_data) {
-                err = -EINVAL;
-                goto error_get_regulator_init_data;
-        }
+        if (!init_data)
+                return -EINVAL;
 
         init_data->constraints.apply_uV = 0;
         if (init_data->constraints.min_uV && init_data->constraints.max_uV)
@@ -97,30 +90,12 @@ static int vexpress_regulator_probe(struct platform_device *pdev)
         config.of_node = pdev->dev.of_node;
 
         reg->regdev = devm_regulator_register(&pdev->dev, &reg->desc, &config);
-        if (IS_ERR(reg->regdev)) {
-                err = PTR_ERR(reg->regdev);
-                goto error_regulator_register;
-        }
+        if (IS_ERR(reg->regdev))
+                return PTR_ERR(reg->regdev);
 
         platform_set_drvdata(pdev, reg);
 
         return 0;
-
-error_regulator_register:
-error_get_regulator_init_data:
-        vexpress_config_func_put(reg->func);
-error_get_func:
-error_kzalloc:
-        return err;
-}
-
-static int vexpress_regulator_remove(struct platform_device *pdev)
-{
-        struct vexpress_regulator *reg = platform_get_drvdata(pdev);
-
-        vexpress_config_func_put(reg->func);
-
-        return 0;
 }
 
 static struct of_device_id vexpress_regulator_of_match[] = {
@@ -130,7 +105,6 @@ static struct of_device_id vexpress_regulator_of_match[] = {
 
 static struct platform_driver vexpress_regulator_driver = {
         .probe = vexpress_regulator_probe,
-        .remove = vexpress_regulator_remove,
         .driver = {
                 .name = DRVNAME,
                 .owner = THIS_MODULE,