diff options
| author | Tom Rini <trini@konsulko.com> | 2023-11-17 08:38:05 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-11-17 08:38:05 -0500 |
| commit | ae7ec8b0be41b59ef323f7531c0fe6745e8fef45 (patch) | |
| tree | d3b5bff2626d743a15533b8400985974817f1cc3 /drivers/pwm/pwm-mtk.c | |
| parent | 6c1608b1ffb372d4dabf1b879e68428712353709 (diff) | |
| parent | b83fae673a9cd9795e531883936c1468e75510a5 (diff) | |
Merge branch '2023-11-16-assorted-updates' into next
- squashfs improvements, remove common.h in some places, assorted code
fixes, fix a few CONFIG symbol names in Kconfig files, bring in
linux's <linux/time.h> conversion functions, poplar updates, bcb
improvements.
Diffstat (limited to 'drivers/pwm/pwm-mtk.c')
| -rw-r--r-- | drivers/pwm/pwm-mtk.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/pwm/pwm-mtk.c b/drivers/pwm/pwm-mtk.c index 11e7444019..ad845ed966 100644 --- a/drivers/pwm/pwm-mtk.c +++ b/drivers/pwm/pwm-mtk.c @@ -12,6 +12,7 @@ #include <div64.h> #include <linux/bitops.h> #include <linux/io.h> +#include <linux/time.h> /* PWM registers and bits definitions */ #define PWMCON 0x00 @@ -27,8 +28,6 @@ #define PWM_CLK_DIV_MAX 7 #define MAX_PWM_NUM 8 -#define NSEC_PER_SEC 1000000000L - enum mtk_pwm_reg_ver { PWM_REG_V1, PWM_REG_V2, |