* [PATCH] regulator: Make s5m8767_get_voltage_register always return correct register
@ 2012-03-10 2:59 Axel Lin
2012-03-14 8:49 ` Sangbeom Kim
2012-03-14 14:11 ` Mark Brown
0 siblings, 2 replies; 3+ messages in thread
From: Axel Lin @ 2012-03-10 2:59 UTC (permalink / raw)
To: linux-kernel; +Cc: Sangbeom Kim, Liam Girdwood, Mark Brown
Check s5m8767->buck[2|3|4]_gpiodvs status in s5m8767_get_voltage_register
and return correct register accordingly.
Signed-off-by: Axel Lin <axel.lin@gmail.com>
---
drivers/regulator/s5m8767.c | 27 +++++++++------------------
1 files changed, 9 insertions(+), 18 deletions(-)
diff --git a/drivers/regulator/s5m8767.c b/drivers/regulator/s5m8767.c
index 611d02d..58447db 100644
--- a/drivers/regulator/s5m8767.c
+++ b/drivers/regulator/s5m8767.c
@@ -219,6 +219,7 @@ static int s5m8767_reg_disable(struct regulator_dev *rdev)
static int s5m8767_get_voltage_register(struct regulator_dev *rdev, int *_reg)
{
+ struct s5m8767_info *s5m8767 = rdev_get_drvdata(rdev);
int reg_id = rdev_get_id(rdev);
int reg;
@@ -234,12 +235,18 @@ static int s5m8767_get_voltage_register(struct regulator_dev *rdev, int *_reg)
break;
case S5M8767_BUCK2:
reg = S5M8767_REG_BUCK2DVS1;
+ if (s5m8767->buck2_gpiodvs)
+ reg += s5m8767->buck_gpioindex;
break;
case S5M8767_BUCK3:
reg = S5M8767_REG_BUCK3DVS1;
+ if (s5m8767->buck3_gpiodvs)
+ reg += s5m8767->buck_gpioindex;
break;
case S5M8767_BUCK4:
reg = S5M8767_REG_BUCK4DVS1;
+ if (s5m8767->buck4_gpiodvs)
+ reg += s5m8767->buck_gpioindex;
break;
case S5M8767_BUCK5:
reg = S5M8767_REG_BUCK5CTRL2;
@@ -259,7 +266,7 @@ static int s5m8767_get_voltage_register(struct regulator_dev *rdev, int *_reg)
static int s5m8767_get_voltage_sel(struct regulator_dev *rdev)
{
struct s5m8767_info *s5m8767 = rdev_get_drvdata(rdev);
- int reg, mask = 0xff, ret;
+ int reg, mask, ret;
int reg_id = rdev_get_id(rdev);
u8 val;
@@ -267,23 +274,7 @@ static int s5m8767_get_voltage_sel(struct regulator_dev *rdev)
if (ret)
return ret;
- switch (reg_id) {
- case S5M8767_LDO1 ... S5M8767_LDO28:
- mask = 0x3f;
- break;
- case S5M8767_BUCK2:
- if (s5m8767->buck2_gpiodvs)
- reg += s5m8767->buck_gpioindex;
- break;
- case S5M8767_BUCK3:
- if (s5m8767->buck3_gpiodvs)
- reg += s5m8767->buck_gpioindex;
- break;
- case S5M8767_BUCK4:
- if (s5m8767->buck4_gpiodvs)
- reg += s5m8767->buck_gpioindex;
- break;
- }
+ mask = (reg_id < S5M8767_BUCK1) ? 0x3f : 0xff;
ret = s5m_reg_read(s5m8767->iodev, reg, &val);
if (ret)
--
1.7.5.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* RE: [PATCH] regulator: Make s5m8767_get_voltage_register always return correct register
2012-03-10 2:59 [PATCH] regulator: Make s5m8767_get_voltage_register always return correct register Axel Lin
@ 2012-03-14 8:49 ` Sangbeom Kim
2012-03-14 14:11 ` Mark Brown
1 sibling, 0 replies; 3+ messages in thread
From: Sangbeom Kim @ 2012-03-14 8:49 UTC (permalink / raw)
To: 'Axel Lin', linux-kernel
Cc: 'Liam Girdwood', 'Mark Brown'
On Saturday, Mar 10, 2012 at 12:00PM, Axel Lin wrote:
> Check s5m8767->buck[2|3|4]_gpiodvs status in s5m8767_get_voltage_register
> and return correct register accordingly.
Acked-by: Sangbeom Kim <sbkim73@samsung.com>
Thanks,
Sangbeom.
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] regulator: Make s5m8767_get_voltage_register always return correct register
2012-03-10 2:59 [PATCH] regulator: Make s5m8767_get_voltage_register always return correct register Axel Lin
2012-03-14 8:49 ` Sangbeom Kim
@ 2012-03-14 14:11 ` Mark Brown
1 sibling, 0 replies; 3+ messages in thread
From: Mark Brown @ 2012-03-14 14:11 UTC (permalink / raw)
To: Axel Lin; +Cc: linux-kernel, Sangbeom Kim, Liam Girdwood
[-- Attachment #1: Type: text/plain, Size: 195 bytes --]
On Sat, Mar 10, 2012 at 10:59:43AM +0800, Axel Lin wrote:
> Check s5m8767->buck[2|3|4]_gpiodvs status in s5m8767_get_voltage_register
> and return correct register accordingly.
Applied, thanks.
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-03-14 14:11 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-03-10 2:59 [PATCH] regulator: Make s5m8767_get_voltage_register always return correct register Axel Lin
2012-03-14 8:49 ` Sangbeom Kim
2012-03-14 14:11 ` Mark Brown
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox