evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'regulator/fix/pbias' into regulator-linus

Browse source
This commit is contained in:
Mark Brown 2015-08-30 14:38:37 +01:00
commit e616e2f11b
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
drivers/regulator/pbias-regulator.c
View file

@ -30,6 +30,7 @@
struct pbias_reg_info { struct pbias_reg_info {
u32 enable; u32 enable;
u32 enable_mask; u32 enable_mask;
u32 disable_val;
u32 vmode; u32 vmode;
unsigned int enable_time; unsigned int enable_time;
char *name; char *name;
@ -62,6 +63,7 @@ static const struct pbias_reg_info pbias_mmc_omap2430 = {
.enable = BIT(1), .enable = BIT(1),
.enable_mask = BIT(1), .enable_mask = BIT(1),
.vmode = BIT(0), .vmode = BIT(0),
.disable_val = 0,
.enable_time = 100, .enable_time = 100,
.name = "pbias_mmc_omap2430" .name = "pbias_mmc_omap2430"
}; };
@ -77,6 +79,7 @@ static const struct pbias_reg_info pbias_sim_omap3 = {
static const struct pbias_reg_info pbias_mmc_omap4 = { static const struct pbias_reg_info pbias_mmc_omap4 = {
.enable = BIT(26) | BIT(22), .enable = BIT(26) | BIT(22),
.enable_mask = BIT(26) | BIT(25) | BIT(22), .enable_mask = BIT(26) | BIT(25) | BIT(22),
.disable_val = BIT(25),
.vmode = BIT(21), .vmode = BIT(21),
.enable_time = 100, .enable_time = 100,
.name = "pbias_mmc_omap4" .name = "pbias_mmc_omap4"
@ -85,6 +88,7 @@ static const struct pbias_reg_info pbias_mmc_omap4 = {
static const struct pbias_reg_info pbias_mmc_omap5 = { static const struct pbias_reg_info pbias_mmc_omap5 = {
.enable = BIT(27) | BIT(26), .enable = BIT(27) | BIT(26),
.enable_mask = BIT(27) | BIT(25) | BIT(26), .enable_mask = BIT(27) | BIT(25) | BIT(26),
.disable_val = BIT(25),
.vmode = BIT(21), .vmode = BIT(21),
.enable_time = 100, .enable_time = 100,
.name = "pbias_mmc_omap5" .name = "pbias_mmc_omap5"
@ -159,6 +163,7 @@ static int pbias_regulator_probe(struct platform_device *pdev)
drvdata[data_idx].desc.enable_reg = res->start; drvdata[data_idx].desc.enable_reg = res->start;
drvdata[data_idx].desc.enable_mask = info->enable_mask; drvdata[data_idx].desc.enable_mask = info->enable_mask;
drvdata[data_idx].desc.enable_val = info->enable; drvdata[data_idx].desc.enable_val = info->enable;
drvdata[data_idx].desc.disable_val = info->disable_val;
cfg.init_data = pbias_matches[idx].init_data; cfg.init_data = pbias_matches[idx].init_data;
cfg.driver_data = &drvdata[data_idx]; cfg.driver_data = &drvdata[data_idx];