On Tue, Oct 15, 2019 at 07:11:39PM -0700, Guru Das Srinagesh wrote: > Because period and duty cycle are defined as ints with units of > nanoseconds, the maximum time duration that can be set is limited to > ~2.147 seconds. Change their definitions to u64 so that higher durations > may be set. > > Signed-off-by: Guru Das Srinagesh <gu...@codeaurora.org> > --- > drivers/pwm/core.c | 4 ++-- > drivers/pwm/sysfs.c | 10 +++++----- > include/linux/pwm.h | 16 ++++++++-------- > 3 files changed, 15 insertions(+), 15 deletions(-)
Applied, thanks.
Thierry
> diff --git a/drivers/pwm/core.c b/drivers/pwm/core.c
> index 6ad51aa..dc79c03 100644
> --- a/drivers/pwm/core.c
> +++ b/drivers/pwm/core.c
> @@ -1163,8 +1163,8 @@ static void pwm_dbg_show(struct pwm_chip *chip, struct
> seq_file *s)
> if (state.enabled)
> seq_puts(s, " enabled");
>
> - seq_printf(s, " period: %u ns", state.period);
> - seq_printf(s, " duty: %u ns", state.duty_cycle);
> + seq_printf(s, " period: %llu ns", state.period);
> + seq_printf(s, " duty: %llu ns", state.duty_cycle);
> seq_printf(s, " polarity: %s",
> state.polarity ? "inverse" : "normal");
>
> diff --git a/drivers/pwm/sysfs.c b/drivers/pwm/sysfs.c
> index 2389b86..3fb1610 100644
> --- a/drivers/pwm/sysfs.c
> +++ b/drivers/pwm/sysfs.c
> @@ -42,7 +42,7 @@ static ssize_t period_show(struct device *child,
>
> pwm_get_state(pwm, &state);
>
> - return sprintf(buf, "%u\n", state.period);
> + return sprintf(buf, "%llu\n", state.period);
> }
>
> static ssize_t period_store(struct device *child,
> @@ -52,10 +52,10 @@ static ssize_t period_store(struct device *child,
> struct pwm_export *export = child_to_pwm_export(child);
> struct pwm_device *pwm = export->pwm;
> struct pwm_state state;
> - unsigned int val;
> + u64 val;
> int ret;
>
> - ret = kstrtouint(buf, 0, &val);
> + ret = kstrtou64(buf, 0, &val);
> if (ret)
> return ret;
>
> @@ -77,7 +77,7 @@ static ssize_t duty_cycle_show(struct device *child,
>
> pwm_get_state(pwm, &state);
>
> - return sprintf(buf, "%u\n", state.duty_cycle);
> + return sprintf(buf, "%llu\n", state.duty_cycle);
> }
>
> static ssize_t duty_cycle_store(struct device *child,
> @@ -212,7 +212,7 @@ static ssize_t capture_show(struct device *child,
> if (ret)
> return ret;
>
> - return sprintf(buf, "%u %u\n", result.period, result.duty_cycle);
> + return sprintf(buf, "%llu %llu\n", result.period, result.duty_cycle);
> }
>
> static DEVICE_ATTR_RW(period);
> diff --git a/include/linux/pwm.h b/include/linux/pwm.h
> index b2c9c46..1efdd63 100644
> --- a/include/linux/pwm.h
> +++ b/include/linux/pwm.h
> @@ -39,7 +39,7 @@ enum pwm_polarity {
> * current PWM hardware state.
> */
> struct pwm_args {
> - unsigned int period;
> + u64 period;
> enum pwm_polarity polarity;
> };
>
> @@ -56,8 +56,8 @@ enum {
> * @enabled: PWM enabled status
> */
> struct pwm_state {
> - unsigned int period;
> - unsigned int duty_cycle;
> + u64 period;
> + u64 duty_cycle;
> enum pwm_polarity polarity;
> bool enabled;
> };
> @@ -105,13 +105,13 @@ static inline bool pwm_is_enabled(const struct
> pwm_device *pwm)
> return state.enabled;
> }
>
> -static inline void pwm_set_period(struct pwm_device *pwm, unsigned int
> period)
> +static inline void pwm_set_period(struct pwm_device *pwm, u64 period)
> {
> if (pwm)
> pwm->state.period = period;
> }
>
> -static inline unsigned int pwm_get_period(const struct pwm_device *pwm)
> +static inline u64 pwm_get_period(const struct pwm_device *pwm)
> {
> struct pwm_state state;
>
> @@ -126,7 +126,7 @@ static inline void pwm_set_duty_cycle(struct pwm_device
> *pwm, unsigned int duty)
> pwm->state.duty_cycle = duty;
> }
>
> -static inline unsigned int pwm_get_duty_cycle(const struct pwm_device *pwm)
> +static inline u64 pwm_get_duty_cycle(const struct pwm_device *pwm)
> {
> struct pwm_state state;
>
> @@ -308,8 +308,8 @@ struct pwm_chip {
> * @duty_cycle: duty cycle of the PWM signal (in nanoseconds)
> */
> struct pwm_capture {
> - unsigned int period;
> - unsigned int duty_cycle;
> + u64 period;
> + u64 duty_cycle;
> };
>
> #if IS_ENABLED(CONFIG_PWM)
> --
> The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
> a Linux Foundation Collaborative Project
>
signature.asc
Description: PGP signature
