Skip to content

Commit

Permalink
ARM: S5P6440: Remove usage of clk_p and add clk_pclk clock
Browse files Browse the repository at this point in the history
The clk_p clock is of type 'struct clk' whereas on S5P6440,
the pclk is more suitable to be of type 'struct clksrc_clk'
(since pclk clock is divided version of hclk).

This patch modifies the following.

1. Adds the 'clk_pclk' clock which is of type 'struct clksrc_clk'.
2. Adds clk_pclk into the list of sysclks.
3. The clock rate 'pclk' is modified to be derived from clk_pclk.

Signed-off-by: Thomas Abraham <thomas.ab@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
  • Loading branch information
Thomas Abraham authored and Ben Dooks committed May 13, 2010
1 parent e4f44f8 commit 4705146
Showing 1 changed file with 11 additions and 1 deletion.
12 changes: 11 additions & 1 deletion arch/arm/mach-s5p6440/clock.c
Original file line number Diff line number Diff line change
Expand Up @@ -275,6 +275,15 @@ static struct clksrc_clk clk_hclk = {
.reg_div = { .reg = S5P_CLK_DIV0, .shift = 8, .size = 4 },
};

static struct clksrc_clk clk_pclk = {
.clk = {
.name = "clk_pclk",
.id = -1,
.parent = &clk_hclk.clk,
},
.reg_div = { .reg = S5P_CLK_DIV0, .shift = 12, .size = 4 },
};

int s5p6440_clk48m_ctrl(struct clk *clk, int enable)
{
unsigned long flags;
Expand Down Expand Up @@ -590,6 +599,7 @@ static struct clksrc_clk *sysclks[] = {
&clk_dout_mpll,
&clk_armclk,
&clk_hclk,
&clk_pclk,
};

void __init_or_cpufreq s5p6440_setup_clocks(void)
Expand Down Expand Up @@ -639,7 +649,7 @@ void __init_or_cpufreq s5p6440_setup_clocks(void)

fclk = clk_get_rate(&clk_armclk.clk);
hclk = clk_get_rate(&clk_hclk.clk);
pclk = hclk / GET_DIV(clkdiv0, S5P_CLKDIV0_PCLK);
pclk = clk_get_rate(&clk_pclk.clk);

if (__raw_readl(S5P_OTHERS) & S5P_OTHERS_HCLK_LOW_SEL_MPLL) {
/* Asynchronous mode */
Expand Down

0 comments on commit 4705146

Please sign in to comment.