github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-08 22:52:35 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

regulator: rk29-pwm: make set/get equal

Browse Source
This commit is contained in:
黄涛 2011-01-26 21:17:29 +08:00
parent 3985fbb701
commit daac15c7bc
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/regulator/rk29-pwm-regulator.c
View File

@ -79,9 +79,6 @@ static int pwm_set_rate(struct pwm_platform_data *pdata,int nHz,u32 rate)
rk29_mux_api_set(pdata->pwm_iomux_name, pdata->pwm_iomux_gpio);
// set gpio to low level
gpio_set_value(pdata->pwm_gpio,GPIO_LOW);
pdata->pwm_voltage = 1400;
}
else if (rate <= 100)
{
@ -98,9 +95,6 @@ static int pwm_set_rate(struct pwm_platform_data *pdata,int nHz,u32 rate)
pwm_write_reg(id, PWM_REG_HRC, divh?divh:1);
pwm_write_reg(id,PWM_REG_CNTR,0);
pwm_write_reg(id, PWM_REG_CTRL,pwm_read_reg(id,PWM_REG_CTRL)|PWM_DIV|PWM_ENABLE|PWM_TimeEN);
pdata->pwm_voltage = 1400 - 476*rate/100;
}
else
{
@ -209,6 +203,12 @@ static int __devinit pwm_regulator_probe(struct platform_device *pdev)
struct regulator_dev *rdev;
int ret ;
if (!pdata)
return -ENODEV;
if (!pdata->pwm_voltage)
pdata->pwm_voltage = 1200; // default 1.2v
rdev = regulator_register(&pwm_regulator, &pdev->dev,
pdata->init_data, pdata);
if (IS_ERR(rdev)) {