Message ID | 1447223759-20730-3-git-send-email-zain.wang@rock-chips.com (mailing list archive) |
---|---|
State | Superseded |
Delegated to: | Herbert Xu |
Headers | show |
Am Mittwoch, 11. November 2015, 14:35:57 schrieb Zain Wang: > Set an ID for crypto clk, so that it can be called in other part. > > Signed-off-by: Zain Wang <zain.wang@rock-chips.com> this should go in together with patch4, the dts change, so an Ack from the clock-maintainers would be nice :-) Heiko > --- > > 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(-) > > 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 > -- To unsubscribe from this list: send the line "unsubscribe linux-crypto" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 2015?11?12? 07:57, Heiko Stuebner wrote: > Am Mittwoch, 11. November 2015, 14:35:57 schrieb Zain Wang: >> Set an ID for crypto clk, so that it can be called in other part. >> >> Signed-off-by: Zain Wang <zain.wang@rock-chips.com> > this should go in together with patch4, the dts change, so an Ack from the > clock-maintainers would be nice :-) > > > Heiko Ok! Done! Thanks. > >> --- >> >> 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(-) >> >> 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 >> > > > -- To unsubscribe from this list: send the line "unsubscribe linux-crypto" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Am Donnerstag, 12. November 2015, 09:13:20 schrieb Zain: > > On 2015?11?12? 07:57, Heiko Stuebner wrote: > > Am Mittwoch, 11. November 2015, 14:35:57 schrieb Zain Wang: > >> Set an ID for crypto clk, so that it can be called in other part. > >> > >> Signed-off-by: Zain Wang <zain.wang@rock-chips.com> > > this should go in together with patch4, the dts change, so an Ack from the > > clock-maintainers would be nice :-) > > > > > > Heiko > Ok! Done! > Thanks. I'm not sure I understand that. There is nothing to do for you here, I was merely stating the fact that we will need to get an Acked-by from the clock maintainers, to allow me to take both this and the devicetree patch :-) Heiko > > > >> --- > >> > >> 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(-) > >> > >> 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 > >> > > > > > > > > > -- To unsubscribe from this list: send the line "unsubscribe linux-crypto" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 2015?11?12? 16:40, Heiko Stuebner wrote: > Am Donnerstag, 12. November 2015, 09:13:20 schrieb Zain: >> On 2015?11?12? 07:57, Heiko Stuebner wrote: >>> Am Mittwoch, 11. November 2015, 14:35:57 schrieb Zain Wang: >>>> Set an ID for crypto clk, so that it can be called in other part. >>>> >>>> Signed-off-by: Zain Wang <zain.wang@rock-chips.com> >>> this should go in together with patch4, the dts change, so an Ack from the >>> clock-maintainers would be nice :-) >>> >>> >>> Heiko >> Ok! Done! >> Thanks. > I'm not sure I understand that. > > There is nothing to do for you here, I was merely stating the fact that > we will need to get an Acked-by from the clock maintainers, to allow > me to take both this and the devicetree patch :-) > > > Heiko I am sorry that I think you told me to put the two patches together in next version at first. Thanks for your writing back. Zain > >>>> --- >>>> >>>> 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(-) >>>> >>>> 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 >>>> >>> >>> >> >> > > > -- To unsubscribe from this list: send the line "unsubscribe linux-crypto" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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
Set an ID for crypto clk, so that it can be called in other part. Signed-off-by: Zain Wang <zain.wang@rock-chips.com> --- 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(-)