From: david.wu Date: Fri, 17 Feb 2017 08:21:19 +0000 (+0800) Subject: pwm: rockchip: need the Distinguish between rk3328 and rk3288 for clk used X-Git-Tag: firefly_0821_release~607 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=891c3e1524fd6461689721dc06c55d28e93fc988;p=firefly-linux-kernel-4.4.55.git pwm: rockchip: need the Distinguish between rk3328 and rk3288 for clk used Change-Id: Ib6274a200640ab8829a99761ffbf60d530fe5653 Signed-off-by: david.wu --- 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 */ }