From: 许盛飞 <xsf@rock-chips.com>
Date: Wed, 19 Mar 2014 09:19:26 +0000 (+0800)
Subject: pwm: pwm clocks name-pclk-pwm
X-Git-Tag: firefly_0821_release~6000
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=fb3b7f3e86bc15885e9e8836896f3d8e23d6f515;p=firefly-linux-kernel-4.4.55.git

pwm: pwm clocks name-pclk-pwm
---

diff --git a/arch/arm/boot/dts/rk3188.dtsi b/arch/arm/boot/dts/rk3188.dtsi
index 227023071a25..0030a2965f2d 100755
--- 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 6bcee0c91dcb..02dd24a047bb 100755
--- 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 7a379299b44d..bdad0138f310 100644
--- 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))