mirros/rockchip-kernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pwm: rockchip: need the Distinguish between rk3328 and rk3288 for clk used

Browse Source 
Change-Id: Ib6274a200640ab8829a99761ffbf60d530fe5653
Signed-off-by: david.wu <david.wu@rock-chips.com>
This commit is contained in:
david.wu
2017-02-17 16:21:19 +08:00
committed by Huang, Tao
parent 216c7fac8f
commit 891c3e1524
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/devicetree/bindings/pwm/pwm-rockchip.txt
View File

@@ -5,7 +5,7 @@ Required properties:
"rockchip,rk2928-pwm": found on RK29XX,RK3066 and RK3188 SoCs "rockchip,rk2928-pwm": found on RK29XX,RK3066 and RK3188 SoCs
"rockchip,rk3288-pwm": found on RK3288 SoC "rockchip,rk3288-pwm": found on RK3288 SoC
"rockchip,vop-pwm": found integrated in VOP 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 "rockchip,rk3399-pwm", "rockchip,rk3288-pwm": found on RK3399 SoC
- reg: physical base address and length of the controller's registers - reg: physical base address and length of the controller's registers
- clocks: See ../clock/clock-bindings.txt - clocks: See ../clock/clock-bindings.txt

1
drivers/pwm/pwm-rockchip.c
View File

@@ -239,6 +239,7 @@ static const struct rockchip_pwm_data pwm_data_vop = {
static const struct of_device_id rockchip_pwm_dt_ids[] = { static const struct of_device_id rockchip_pwm_dt_ids[] = {
{ .compatible = "rockchip,rk2928-pwm", .data = &pwm_data_v1}, { .compatible = "rockchip,rk2928-pwm", .data = &pwm_data_v1},
{ .compatible = "rockchip,rk3288-pwm", .data = &pwm_data_v2}, { .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,vop-pwm", .data = &pwm_data_vop},
{ .compatible = "rockchip,rk3399-pwm", .data = &pwm_data_v2}, { .compatible = "rockchip,rk3399-pwm", .data = &pwm_data_v2},
{ /* sentinel */ } { /* sentinel */ }