diff options
| author | Thierry Reding <thierry.reding@gmail.com> | 2016-09-08 10:59:30 +0200 |
|---|---|---|
| committer | Thierry Reding <thierry.reding@gmail.com> | 2016-09-08 10:59:30 +0200 |
| commit | dc8e6e1e8f2d2719dd396708b0f56d8b73c9ea52 (patch) | |
| tree | fa718cd29fd65ad180b57856a9ee67e2bc324c44 /drivers/pwm/pwm-sun4i.c | |
| parent | Merge branch 'for-4.9/core' into for-next (diff) | |
| parent | pwm: meson: Handle unknown ID values (diff) | |
| download | linux-dc8e6e1e8f2d2719dd396708b0f56d8b73c9ea52.tar.xz linux-dc8e6e1e8f2d2719dd396708b0f56d8b73c9ea52.zip | |
Merge branch 'for-4.9/drivers' into for-next
Diffstat (limited to 'drivers/pwm/pwm-sun4i.c')
| -rw-r--r-- | drivers/pwm/pwm-sun4i.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/pwm/pwm-sun4i.c b/drivers/pwm/pwm-sun4i.c index 03a99a53c39e..b0803f6c64d9 100644 --- a/drivers/pwm/pwm-sun4i.c +++ b/drivers/pwm/pwm-sun4i.c @@ -284,6 +284,12 @@ static const struct sun4i_pwm_data sun4i_pwm_data_a20 = { .npwm = 2, }; +static const struct sun4i_pwm_data sun4i_pwm_data_h3 = { + .has_prescaler_bypass = true, + .has_rdy = true, + .npwm = 1, +}; + static const struct of_device_id sun4i_pwm_dt_ids[] = { { .compatible = "allwinner,sun4i-a10-pwm", @@ -298,6 +304,9 @@ static const struct of_device_id sun4i_pwm_dt_ids[] = { .compatible = "allwinner,sun7i-a20-pwm", .data = &sun4i_pwm_data_a20, }, { + .compatible = "allwinner,sun8i-h3-pwm", + .data = &sun4i_pwm_data_h3, + }, { /* sentinel */ }, }; |