projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ARM64: firefly: Add rk3399-firefly board support
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm
/
mach-rockchip
/
rockchip.c
diff --git
a/arch/arm/mach-rockchip/rockchip.c
b/arch/arm/mach-rockchip/rockchip.c
index 251c7b9c5f9b6c15ffdab39475d6b7764e9c2fc0..7fbecd0f2d3da6dc8df6b8665a1b24598a251063 100644
(file)
--- 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
#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)
#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");
* 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);
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");
pr_err("rockchip: could not get grf syscon\n");
+ }
}
of_clk_init(NULL);
}
of_clk_init(NULL);