regulator: ab8500: Init debug from regulator driver

The purpose of this patch is to guarantee that ab8500-debug will
record the regulator registers before they are modified by the
ab8500 regulator driver.

Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

diff --git a/drivers/regulator/ab8500.c b/drivers/regulator/ab8500.c
index 4d88a604efd1dc06b9ad68138e6bb5c6f369270e..bf34c4cd6631dae9a2156753629720436da8756d 100644 (file)
--- a/drivers/regulator/ab8500.c
+++ b/drivers/regulator/ab8500.c
@@ -911,6 +911,11 @@ static int ab8500_regulator_probe(struct platform_device *pdev)
                return -EINVAL;
        }
 
+       /* initialize debug (initial state is recorded with this call) */
+       err = ab8500_regulator_debug_init(pdev);
+       if (err)
+               return err;
+
        /* initialize registers */
        for (i = 0; i < pdata->num_reg_init; i++) {
                int id, mask, value;
@@ -961,6 +966,11 @@ static int ab8500_regulator_remove(struct platform_device *pdev)
        if (err)
                return err;
 
+       /* remove regulator debug */
+       err = ab8500_regulator_debug_exit(pdev);
+       if (err)
+               return err;
+
        return 0;
 }
 

diff --git a/include/linux/regulator/ab8500.h b/include/linux/regulator/ab8500.h
index b86e089195eaecdfef0d0ac28a17b062ea6db4da..592a3f3994c041f6506679242452ea6effb926aa 100644 (file)
--- a/include/linux/regulator/ab8500.h
+++ b/include/linux/regulator/ab8500.h
@@ -178,4 +178,18 @@ inline int ab8500_ext_regulator_exit(struct platform_device *pdev)
 }
 #endif
 
+#ifdef CONFIG_REGULATOR_AB8500_DEBUG
+int ab8500_regulator_debug_init(struct platform_device *pdev);
+int ab8500_regulator_debug_exit(struct platform_device *pdev);
+#else
+static inline int ab8500_regulator_debug_init(struct platform_device *pdev)
+{
+       return 0;
+}
+static inline int ab8500_regulator_debug_exit(struct platform_device *pdev)
+{
+       return 0;
+}
+#endif
+
 #endif