redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

pwm: sti: Rename channel => device

Browse source 
This is to bring the terminology used in the STi PWM driver more
into line with the PWM subsystem.

Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Thierry Reding <thierry.reding@gmail.com>
This commit is contained in:
Lee Jones 2016-08-16 10:34:58 +01:00 committed by Thierry Reding
parent 055beac131
commit 09022e61d5
1 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
drivers/pwm/pwm-sti.c
View file

@ -21,7 +21,7 @@
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/time.h> #include <linux/time.h>
#define STI_DS_REG(ch) (4 * (ch)) /* Channel's Duty Cycle register */ #define STI_DS_REG(ch) (4 * (ch)) /* Device's Duty Cycle register */
#define STI_PWMCR 0x50 /* Control/Config register */ #define STI_PWMCR 0x50 /* Control/Config register */
#define STI_INTEN 0x54 /* Interrupt Enable/Disable register */ #define STI_INTEN 0x54 /* Interrupt Enable/Disable register */
#define PWM_PRESCALE_LOW_MASK 0x0f #define PWM_PRESCALE_LOW_MASK 0x0f
@ -40,7 +40,7 @@ enum {
struct sti_pwm_compat_data { struct sti_pwm_compat_data {
const struct reg_field *reg_fields; const struct reg_field *reg_fields;
unsigned int num_chan; unsigned int num_devs;
unsigned int max_pwm_cnt; unsigned int max_pwm_cnt;
unsigned int max_prescale; unsigned int max_prescale;
}; };
@ -130,13 +130,13 @@ static int sti_pwm_config(struct pwm_chip *chip, struct pwm_device *pwm,
/* Allow configuration changes if one of the /* Allow configuration changes if one of the
* following conditions satisfy. * following conditions satisfy.
* 1. No channels have been configured. * 1. No devices have been configured.
* 2. Only one channel has been configured and the new request * 2. Only one device has been configured and the new request
* is for the same channel. * is for the same device.
* 3. Only one channel has been configured and the new request is * 3. Only one device has been configured and the new request is
* for a new channel and period of the new channel is same as * for a new device and period of the new device is same as
* the current configured period. * the current configured period.
* 4. More than one channels are configured and period of the new * 4. More than one devices are configured and period of the new
* requestis the same as the current period. * requestis the same as the current period.
*/ */
if (!ncfg || if (!ncfg ||
@ -201,7 +201,7 @@ static int sti_pwm_enable(struct pwm_chip *chip, struct pwm_device *pwm)
int ret = 0; int ret = 0;
/* /*
* Since we have a common enable for all PWM channels, * Since we have a common enable for all PWM devices,
* do not enable if already enabled. * do not enable if already enabled.
*/ */
mutex_lock(&pc->sti_pwm_lock); mutex_lock(&pc->sti_pwm_lock);
@ -259,11 +259,11 @@ static int sti_pwm_probe_dt(struct sti_pwm_chip *pc)
const struct reg_field *reg_fields; const struct reg_field *reg_fields;
struct device_node *np = dev->of_node; struct device_node *np = dev->of_node;
struct sti_pwm_compat_data *cdata = pc->cdata; struct sti_pwm_compat_data *cdata = pc->cdata;
u32 num_chan; u32 num_devs;
of_property_read_u32(np, "st,pwm-num-chan", &num_chan); of_property_read_u32(np, "st,pwm-num-chan", &num_devs);
if (num_chan) if (num_devs)
cdata->num_chan = num_chan; cdata->num_devs = num_devs;
reg_fields = cdata->reg_fields; reg_fields = cdata->reg_fields;
@ -330,7 +330,7 @@ static int sti_pwm_probe(struct platform_device *pdev)
cdata->reg_fields = &sti_pwm_regfields[0]; cdata->reg_fields = &sti_pwm_regfields[0];
cdata->max_prescale = 0xff; cdata->max_prescale = 0xff;
cdata->max_pwm_cnt = 255; cdata->max_pwm_cnt = 255;
cdata->num_chan = 1; cdata->num_devs = 1;
pc->cdata = cdata; pc->cdata = cdata;
pc->dev = dev; pc->dev = dev;
@ -362,7 +362,7 @@ static int sti_pwm_probe(struct platform_device *pdev)
pc->chip.dev = dev; pc->chip.dev = dev;
pc->chip.ops = &sti_pwm_ops; pc->chip.ops = &sti_pwm_ops;
pc->chip.base = -1; pc->chip.base = -1;
pc->chip.npwm = pc->cdata->num_chan; pc->chip.npwm = pc->cdata->num_devs;
pc->chip.can_sleep = true; pc->chip.can_sleep = true;
ret = pwmchip_add(&pc->chip); ret = pwmchip_add(&pc->chip);
@ -381,7 +381,7 @@ static int sti_pwm_remove(struct platform_device *pdev)
struct sti_pwm_chip *pc = platform_get_drvdata(pdev); struct sti_pwm_chip *pc = platform_get_drvdata(pdev);
unsigned int i; unsigned int i;
for (i = 0; i < pc->cdata->num_chan; i++) for (i = 0; i < pc->cdata->num_devs; i++)
pwm_disable(&pc->chip.pwms[i]); pwm_disable(&pc->chip.pwms[i]);
clk_unprepare(pc->clk); clk_unprepare(pc->clk);