diff options
| author | david.wu <david.wu@rock-chips.com> | 2017-02-17 16:21:19 +0800 |
|---|---|---|
| committer | Huang, Tao <huangtao@rock-chips.com> | 2017-02-17 17:28:41 +0800 |
| commit | 891c3e1524fd6461689721dc06c55d28e93fc988 (patch) | |
| tree | 918d16151019831613a59c9020051959cc0c3cb7 | |
| parent | 216c7fac8f6464f26b7f2cf5ea105129c4425f64 (diff) | |
pwm: rockchip: need the Distinguish between rk3328 and rk3288 for clk used
Change-Id: Ib6274a200640ab8829a99761ffbf60d530fe5653
Signed-off-by: david.wu <david.wu@rock-chips.com>
| -rw-r--r-- | Documentation/devicetree/bindings/pwm/pwm-rockchip.txt | 2 | ||||
| -rw-r--r-- | drivers/pwm/pwm-rockchip.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/pwm/pwm-rockchip.txt b/Documentation/devicetree/bindings/pwm/pwm-rockchip.txt index 2a860b445b2d..f944723128b8 100644 --- a/Documentation/devicetree/bindings/pwm/pwm-rockchip.txt +++ b/Documentation/devicetree/bindings/pwm/pwm-rockchip.txt @@ -5,7 +5,7 @@ Required properties: "rockchip,rk2928-pwm": found on RK29XX,RK3066 and RK3188 SoCs "rockchip,rk3288-pwm": found on RK3288 SoC "rockchip,vop-pwm": found integrated in VOP on RK3288 SoC - "rockchip,rk3328-pwm", "rockchip,rk3288-pwm": found on RK3328 SoC + "rockchip,rk3328-pwm": found on RK3328 SoC "rockchip,rk3399-pwm", "rockchip,rk3288-pwm": found on RK3399 SoC - reg: physical base address and length of the controller's registers - clocks: See ../clock/clock-bindings.txt diff --git a/drivers/pwm/pwm-rockchip.c b/drivers/pwm/pwm-rockchip.c index 88f9226471b9..298c8357b6bb 100644 --- a/drivers/pwm/pwm-rockchip.c +++ b/drivers/pwm/pwm-rockchip.c @@ -239,6 +239,7 @@ static const struct rockchip_pwm_data pwm_data_vop = { static const struct of_device_id rockchip_pwm_dt_ids[] = { { .compatible = "rockchip,rk2928-pwm", .data = &pwm_data_v1}, { .compatible = "rockchip,rk3288-pwm", .data = &pwm_data_v2}, + { .compatible = "rockchip,rk3328-pwm", .data = &pwm_data_v2}, { .compatible = "rockchip,vop-pwm", .data = &pwm_data_vop}, { .compatible = "rockchip,rk3399-pwm", .data = &pwm_data_v2}, { /* sentinel */ } |