Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 272405
b: refs/heads/master
c: 500c524
h: refs/heads/master
i:
  272403: 3145b69
v: v3
  • Loading branch information
Xin Xie authored and Liam Girdwood committed Aug 28, 2011
1 parent f10563c commit f666c0b
Show file tree
Hide file tree
Showing 3 changed files with 48 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: fc999b83799074832367d3cfd724c341c849a7da
refs/heads/master: 500c524aad173864a58e128d0be9713fa5846471
32 changes: 31 additions & 1 deletion trunk/drivers/regulator/tps6586x-regulator.c
Original file line number Diff line number Diff line change
Expand Up @@ -332,6 +332,36 @@ static inline int tps6586x_regulator_preinit(struct device *parent,
1 << ri->enable_bit[1]);
}

static int tps6586x_regulator_set_slew_rate(struct platform_device *pdev)
{
struct device *parent = pdev->dev.parent;
struct regulator_init_data *p = pdev->dev.platform_data;
struct tps6586x_settings *setting = p->driver_data;
uint8_t reg;

if (setting == NULL)
return 0;

if (!(setting->slew_rate & TPS6586X_SLEW_RATE_SET))
return 0;

/* only SM0 and SM1 can have the slew rate settings */
switch (pdev->id) {
case TPS6586X_ID_SM_0:
reg = TPS6586X_SM0SL;
break;
case TPS6586X_ID_SM_1:
reg = TPS6586X_SM1SL;
break;
default:
dev_warn(&pdev->dev, "Only SM0/SM1 can set slew rate\n");
return -EINVAL;
}

return tps6586x_write(parent, reg,
setting->slew_rate & TPS6586X_SLEW_RATE_MASK);
}

static inline struct tps6586x_regulator *find_regulator_info(int id)
{
struct tps6586x_regulator *ri;
Expand Down Expand Up @@ -374,7 +404,7 @@ static int __devinit tps6586x_regulator_probe(struct platform_device *pdev)

platform_set_drvdata(pdev, rdev);

return 0;
return tps6586x_regulator_set_slew_rate(pdev);
}

static int __devexit tps6586x_regulator_remove(struct platform_device *pdev)
Expand Down
16 changes: 16 additions & 0 deletions trunk/include/linux/mfd/tps6586x.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,18 @@
#ifndef __LINUX_MFD_TPS6586X_H
#define __LINUX_MFD_TPS6586X_H

#define TPS6586X_SLEW_RATE_INSTANTLY 0x00
#define TPS6586X_SLEW_RATE_110UV 0x01
#define TPS6586X_SLEW_RATE_220UV 0x02
#define TPS6586X_SLEW_RATE_440UV 0x03
#define TPS6586X_SLEW_RATE_880UV 0x04
#define TPS6586X_SLEW_RATE_1760UV 0x05
#define TPS6586X_SLEW_RATE_3520UV 0x06
#define TPS6586X_SLEW_RATE_7040UV 0x07

#define TPS6586X_SLEW_RATE_SET 0x08
#define TPS6586X_SLEW_RATE_MASK 0x07

enum {
TPS6586X_ID_SM_0,
TPS6586X_ID_SM_1,
Expand Down Expand Up @@ -48,6 +60,10 @@ enum {
TPS6586X_INT_RTC_ALM2,
};

struct tps6586x_settings {
int slew_rate;
};

struct tps6586x_subdev_info {
int id;
const char *name;
Expand Down

0 comments on commit f666c0b

Please sign in to comment.