X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=arch%2Farm%2Fmach-rockchip%2Frockchip.c;h=7fbecd0f2d3da6dc8df6b8665a1b24598a251063;hb=941e22553dc5b8ddd0d363296499966c7ad29818;hp=251c7b9c5f9b6c15ffdab39475d6b7764e9c2fc0;hpb=511601bdbcacd3ab615564941409bf012435b23d;p=firefly-linux-kernel-4.4.55.git

diff --git a/arch/arm/mach-rockchip/rockchip.c b/arch/arm/mach-rockchip/rockchip.c
index 251c7b9c5f9b..7fbecd0f2d3d 100644
--- a/arch/arm/mach-rockchip/rockchip.c
+++ b/arch/arm/mach-rockchip/rockchip.c
@@ -30,6 +30,7 @@
 #include "pm.h"
 
 #define RK3288_GRF_SOC_CON0 0x244
+#define RK3288_GRF_SOC_CON2 0x24C
 #define RK3288_TIMER6_7_PHYS 0xff810000
 
 static void __init rockchip_timer_init(void)
@@ -60,10 +61,14 @@ static void __init rockchip_timer_init(void)
 		 * with the mmc controllers making them unreliable
 		 */
 		grf = syscon_regmap_lookup_by_compatible("rockchip,rk3288-grf");
-		if (!IS_ERR(grf))
+		if (!IS_ERR(grf)) {
 			regmap_write(grf, RK3288_GRF_SOC_CON0, 0x10000000);
-		else
+
+			/* Set pwm_sel to RK design PWM; affects all PWMs */
+			regmap_write(grf, RK3288_GRF_SOC_CON2, 0x00010001);
+		} else {
 			pr_err("rockchip: could not get grf syscon\n");
+                }
 	}
 
 	of_clk_init(NULL);