Re: [PATCH v4 08/15] clk: exynos5420: update clocks for PERIS and GEN blocks
Hi Tomasz, On Tue, May 6, 2014 at 11:06 PM, Tomasz Figa wrote: > Shaik, > > > On 06.05.2014 18:26, Shaik Ameer Basha wrote: >> >> This patch fixes some parent-child relationships according >> to the latest datasheet and adds more clocks related to >> PERIS and GEN blocks. >> >> Signed-off-by: Rahul Sharma >> Signed-off-by: Shaik Ameer Basha >> Reviewed-by: Alim Akhtar >> --- >> drivers/clk/samsung/clk-exynos5420.c | 81 >> >> include/dt-bindings/clock/exynos5420.h |5 ++ >> 2 files changed, 55 insertions(+), 31 deletions(-) >> >> diff --git a/drivers/clk/samsung/clk-exynos5420.c >> b/drivers/clk/samsung/clk-exynos5420.c >> index c86ecbb..af13e6c 100644 >> --- a/drivers/clk/samsung/clk-exynos5420.c >> +++ b/drivers/clk/samsung/clk-exynos5420.c >> @@ -83,6 +83,7 @@ >> #define SCLK_DIV_ISP1 0x10584 >> #define DIV2_RATIO0 0x10590 >> #define GATE_BUS_TOP 0x10700 >> +#define GATE_BUS_GEN 0x1073c >> #define GATE_BUS_FSYS00x10740 >> #define GATE_BUS_PERIC0x10750 >> #define GATE_BUS_PERIC1 0x10754 >> @@ -96,6 +97,7 @@ >> #define GATE_IP_G3D 0x10930 >> #define GATE_IP_GEN 0x10934 >> #define GATE_IP_PERIC 0x10950 >> +#define GATE_IP_PERIS 0x10960 >> #define GATE_IP_MSCL 0x10970 >> #define GATE_TOP_SCLK_GSCL0x10820 >> #define GATE_TOP_SCLK_DISP1 0x10828 >> @@ -172,6 +174,7 @@ static unsigned long exynos5420_clk_regs[] __initdata >> = { >> SCLK_DIV_ISP1, >> DIV2_RATIO0, >> GATE_BUS_TOP, >> + GATE_BUS_GEN, >> GATE_BUS_FSYS0, >> GATE_BUS_PERIC, >> GATE_BUS_PERIC1, >> @@ -185,6 +188,7 @@ static unsigned long exynos5420_clk_regs[] __initdata >> = { >> GATE_IP_G3D, >> GATE_IP_GEN, >> GATE_IP_PERIC, >> + GATE_IP_PERIS, >> GATE_IP_MSCL, >> GATE_TOP_SCLK_GSCL, >> GATE_TOP_SCLK_DISP1, >> @@ -608,6 +612,10 @@ static struct samsung_div_clock exynos5420_div_clks[] >> __initdata = { >> /* MSCL Block */ >> DIV(0, "dout_mscl_blk", "aclk400_mscl", DIV2_RATIO0, 28, 2), >> >> + /* PSGEN */ >> + DIV(0, "dout_gen_blk", "mout_user_aclk266", DIV2_RATIO0, 8, 1), >> + DIV(0, "dout_jpg_blk", "aclk166", DIV2_RATIO0, 20, 1), >> + >> /* ISP Block */ >> DIV(0, "dout_isp_sensor0", "mout_isp_sensor", SCLK_DIV_ISP0, 8, >> 8), >> DIV(0, "dout_isp_sensor1", "mout_isp_sensor", SCLK_DIV_ISP0, 16, >> 8), >> @@ -623,10 +631,6 @@ static struct samsung_div_clock exynos5420_div_clks[] >> __initdata = { >> }; >> >> static struct samsung_gate_clock exynos5420_gate_clks[] __initdata = { >> - /* TODO: Re-verify the CG bits for all the gate clocks */ >> - GATE_A(CLK_MCT, "pclk_st", "aclk66_psgen", GATE_BUS_PERIS1, 2, 0, >> 0, >> - "mct"), >> - >> GATE(0, "aclk200_fsys", "mout_user_aclk200_fsys", >> GATE_BUS_FSYS0, 9, CLK_IGNORE_UNUSED, 0), >> GATE(0, "aclk200_fsys2", "mout_user_aclk200_fsys2", >> @@ -776,28 +780,51 @@ static struct samsung_gate_clock >> exynos5420_gate_clks[] __initdata = { >> >> GATE(CLK_KEYIF, "keyif", "aclk66_peric", GATE_BUS_PERIC, 22, 0, >> 0), >> >> + /* PERIS Block */ >> GATE(CLK_CHIPID, "chipid", "aclk66_psgen", >> - GATE_BUS_PERIS0, 12, CLK_IGNORE_UNUSED, 0), >> + GATE_IP_PERIS, 0, CLK_IGNORE_UNUSED, 0), >> GATE(CLK_SYSREG, "sysreg", "aclk66_psgen", >> - GATE_BUS_PERIS0, 13, CLK_IGNORE_UNUSED, 0), >> - GATE(CLK_TZPC0, "tzpc0", "aclk66_psgen", GATE_BUS_PERIS0, 18, 0, >> 0), >> - GATE(CLK_TZPC1, "tzpc1", "aclk66_psgen", GATE_BUS_PERIS0, 19, 0, >> 0), >> - GATE(CLK_TZPC2, "tzpc2", "aclk66_psgen", GATE_BUS_PERIS0, 20, 0, >> 0), >> - GATE(CLK_TZPC3, "tzpc3", "aclk66_psgen", GATE_BUS_PERIS0, 21, 0, >> 0), >> - GATE(CLK_TZPC4, "tzpc4", "aclk66_psgen", GATE_BUS_PERIS0, 22, 0, >> 0), >> - GATE(CLK_TZPC5, "tzpc5", "aclk66_psgen", GATE_BUS_PERIS0, 23, 0, >> 0), >> - GATE(CLK_TZPC6, "tzpc6", "aclk66_psgen", GATE_BUS_PERIS0, 24, 0, >> 0), >> - GATE(CLK_TZPC7, "tzpc7", "aclk66_psgen", GATE_BUS_PERIS0, 25, 0, >> 0), >> - GATE(CLK_TZPC8, "tzpc8", "aclk66_psgen", GATE_BUS_PERIS0, 26, 0, >> 0), >> - GATE(CLK_TZPC9, "tzpc9", "aclk66_psgen", GATE_BUS_PERIS0, 27, 0, >> 0), >> - >> - GATE(CLK_HDMI_CEC, "hdmi_cec", "aclk66_psgen", GATE_BUS_PERIS1, 0, >> 0, >> - 0), >> + GATE_IP_PERIS, 1, CLK_IGNORE_UNUSED, 0), >> + GATE(CLK_TZPC0, "tzpc0", "aclk66_psgen", GATE_IP_PERIS, 6, 0, 0), >> + GATE(CLK_TZPC1, "tzpc1", "aclk66_psgen", GATE_IP_PERIS, 7, 0, 0), >> + GATE(CLK_TZPC2, "tzpc2", "aclk66_psgen", GATE_IP_PERIS, 8, 0, 0), >> + GATE(CLK_TZPC3, "tzpc3", "aclk66_psgen", GATE_IP_PERIS, 9, 0, 0), >> + GATE(C
Re: [PATCH v4 08/15] clk: exynos5420: update clocks for PERIS and GEN blocks
Shaik, On 06.05.2014 18:26, Shaik Ameer Basha wrote: This patch fixes some parent-child relationships according to the latest datasheet and adds more clocks related to PERIS and GEN blocks. Signed-off-by: Rahul Sharma Signed-off-by: Shaik Ameer Basha Reviewed-by: Alim Akhtar --- drivers/clk/samsung/clk-exynos5420.c | 81 include/dt-bindings/clock/exynos5420.h |5 ++ 2 files changed, 55 insertions(+), 31 deletions(-) diff --git a/drivers/clk/samsung/clk-exynos5420.c b/drivers/clk/samsung/clk-exynos5420.c index c86ecbb..af13e6c 100644 --- a/drivers/clk/samsung/clk-exynos5420.c +++ b/drivers/clk/samsung/clk-exynos5420.c @@ -83,6 +83,7 @@ #define SCLK_DIV_ISP1 0x10584 #define DIV2_RATIO0 0x10590 #define GATE_BUS_TOP 0x10700 +#define GATE_BUS_GEN 0x1073c #define GATE_BUS_FSYS00x10740 #define GATE_BUS_PERIC0x10750 #define GATE_BUS_PERIC1 0x10754 @@ -96,6 +97,7 @@ #define GATE_IP_G3D 0x10930 #define GATE_IP_GEN 0x10934 #define GATE_IP_PERIC 0x10950 +#define GATE_IP_PERIS 0x10960 #define GATE_IP_MSCL 0x10970 #define GATE_TOP_SCLK_GSCL0x10820 #define GATE_TOP_SCLK_DISP1 0x10828 @@ -172,6 +174,7 @@ static unsigned long exynos5420_clk_regs[] __initdata = { SCLK_DIV_ISP1, DIV2_RATIO0, GATE_BUS_TOP, + GATE_BUS_GEN, GATE_BUS_FSYS0, GATE_BUS_PERIC, GATE_BUS_PERIC1, @@ -185,6 +188,7 @@ static unsigned long exynos5420_clk_regs[] __initdata = { GATE_IP_G3D, GATE_IP_GEN, GATE_IP_PERIC, + GATE_IP_PERIS, GATE_IP_MSCL, GATE_TOP_SCLK_GSCL, GATE_TOP_SCLK_DISP1, @@ -608,6 +612,10 @@ static struct samsung_div_clock exynos5420_div_clks[] __initdata = { /* MSCL Block */ DIV(0, "dout_mscl_blk", "aclk400_mscl", DIV2_RATIO0, 28, 2), + /* PSGEN */ + DIV(0, "dout_gen_blk", "mout_user_aclk266", DIV2_RATIO0, 8, 1), + DIV(0, "dout_jpg_blk", "aclk166", DIV2_RATIO0, 20, 1), + /* ISP Block */ DIV(0, "dout_isp_sensor0", "mout_isp_sensor", SCLK_DIV_ISP0, 8, 8), DIV(0, "dout_isp_sensor1", "mout_isp_sensor", SCLK_DIV_ISP0, 16, 8), @@ -623,10 +631,6 @@ static struct samsung_div_clock exynos5420_div_clks[] __initdata = { }; static struct samsung_gate_clock exynos5420_gate_clks[] __initdata = { - /* TODO: Re-verify the CG bits for all the gate clocks */ - GATE_A(CLK_MCT, "pclk_st", "aclk66_psgen", GATE_BUS_PERIS1, 2, 0, 0, - "mct"), - GATE(0, "aclk200_fsys", "mout_user_aclk200_fsys", GATE_BUS_FSYS0, 9, CLK_IGNORE_UNUSED, 0), GATE(0, "aclk200_fsys2", "mout_user_aclk200_fsys2", @@ -776,28 +780,51 @@ static struct samsung_gate_clock exynos5420_gate_clks[] __initdata = { GATE(CLK_KEYIF, "keyif", "aclk66_peric", GATE_BUS_PERIC, 22, 0, 0), + /* PERIS Block */ GATE(CLK_CHIPID, "chipid", "aclk66_psgen", - GATE_BUS_PERIS0, 12, CLK_IGNORE_UNUSED, 0), + GATE_IP_PERIS, 0, CLK_IGNORE_UNUSED, 0), GATE(CLK_SYSREG, "sysreg", "aclk66_psgen", - GATE_BUS_PERIS0, 13, CLK_IGNORE_UNUSED, 0), - GATE(CLK_TZPC0, "tzpc0", "aclk66_psgen", GATE_BUS_PERIS0, 18, 0, 0), - GATE(CLK_TZPC1, "tzpc1", "aclk66_psgen", GATE_BUS_PERIS0, 19, 0, 0), - GATE(CLK_TZPC2, "tzpc2", "aclk66_psgen", GATE_BUS_PERIS0, 20, 0, 0), - GATE(CLK_TZPC3, "tzpc3", "aclk66_psgen", GATE_BUS_PERIS0, 21, 0, 0), - GATE(CLK_TZPC4, "tzpc4", "aclk66_psgen", GATE_BUS_PERIS0, 22, 0, 0), - GATE(CLK_TZPC5, "tzpc5", "aclk66_psgen", GATE_BUS_PERIS0, 23, 0, 0), - GATE(CLK_TZPC6, "tzpc6", "aclk66_psgen", GATE_BUS_PERIS0, 24, 0, 0), - GATE(CLK_TZPC7, "tzpc7", "aclk66_psgen", GATE_BUS_PERIS0, 25, 0, 0), - GATE(CLK_TZPC8, "tzpc8", "aclk66_psgen", GATE_BUS_PERIS0, 26, 0, 0), - GATE(CLK_TZPC9, "tzpc9", "aclk66_psgen", GATE_BUS_PERIS0, 27, 0, 0), - - GATE(CLK_HDMI_CEC, "hdmi_cec", "aclk66_psgen", GATE_BUS_PERIS1, 0, 0, - 0), + GATE_IP_PERIS, 1, CLK_IGNORE_UNUSED, 0), + GATE(CLK_TZPC0, "tzpc0", "aclk66_psgen", GATE_IP_PERIS, 6, 0, 0), + GATE(CLK_TZPC1, "tzpc1", "aclk66_psgen", GATE_IP_PERIS, 7, 0, 0), + GATE(CLK_TZPC2, "tzpc2", "aclk66_psgen", GATE_IP_PERIS, 8, 0, 0), + GATE(CLK_TZPC3, "tzpc3", "aclk66_psgen", GATE_IP_PERIS, 9, 0, 0), + GATE(CLK_TZPC4, "tzpc4", "aclk66_psgen", GATE_IP_PERIS, 10, 0, 0), + GATE(CLK_TZPC5, "tzpc5", "aclk66_psgen", GATE_IP_PERIS, 11, 0, 0), + GATE(CLK_TZPC6, "tzpc6", "aclk66_psgen", GATE_IP_PERIS, 12, 0, 0), + GATE(CLK_TZPC7, "tzpc7", "aclk66_psgen", GATE_IP_PERIS, 13, 0, 0), + GATE(CLK_TZPC8, "tzpc8", "aclk66_psgen", GATE_IP_PERIS, 14, 0, 0), + GATE(CLK_TZPC9, "tzpc9", "aclk66_psgen", GATE_IP_PERIS, 15