* [PATCH v1 1/2] clk: rockchip: rk3368: export SCLK_TIMERXX id for timers @ 2017-03-07 9:50 Elaine Zhang 2017-03-07 9:50 ` [PATCH v1 2/2] clk: rockchip: rk3368: add some clks as critical Elaine Zhang 2017-03-07 10:18 ` [PATCH v1 1/2] clk: rockchip: rk3368: export SCLK_TIMERXX id for timers Heiko Stübner 0 siblings, 2 replies; 3+ messages in thread From: Elaine Zhang @ 2017-03-07 9:50 UTC (permalink / raw) To: linux-arm-kernel Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com> --- drivers/clk/rockchip/clk-rk3368.c | 24 ++++++++++++------------ include/dt-bindings/clock/rk3368-cru.h | 19 ++++++++++++------- 2 files changed, 24 insertions(+), 19 deletions(-) diff --git a/drivers/clk/rockchip/clk-rk3368.c b/drivers/clk/rockchip/clk-rk3368.c index 6cb474c593e7..139d418f448e 100644 --- a/drivers/clk/rockchip/clk-rk3368.c +++ b/drivers/clk/rockchip/clk-rk3368.c @@ -835,18 +835,18 @@ enum rk3368_plls { GATE(PCLK_PMU, "pclk_pmu", "pclk_pd_pmu", CLK_IGNORE_UNUSED, RK3368_CLKGATE_CON(23), 0, GFLAGS), /* timer gates */ - GATE(0, "sclk_timer15", "xin24m", CLK_IGNORE_UNUSED, RK3368_CLKGATE_CON(24), 11, GFLAGS), - GATE(0, "sclk_timer14", "xin24m", CLK_IGNORE_UNUSED, RK3368_CLKGATE_CON(24), 10, GFLAGS), - GATE(0, "sclk_timer13", "xin24m", CLK_IGNORE_UNUSED, RK3368_CLKGATE_CON(24), 9, GFLAGS), - GATE(0, "sclk_timer12", "xin24m", CLK_IGNORE_UNUSED, RK3368_CLKGATE_CON(24), 8, GFLAGS), - GATE(0, "sclk_timer11", "xin24m", CLK_IGNORE_UNUSED, RK3368_CLKGATE_CON(24), 7, GFLAGS), - GATE(0, "sclk_timer10", "xin24m", CLK_IGNORE_UNUSED, RK3368_CLKGATE_CON(24), 6, GFLAGS), - GATE(0, "sclk_timer05", "xin24m", CLK_IGNORE_UNUSED, RK3368_CLKGATE_CON(24), 5, GFLAGS), - GATE(0, "sclk_timer04", "xin24m", CLK_IGNORE_UNUSED, RK3368_CLKGATE_CON(24), 4, GFLAGS), - GATE(0, "sclk_timer03", "xin24m", CLK_IGNORE_UNUSED, RK3368_CLKGATE_CON(24), 3, GFLAGS), - GATE(0, "sclk_timer02", "xin24m", CLK_IGNORE_UNUSED, RK3368_CLKGATE_CON(24), 2, GFLAGS), - GATE(0, "sclk_timer01", "xin24m", CLK_IGNORE_UNUSED, RK3368_CLKGATE_CON(24), 1, GFLAGS), - GATE(0, "sclk_timer00", "xin24m", CLK_IGNORE_UNUSED, RK3368_CLKGATE_CON(24), 0, GFLAGS), + GATE(SCLK_TIMER15, "sclk_timer15", "xin24m", CLK_IGNORE_UNUSED, RK3368_CLKGATE_CON(24), 11, GFLAGS), + GATE(SCLK_TIMER14, "sclk_timer14", "xin24m", CLK_IGNORE_UNUSED, RK3368_CLKGATE_CON(24), 10, GFLAGS), + GATE(SCLK_TIMER13, "sclk_timer13", "xin24m", CLK_IGNORE_UNUSED, RK3368_CLKGATE_CON(24), 9, GFLAGS), + GATE(SCLK_TIMER12, "sclk_timer12", "xin24m", CLK_IGNORE_UNUSED, RK3368_CLKGATE_CON(24), 8, GFLAGS), + GATE(SCLK_TIMER11, "sclk_timer11", "xin24m", CLK_IGNORE_UNUSED, RK3368_CLKGATE_CON(24), 7, GFLAGS), + GATE(SCLK_TIMER10, "sclk_timer10", "xin24m", CLK_IGNORE_UNUSED, RK3368_CLKGATE_CON(24), 6, GFLAGS), + GATE(SCLK_TIMER05, "sclk_timer05", "xin24m", CLK_IGNORE_UNUSED, RK3368_CLKGATE_CON(24), 5, GFLAGS), + GATE(SCLK_TIMER04, "sclk_timer04", "xin24m", CLK_IGNORE_UNUSED, RK3368_CLKGATE_CON(24), 4, GFLAGS), + GATE(SCLK_TIMER03, "sclk_timer03", "xin24m", CLK_IGNORE_UNUSED, RK3368_CLKGATE_CON(24), 3, GFLAGS), + GATE(SCLK_TIMER02, "sclk_timer02", "xin24m", CLK_IGNORE_UNUSED, RK3368_CLKGATE_CON(24), 2, GFLAGS), + GATE(SCLK_TIMER01, "sclk_timer01", "xin24m", CLK_IGNORE_UNUSED, RK3368_CLKGATE_CON(24), 1, GFLAGS), + GATE(SCLK_TIMER00, "sclk_timer00", "xin24m", CLK_IGNORE_UNUSED, RK3368_CLKGATE_CON(24), 0, GFLAGS), }; static const char *const rk3368_critical_clocks[] __initconst = { diff --git a/include/dt-bindings/clock/rk3368-cru.h b/include/dt-bindings/clock/rk3368-cru.h index 9c5dd9ba2f6c..aeb83e581a11 100644 --- a/include/dt-bindings/clock/rk3368-cru.h +++ b/include/dt-bindings/clock/rk3368-cru.h @@ -44,13 +44,12 @@ #define SCLK_I2S_8CH 82 #define SCLK_SPDIF_8CH 83 #define SCLK_I2S_2CH 84 -#define SCLK_TIMER0 85 -#define SCLK_TIMER1 86 -#define SCLK_TIMER2 87 -#define SCLK_TIMER3 88 -#define SCLK_TIMER4 89 -#define SCLK_TIMER5 90 -#define SCLK_TIMER6 91 +#define SCLK_TIMER00 85 +#define SCLK_TIMER01 86 +#define SCLK_TIMER02 87 +#define SCLK_TIMER03 88 +#define SCLK_TIMER04 89 +#define SCLK_TIMER05 90 #define SCLK_OTGPHY0 93 #define SCLK_OTG_ADP 96 #define SCLK_HSICPHY480M 97 @@ -82,6 +81,12 @@ #define SCLK_SFC 126 #define SCLK_MAC 127 #define SCLK_MACREF_OUT 128 +#define SCLK_TIMER10 133 +#define SCLK_TIMER11 134 +#define SCLK_TIMER12 135 +#define SCLK_TIMER13 136 +#define SCLK_TIMER14 137 +#define SCLK_TIMER15 138 #define DCLK_VOP 190 #define MCLK_CRYPTO 191 -- 1.9.1 ^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH v1 2/2] clk: rockchip: rk3368: add some clks as critical 2017-03-07 9:50 [PATCH v1 1/2] clk: rockchip: rk3368: export SCLK_TIMERXX id for timers Elaine Zhang @ 2017-03-07 9:50 ` Elaine Zhang 2017-03-07 10:18 ` [PATCH v1 1/2] clk: rockchip: rk3368: export SCLK_TIMERXX id for timers Heiko Stübner 1 sibling, 0 replies; 3+ messages in thread From: Elaine Zhang @ 2017-03-07 9:50 UTC (permalink / raw) To: linux-arm-kernel make pclk_pd_alive, pclk_peri, hclk_peri as critical Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com> --- drivers/clk/rockchip/clk-rk3368.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/clk/rockchip/clk-rk3368.c b/drivers/clk/rockchip/clk-rk3368.c index 139d418f448e..024762d3214d 100644 --- a/drivers/clk/rockchip/clk-rk3368.c +++ b/drivers/clk/rockchip/clk-rk3368.c @@ -858,6 +858,9 @@ enum rk3368_plls { */ "pclk_pwm1", "pclk_pd_pmu", + "pclk_pd_alive", + "pclk_peri", + "hclk_peri", }; static void __init rk3368_clk_init(struct device_node *np) -- 1.9.1 ^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH v1 1/2] clk: rockchip: rk3368: export SCLK_TIMERXX id for timers 2017-03-07 9:50 [PATCH v1 1/2] clk: rockchip: rk3368: export SCLK_TIMERXX id for timers Elaine Zhang 2017-03-07 9:50 ` [PATCH v1 2/2] clk: rockchip: rk3368: add some clks as critical Elaine Zhang @ 2017-03-07 10:18 ` Heiko Stübner 1 sibling, 0 replies; 3+ messages in thread From: Heiko Stübner @ 2017-03-07 10:18 UTC (permalink / raw) To: linux-arm-kernel Hi Elaine, Am Dienstag, 7. M?rz 2017, 17:50:10 CET schrieb Elaine Zhang: > Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com> > --- > drivers/clk/rockchip/clk-rk3368.c | 24 ++++++++++++------------ > include/dt-bindings/clock/rk3368-cru.h | 19 ++++++++++++------- as always, please split clock-id addition and the assignment in the clock- driver. Also, as it looks like the old timer-ids are wrong and also still unused, please also state this in the patch changing the ids. Thanks Heiko > 2 files changed, 24 insertions(+), 19 deletions(-) > > diff --git a/drivers/clk/rockchip/clk-rk3368.c > b/drivers/clk/rockchip/clk-rk3368.c index 6cb474c593e7..139d418f448e 100644 > --- a/drivers/clk/rockchip/clk-rk3368.c > +++ b/drivers/clk/rockchip/clk-rk3368.c > @@ -835,18 +835,18 @@ enum rk3368_plls { > GATE(PCLK_PMU, "pclk_pmu", "pclk_pd_pmu", CLK_IGNORE_UNUSED, > RK3368_CLKGATE_CON(23), 0, GFLAGS), > > /* timer gates */ > - GATE(0, "sclk_timer15", "xin24m", CLK_IGNORE_UNUSED, > RK3368_CLKGATE_CON(24), 11, GFLAGS), - GATE(0, "sclk_timer14", "xin24m", > CLK_IGNORE_UNUSED, RK3368_CLKGATE_CON(24), 10, GFLAGS), - GATE(0, > "sclk_timer13", "xin24m", CLK_IGNORE_UNUSED, RK3368_CLKGATE_CON(24), 9, > GFLAGS), - GATE(0, "sclk_timer12", "xin24m", CLK_IGNORE_UNUSED, > RK3368_CLKGATE_CON(24), 8, GFLAGS), - GATE(0, "sclk_timer11", "xin24m", > CLK_IGNORE_UNUSED, RK3368_CLKGATE_CON(24), 7, GFLAGS), - GATE(0, > "sclk_timer10", "xin24m", CLK_IGNORE_UNUSED, RK3368_CLKGATE_CON(24), 6, > GFLAGS), - GATE(0, "sclk_timer05", "xin24m", CLK_IGNORE_UNUSED, > RK3368_CLKGATE_CON(24), 5, GFLAGS), - GATE(0, "sclk_timer04", "xin24m", > CLK_IGNORE_UNUSED, RK3368_CLKGATE_CON(24), 4, GFLAGS), - GATE(0, > "sclk_timer03", "xin24m", CLK_IGNORE_UNUSED, RK3368_CLKGATE_CON(24), 3, > GFLAGS), - GATE(0, "sclk_timer02", "xin24m", CLK_IGNORE_UNUSED, > RK3368_CLKGATE_CON(24), 2, GFLAGS), - GATE(0, "sclk_timer01", "xin24m", > CLK_IGNORE_UNUSED, RK3368_CLKGATE_CON(24), 1, GFLAGS), - GATE(0, > "sclk_timer00", "xin24m", CLK_IGNORE_UNUSED, RK3368_CLKGATE_CON(24), 0, > GFLAGS), + GATE(SCLK_TIMER15, "sclk_timer15", "xin24m", CLK_IGNORE_UNUSED, > RK3368_CLKGATE_CON(24), 11, GFLAGS), + GATE(SCLK_TIMER14, "sclk_timer14", > "xin24m", CLK_IGNORE_UNUSED, RK3368_CLKGATE_CON(24), 10, GFLAGS), > + GATE(SCLK_TIMER13, "sclk_timer13", "xin24m", CLK_IGNORE_UNUSED, > RK3368_CLKGATE_CON(24), 9, GFLAGS), + GATE(SCLK_TIMER12, "sclk_timer12", > "xin24m", CLK_IGNORE_UNUSED, RK3368_CLKGATE_CON(24), 8, GFLAGS), > + GATE(SCLK_TIMER11, "sclk_timer11", "xin24m", CLK_IGNORE_UNUSED, > RK3368_CLKGATE_CON(24), 7, GFLAGS), + GATE(SCLK_TIMER10, "sclk_timer10", > "xin24m", CLK_IGNORE_UNUSED, RK3368_CLKGATE_CON(24), 6, GFLAGS), > + GATE(SCLK_TIMER05, "sclk_timer05", "xin24m", CLK_IGNORE_UNUSED, > RK3368_CLKGATE_CON(24), 5, GFLAGS), + GATE(SCLK_TIMER04, "sclk_timer04", > "xin24m", CLK_IGNORE_UNUSED, RK3368_CLKGATE_CON(24), 4, GFLAGS), > + GATE(SCLK_TIMER03, "sclk_timer03", "xin24m", CLK_IGNORE_UNUSED, > RK3368_CLKGATE_CON(24), 3, GFLAGS), + GATE(SCLK_TIMER02, "sclk_timer02", > "xin24m", CLK_IGNORE_UNUSED, RK3368_CLKGATE_CON(24), 2, GFLAGS), > + GATE(SCLK_TIMER01, "sclk_timer01", "xin24m", CLK_IGNORE_UNUSED, > RK3368_CLKGATE_CON(24), 1, GFLAGS), + GATE(SCLK_TIMER00, "sclk_timer00", > "xin24m", CLK_IGNORE_UNUSED, RK3368_CLKGATE_CON(24), 0, GFLAGS), }; > > static const char *const rk3368_critical_clocks[] __initconst = { > diff --git a/include/dt-bindings/clock/rk3368-cru.h > b/include/dt-bindings/clock/rk3368-cru.h index 9c5dd9ba2f6c..aeb83e581a11 > 100644 > --- a/include/dt-bindings/clock/rk3368-cru.h > +++ b/include/dt-bindings/clock/rk3368-cru.h > @@ -44,13 +44,12 @@ > #define SCLK_I2S_8CH 82 > #define SCLK_SPDIF_8CH 83 > #define SCLK_I2S_2CH 84 > -#define SCLK_TIMER0 85 > -#define SCLK_TIMER1 86 > -#define SCLK_TIMER2 87 > -#define SCLK_TIMER3 88 > -#define SCLK_TIMER4 89 > -#define SCLK_TIMER5 90 > -#define SCLK_TIMER6 91 > +#define SCLK_TIMER00 85 > +#define SCLK_TIMER01 86 > +#define SCLK_TIMER02 87 > +#define SCLK_TIMER03 88 > +#define SCLK_TIMER04 89 > +#define SCLK_TIMER05 90 > #define SCLK_OTGPHY0 93 > #define SCLK_OTG_ADP 96 > #define SCLK_HSICPHY480M 97 > @@ -82,6 +81,12 @@ > #define SCLK_SFC 126 > #define SCLK_MAC 127 > #define SCLK_MACREF_OUT 128 > +#define SCLK_TIMER10 133 > +#define SCLK_TIMER11 134 > +#define SCLK_TIMER12 135 > +#define SCLK_TIMER13 136 > +#define SCLK_TIMER14 137 > +#define SCLK_TIMER15 138 > > #define DCLK_VOP 190 > #define MCLK_CRYPTO 191 ^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-03-07 10:18 UTC | newest] Thread overview: 3+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2017-03-07 9:50 [PATCH v1 1/2] clk: rockchip: rk3368: export SCLK_TIMERXX id for timers Elaine Zhang 2017-03-07 9:50 ` [PATCH v1 2/2] clk: rockchip: rk3368: add some clks as critical Elaine Zhang 2017-03-07 10:18 ` [PATCH v1 1/2] clk: rockchip: rk3368: export SCLK_TIMERXX id for timers Heiko Stübner
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).