Skip to content

Commit

Permalink
regulator: ab8500: Init debug from regulator driver
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Lee Jones authored and Mark Brown committed Mar 29, 2013
1 parent 41a06aa commit da0b0c4
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 0 deletions.
10 changes: 10 additions & 0 deletions drivers/regulator/ab8500.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
}

Expand Down
14 changes: 14 additions & 0 deletions include/linux/regulator/ab8500.h
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit da0b0c4

Please sign in to comment.