[v4,2/4] clk: rockchip: set an ID for crypto clk

Commit Message

Zain Wang Nov. 17, 2015, 4 a.m. UTC

Set an ID for crypto clk, so that it can be called in other part.

Signed-off-by: Zain Wang <[e-mail]>
Acked-by: Michael Turquette <[e-mail]>
Tested-by: Heiko Stuebner <[e-mail]>
---
Changed in v4:
- None
Changed in v3:
- None
Changed in v2: 
- None
Changed in v1:
- define SCLK_CRYPTO in rk3288-cru.h
- use SCLK_CRYPTO instead of SRST_CRYPTO

 drivers/clk/rockchip/clk-rk3288.c      | 2 +-
 include/dt-bindings/clock/rk3288-cru.h | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

Comments

Heiko Stübner Nov. 23, 2015, 11:24 p.m. UTC | #1

Hi Zain,

Am Dienstag, 17. November 2015, 12:00:45 schrieb Zain Wang:
> Set an ID for crypto clk, so that it can be called in other part.
> 
> Signed-off-by: Zain Wang <[e-mail]>
> Acked-by: Michael Turquette <[e-mail]>
> Tested-by: Heiko Stuebner <[e-mail]>

I've split this into the header and clk-rk3288.c changes and applied it to my 
clk-ids and clock branch for 4.5


Thanks
Heiko

Zain Wang Nov. 24, 2015, 12:49 a.m. UTC | #2

On 2015?11?24? 07:24, Heiko Stübner wrote:
> Hi Zain,
>
> Am Dienstag, 17. November 2015, 12:00:45 schrieb Zain Wang:
>> Set an ID for crypto clk, so that it can be called in other part.
>>
>> Signed-off-by: Zain Wang <[e-mail]>
>> Acked-by: Michael Turquette <[e-mail]>
>> Tested-by: Heiko Stuebner <[e-mail]>
> I've split this into the header and clk-rk3288.c changes and applied it to my 
> clk-ids and clock branch for 4.5
Thanks for your responding.

Thanks
Zain
>
> Thanks
> Heiko
>
>
>

Patch

diff --git a/drivers/clk/rockchip/clk-rk3288.c b/drivers/clk/rockchip/clk-rk3288.c
index 9040878..3fceda1 100644
--- a/drivers/clk/rockchip/clk-rk3288.c
+++ b/drivers/clk/rockchip/clk-rk3288.c
@@ -295,7 +295,7 @@  static struct rockchip_clk_branch rk3288_clk_branches[] __initdata = {
 			RK3288_CLKGATE_CON(0), 4, GFLAGS),
 	GATE(0, "c2c_host", "aclk_cpu_src", 0,
 			RK3288_CLKGATE_CON(13), 8, GFLAGS),
-	COMPOSITE_NOMUX(0, "crypto", "aclk_cpu_pre", 0,
+	COMPOSITE_NOMUX(SCLK_CRYPTO, "crypto", "aclk_cpu_pre", 0,
 			RK3288_CLKSEL_CON(26), 6, 2, DFLAGS,
 			RK3288_CLKGATE_CON(5), 4, GFLAGS),
 	GATE(0, "aclk_bus_2pmu", "aclk_cpu_pre", CLK_IGNORE_UNUSED,
diff --git a/include/dt-bindings/clock/rk3288-cru.h b/include/dt-bindings/clock/rk3288-cru.h
index c719aac..30dcd60 100644
--- a/include/dt-bindings/clock/rk3288-cru.h
+++ b/include/dt-bindings/clock/rk3288-cru.h
@@ -86,6 +86,7 @@ 
 #define SCLK_USBPHY480M_SRC	122
 #define SCLK_PVTM_CORE		123
 #define SCLK_PVTM_GPU		124
+#define SCLK_CRYPTO			125
 
 #define SCLK_MAC		151
 #define SCLK_MACREF_OUT		152