pwm: pwm clocks name-pclk-pwm

diff --git a/arch/arm/boot/dts/rk3188.dtsi b/arch/arm/boot/dts/rk3188.dtsi
index 227023071a25bd6f01b68f05b90cdca6c62f7679..0030a2965f2dc5fe8774230acfa15af2b3cc629a 100755 (executable)
--- a/arch/arm/boot/dts/rk3188.dtsi
+++ b/arch/arm/boot/dts/rk3188.dtsi
@@ -608,6 +608,8 @@
                 #pwm-cells = <2>;
                 pinctrl-names = "default";
                 pinctrl-0 = <&pwm0_pin>;
+               clocks = <&clk_gates7 10>;
+               clock-names = "pclk_pwm";
                 status = "disabled";
 
         };
@@ -618,6 +620,8 @@
                 #pwm-cells = <2>;
                 pinctrl-names = "default";
                 pinctrl-0 = <&pwm1_pin>;
+               clocks = <&clk_gates7 10>;
+               clock-names = "pclk_pwm";
                 status = "disabled";
 
         };
@@ -626,6 +630,8 @@
                 reg = <0x20050020 0x10>; /*0x20030000*/
                 #pwm-cells = <2>;
                 pinctrl-names = "default";
+               clock-names = "pclk_pwm";
+               clocks = <&clk_gates7 11>;
                 pinctrl-0 = <&pwm2_pin>;
                 status = "disabled";
 
@@ -637,6 +643,8 @@
                 #pwm-cells = <2>;
                 pinctrl-names = "default";
                 pinctrl-0 = <&pwm3_pin>;
+               clocks = <&clk_gates7 11>;
+               clock-names = "pclk_pwm";
                 status = "disabled";
 
         };

diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi
index 6bcee0c91dcb6fa3cf746664f935fd9a2130fe3b..02dd24a047bbdc691823cfbce8906957cd48d975 100755 (executable)
--- a/arch/arm/boot/dts/rk3288.dtsi
+++ b/arch/arm/boot/dts/rk3288.dtsi
@@ -662,6 +662,8 @@
                #pwm-cells = <2>;
                pinctrl-names = "default";
                pinctrl-0 = <&pwm0_pin>;
+               clocks = <&clk_gates11 11>;
+               clock-names = "pclk_pwm";
                status = "okay";
        };
 
@@ -671,6 +673,8 @@
                #pwm-cells = <2>;
                pinctrl-names = "default";
                pinctrl-0 = <&pwm1_pin>;
+               clocks = <&clk_gates11 11>;
+               clock-names = "pclk_pwm";
                status = "disabled";
        };
 
@@ -680,6 +684,8 @@
                #pwm-cells = <2>;
                pinctrl-names = "default";
                pinctrl-0 = <&pwm2_pin>;
+               clocks = <&clk_gates11 11>;
+               clock-names = "pclk_pwm";
                status = "disabled";
        };
 
@@ -689,6 +695,8 @@
                #pwm-cells = <2>;
                pinctrl-names = "default";
                pinctrl-0 = <&pwm3_pin>;
+               clocks = <&clk_gates11 11>;
+               clock-names = "pclk_pwm";
                status = "disabled";
        };
        dvfs {

diff --git a/drivers/pwm/pwm-rockchip.c b/drivers/pwm/pwm-rockchip.c
index 7a379299b44dba4c2e0e03e9b9687a549b8e5901..bdad0138f310e3a2ddacf1aa05b172a6d00ec954 100644 (file)
--- a/drivers/pwm/pwm-rockchip.c
+++ b/drivers/pwm/pwm-rockchip.c
@@ -445,7 +445,7 @@ static int rk_pwm_probe(struct platform_device *pdev)
                pc->pwm_id = RK_PWM;
        }
        //pc->clk = devm_clk_get(&pdev->dev, NULL);
-       pc->clk = clk_get(NULL,"g_p_pwm23");
+       pc->clk = devm_clk_get(&pdev->dev,"pclk_pwm");
 
 
        if (IS_ERR(pc->clk))