Skip to content

L
linux
Commit c837e88c authored by Ben Dooks's avatar Ben Dooks
Browse files
Options

ARM: S5PC1XX: Change clksrc_clks to use array of clocks 

Remove the individual 'struct clksrc_clks' and place them into an array
so that we can simply use s3c_register_clksrcs to register tham all in one
go.

Since the spdif clock relies on the audio clock, move the audio clocks
into their own arrary.

Thanks to  Marek Szyprowski for testing and pointing out the four clocks
what where missed from the clock list.
Signed-off-by: default avatarBen Dooks <ben-linux@fluff.org>
parent 1d026d9b
Show whitespace changes
Inline Side-by-side
Showing with 179 additions and 237 deletions
arch/arm/plat-s5pc1xx/s5pc100-clock.c
View file @ c837e88c
...@@ -534,14 +534,44 @@ static struct clksrc_sources clkset_audio2 = { ...@@ -534,14 +534,44 @@ static struct clksrc_sources clkset_audio2 = {
.nr_sources = ARRAY_SIZE(clkset_audio2_list), .nr_sources = ARRAY_SIZE(clkset_audio2_list),
}; };
static struct clksrc_clk clk_audio0; static struct clksrc_clk clksrc_audio[] = {
static struct clksrc_clk clk_audio1; {
static struct clksrc_clk clk_audio2; .clk = {
.name = "audio-bus",
.id = 0,
.ctrlbit = S5PC100_CLKGATE_SCLK1_AUDIO0,
.enable = s5pc100_sclk1_ctrl,
},
.sources = &clkset_audio0,
.reg_div = { .reg = S5PC100_CLKDIV4, .shift = 12, .size = 4, },
.reg_src = { .reg = S5PC100_CLKSRC3, .shift = 12, .size = 3, },
}, {
.clk = {
.name = "audio-bus",
.id = 1,
.ctrlbit = S5PC100_CLKGATE_SCLK1_AUDIO1,
.enable = s5pc100_sclk1_ctrl,
},
.sources = &clkset_audio1,
.reg_div = { .reg = S5PC100_CLKDIV4, .shift = 16, .size = 4, },
.reg_src = { .reg = S5PC100_CLKSRC3, .shift = 16, .size = 3, },
}, {
.clk = {
.name = "audio-bus",
.id = 2,
.ctrlbit = S5PC100_CLKGATE_SCLK1_AUDIO2,
.enable = s5pc100_sclk1_ctrl,
},
.sources = &clkset_audio2,
.reg_div = { .reg = S5PC100_CLKDIV4, .shift = 20, .size = 4, },
.reg_src = { .reg = S5PC100_CLKSRC3, .shift = 20, .size = 3, },
},
};
static struct clk *clkset_spdif_list[] = { static struct clk *clkset_spdif_list[] = {
&clk_audio0.clk, &clksrc_audio[0].clk,
&clk_audio1.clk, &clksrc_audio[1].clk,
&clk_audio2.clk, &clksrc_audio[2].clk,
}; };
static struct clksrc_sources clkset_spdif = { static struct clksrc_sources clkset_spdif = {
...@@ -585,7 +615,8 @@ static struct clksrc_sources clkset_usbhost = { ...@@ -585,7 +615,8 @@ static struct clksrc_sources clkset_usbhost = {
.nr_sources = ARRAY_SIZE(clkset_usbhost_list), .nr_sources = ARRAY_SIZE(clkset_usbhost_list),
}; };
static struct clksrc_clk clk_spi0 = { static struct clksrc_clk clksrc_clks[] = {
{
.clk = { .clk = {
.name = "spi_bus", .name = "spi_bus",
.id = 0, .id = 0,
...@@ -596,9 +627,7 @@ static struct clksrc_clk clk_spi0 = { ...@@ -596,9 +627,7 @@ static struct clksrc_clk clk_spi0 = {
.sources = &clkset_spi, .sources = &clkset_spi,
.reg_div = { .reg = S5PC100_CLKDIV2, .shift = 4, .size = 4, }, .reg_div = { .reg = S5PC100_CLKDIV2, .shift = 4, .size = 4, },
.reg_src = { .reg = S5PC100_CLKSRC1, .shift = 4, .size = 2, }, .reg_src = { .reg = S5PC100_CLKSRC1, .shift = 4, .size = 2, },
}; }, {
static struct clksrc_clk clk_spi1 = {
.clk = { .clk = {
.name = "spi_bus", .name = "spi_bus",
.id = 1, .id = 1,
...@@ -608,9 +637,7 @@ static struct clksrc_clk clk_spi1 = { ...@@ -608,9 +637,7 @@ static struct clksrc_clk clk_spi1 = {
.sources = &clkset_spi, .sources = &clkset_spi,
.reg_div = { .reg = S5PC100_CLKDIV2, .shift = 8, .size = 4, }, .reg_div = { .reg = S5PC100_CLKDIV2, .shift = 8, .size = 4, },
.reg_src = { .reg = S5PC100_CLKSRC1, .shift = 8, .size = 2, }, .reg_src = { .reg = S5PC100_CLKSRC1, .shift = 8, .size = 2, },
}; }, {
static struct clksrc_clk clk_spi2 = {
.clk = { .clk = {
.name = "spi_bus", .name = "spi_bus",
.id = 2, .id = 2,
...@@ -620,9 +647,7 @@ static struct clksrc_clk clk_spi2 = { ...@@ -620,9 +647,7 @@ static struct clksrc_clk clk_spi2 = {
.sources = &clkset_spi, .sources = &clkset_spi,
.reg_div = { .reg = S5PC100_CLKDIV2, .shift = 12, .size = 4, }, .reg_div = { .reg = S5PC100_CLKDIV2, .shift = 12, .size = 4, },
.reg_src = { .reg = S5PC100_CLKSRC1, .shift = 12, .size = 2, }, .reg_src = { .reg = S5PC100_CLKSRC1, .shift = 12, .size = 2, },
}; }, {
static struct clksrc_clk clk_uart_uclk1 = {
.clk = { .clk = {
.name = "uclk1", .name = "uclk1",
.id = -1, .id = -1,
...@@ -632,55 +657,14 @@ static struct clksrc_clk clk_uart_uclk1 = { ...@@ -632,55 +657,14 @@ static struct clksrc_clk clk_uart_uclk1 = {
.sources = &clkset_uart, .sources = &clkset_uart,
.reg_div = { .reg = S5PC100_CLKDIV2, .shift = 0, .size = 3, }, .reg_div = { .reg = S5PC100_CLKDIV2, .shift = 0, .size = 3, },
.reg_src = { .reg = S5PC100_CLKSRC1, .shift = 0, .size = 1, }, .reg_src = { .reg = S5PC100_CLKSRC1, .shift = 0, .size = 1, },
}; }, {
static struct clksrc_clk clk_audio0 = {
.clk = {
.name = "audio-bus",
.id = 0,
.ctrlbit = S5PC100_CLKGATE_SCLK1_AUDIO0,
.enable = s5pc100_sclk1_ctrl,
},
.sources = &clkset_audio0,
.reg_div = { .reg = S5PC100_CLKDIV4, .shift = 12, .size = 4, },
.reg_src = { .reg = S5PC100_CLKSRC3, .shift = 12, .size = 3, },
};
static struct clksrc_clk clk_audio1 = {
.clk = {
.name = "audio-bus",
.id = 1,
.ctrlbit = S5PC100_CLKGATE_SCLK1_AUDIO1,
.enable = s5pc100_sclk1_ctrl,
},
.sources = &clkset_audio1,
.reg_div = { .reg = S5PC100_CLKDIV4, .shift = 16, .size = 4, },
.reg_src = { .reg = S5PC100_CLKSRC3, .shift = 16, .size = 3, },
};
static struct clksrc_clk clk_audio2 = {
.clk = {
.name = "audio-bus",
.id = 2,
.ctrlbit = S5PC100_CLKGATE_SCLK1_AUDIO2,
.enable = s5pc100_sclk1_ctrl,
},
.sources = &clkset_audio2,
.reg_div = { .reg = S5PC100_CLKDIV4, .shift = 20, .size = 4, },
.reg_src = { .reg = S5PC100_CLKSRC3, .shift = 20, .size = 3, },
};
static struct clksrc_clk clk_spdif = {
.clk = { .clk = {
.name = "spdif", .name = "spdif",
.id = -1, .id = -1,
}, },
.sources = &clkset_spdif, .sources = &clkset_spdif,
.reg_src = { .reg = S5PC100_CLKSRC3, .shift = 24, .size = 2, }, .reg_src = { .reg = S5PC100_CLKSRC3, .shift = 24, .size = 2, },
}; }, {
static struct clksrc_clk clk_lcd = {
.clk = { .clk = {
.name = "lcd", .name = "lcd",
.id = -1, .id = -1,
...@@ -690,9 +674,7 @@ static struct clksrc_clk clk_lcd = { ...@@ -690,9 +674,7 @@ static struct clksrc_clk clk_lcd = {
.sources = &clkset_lcd_fimc, .sources = &clkset_lcd_fimc,
.reg_div = { .reg = S5PC100_CLKDIV3, .shift = 12, .size = 4, }, .reg_div = { .reg = S5PC100_CLKDIV3, .shift = 12, .size = 4, },
.reg_src = { .reg = S5PC100_CLKSRC2, .shift = 12, .size = 2, }, .reg_src = { .reg = S5PC100_CLKSRC2, .shift = 12, .size = 2, },
}; }, {
static struct clksrc_clk clk_fimc0 = {
.clk = { .clk = {
.name = "fimc", .name = "fimc",
.id = 0, .id = 0,
...@@ -702,9 +684,7 @@ static struct clksrc_clk clk_fimc0 = { ...@@ -702,9 +684,7 @@ static struct clksrc_clk clk_fimc0 = {
.sources = &clkset_lcd_fimc, .sources = &clkset_lcd_fimc,
.reg_div = { .reg = S5PC100_CLKDIV3, .shift = 16, .size = 4, }, .reg_div = { .reg = S5PC100_CLKDIV3, .shift = 16, .size = 4, },
.reg_src = { .reg = S5PC100_CLKSRC2, .shift = 16, .size = 2, }, .reg_src = { .reg = S5PC100_CLKSRC2, .shift = 16, .size = 2, },
}; }, {
static struct clksrc_clk clk_fimc1 = {
.clk = { .clk = {
.name = "fimc", .name = "fimc",
.id = 1, .id = 1,
...@@ -714,9 +694,7 @@ static struct clksrc_clk clk_fimc1 = { ...@@ -714,9 +694,7 @@ static struct clksrc_clk clk_fimc1 = {
.sources = &clkset_lcd_fimc, .sources = &clkset_lcd_fimc,
.reg_div = { .reg = S5PC100_CLKDIV3, .shift = 20, .size = 4, }, .reg_div = { .reg = S5PC100_CLKDIV3, .shift = 20, .size = 4, },
.reg_src = { .reg = S5PC100_CLKSRC2, .shift = 20, .size = 2, }, .reg_src = { .reg = S5PC100_CLKSRC2, .shift = 20, .size = 2, },
}; }, {
static struct clksrc_clk clk_fimc2 = {
.clk = { .clk = {
.name = "fimc", .name = "fimc",
.id = 2, .id = 2,
...@@ -726,9 +704,7 @@ static struct clksrc_clk clk_fimc2 = { ...@@ -726,9 +704,7 @@ static struct clksrc_clk clk_fimc2 = {
.sources = &clkset_lcd_fimc, .sources = &clkset_lcd_fimc,
.reg_div = { .reg = S5PC100_CLKDIV3, .shift = 24, .size = 4, }, .reg_div = { .reg = S5PC100_CLKDIV3, .shift = 24, .size = 4, },
.reg_src = { .reg = S5PC100_CLKSRC2, .shift = 24, .size = 2, }, .reg_src = { .reg = S5PC100_CLKSRC2, .shift = 24, .size = 2, },
}; }, {
static struct clksrc_clk clk_mmc0 = {
.clk = { .clk = {
.name = "mmc_bus", .name = "mmc_bus",
.id = 0, .id = 0,
...@@ -738,9 +714,7 @@ static struct clksrc_clk clk_mmc0 = { ...@@ -738,9 +714,7 @@ static struct clksrc_clk clk_mmc0 = {
.sources = &clkset_mmc, .sources = &clkset_mmc,
.reg_div = { .reg = S5PC100_CLKDIV3, .shift = 0, .size = 4, }, .reg_div = { .reg = S5PC100_CLKDIV3, .shift = 0, .size = 4, },
.reg_src = { .reg = S5PC100_CLKSRC2, .shift = 0, .size = 2, }, .reg_src = { .reg = S5PC100_CLKSRC2, .shift = 0, .size = 2, },
}; }, {
static struct clksrc_clk clk_mmc1 = {
.clk = { .clk = {
.name = "mmc_bus", .name = "mmc_bus",
.id = 1, .id = 1,
...@@ -750,9 +724,7 @@ static struct clksrc_clk clk_mmc1 = { ...@@ -750,9 +724,7 @@ static struct clksrc_clk clk_mmc1 = {
.sources = &clkset_mmc, .sources = &clkset_mmc,
.reg_div = { .reg = S5PC100_CLKDIV3, .shift = 4, .size = 4, }, .reg_div = { .reg = S5PC100_CLKDIV3, .shift = 4, .size = 4, },
.reg_src = { .reg = S5PC100_CLKSRC2, .shift = 4, .size = 2, }, .reg_src = { .reg = S5PC100_CLKSRC2, .shift = 4, .size = 2, },
}; }, {
static struct clksrc_clk clk_mmc2 = {
.clk = { .clk = {
.name = "mmc_bus", .name = "mmc_bus",
.id = 2, .id = 2,
...@@ -762,9 +734,7 @@ static struct clksrc_clk clk_mmc2 = { ...@@ -762,9 +734,7 @@ static struct clksrc_clk clk_mmc2 = {
.sources = &clkset_mmc, .sources = &clkset_mmc,
.reg_div = { .reg = S5PC100_CLKDIV3, .shift = 8, .size = 4, }, .reg_div = { .reg = S5PC100_CLKDIV3, .shift = 8, .size = 4, },
.reg_src = { .reg = S5PC100_CLKSRC2, .shift = 8, .size = 2, }, .reg_src = { .reg = S5PC100_CLKSRC2, .shift = 8, .size = 2, },
}; }, {
static struct clksrc_clk clk_usbhost = {
.clk = { .clk = {
.name = "usbhost", .name = "usbhost",
.id = -1, .id = -1,
...@@ -774,6 +744,7 @@ static struct clksrc_clk clk_usbhost = { ...@@ -774,6 +744,7 @@ static struct clksrc_clk clk_usbhost = {
.sources = &clkset_usbhost, .sources = &clkset_usbhost,
.reg_div = { .reg = S5PC100_CLKDIV2, .shift = 20, .size = 4, }, .reg_div = { .reg = S5PC100_CLKDIV2, .shift = 20, .size = 4, },
.reg_src = { .reg = S5PC100_CLKSRC1, .shift = 20, .size = 2, }, .reg_src = { .reg = S5PC100_CLKSRC1, .shift = 20, .size = 2, },
}
}; };
/* Clock initialisation code */ /* Clock initialisation code */
...@@ -785,22 +756,6 @@ static struct clksrc_clk *init_parents[] = { ...@@ -785,22 +756,6 @@ static struct clksrc_clk *init_parents[] = {
&clk_mout_onenand, &clk_mout_onenand,
&clk_mout_epll, &clk_mout_epll,
&clk_mout_hpll, &clk_mout_hpll,
&clk_spi0,
&clk_spi1,
&clk_spi2,
&clk_uart_uclk1,
&clk_audio0,
&clk_audio1,
&clk_audio2,
&clk_spdif,
&clk_lcd,
&clk_fimc0,
&clk_fimc1,
&clk_fimc2,
&clk_mmc0,
&clk_mmc1,
&clk_mmc2,
&clk_usbhost,
}; };
#define GET_DIV(clk, field) ((((clk) & field##_MASK) >> field##_SHIFT) + 1) #define GET_DIV(clk, field) ((((clk) & field##_MASK) >> field##_SHIFT) + 1)
...@@ -867,6 +822,12 @@ void __init_or_cpufreq s5pc100_setup_clocks(void) ...@@ -867,6 +822,12 @@ void __init_or_cpufreq s5pc100_setup_clocks(void)
for (ptr = 0; ptr < ARRAY_SIZE(init_parents); ptr++) for (ptr = 0; ptr < ARRAY_SIZE(init_parents); ptr++)
s3c_set_clksrc(init_parents[ptr], true); s3c_set_clksrc(init_parents[ptr], true);
for (ptr = 0; ptr < ARRAY_SIZE(clksrc_audio); ptr++)
s3c_set_clksrc(clksrc_audio + ptr, true);
for (ptr = 0; ptr < ARRAY_SIZE(clksrc_clks); ptr++)
s3c_set_clksrc(clksrc_clks + ptr, true);
} }
static struct clk *clks[] __initdata = { static struct clk *clks[] __initdata = {
...@@ -875,8 +836,13 @@ static struct clk *clks[] __initdata = { ...@@ -875,8 +836,13 @@ static struct clk *clks[] __initdata = {
&clk_dout_d0_bus, &clk_dout_d0_bus,
&clk_dout_pclkd0, &clk_dout_pclkd0,
&clk_dout_apll2, &clk_dout_apll2,
&clk_mout_apll.clk,
&clk_mout_mpll.clk,
&clk_mout_epll.clk,
&clk_mout_hpll.clk,
&clk_mout_am.clk, &clk_mout_am.clk,
&clk_dout_d1_bus, &clk_dout_d1_bus,
&clk_mout_onenand.clk,
&clk_dout_pclkd1, &clk_dout_pclkd1,
&clk_dout_mpll2, &clk_dout_mpll2,
&clk_dout_cam, &clk_dout_cam,
...@@ -890,30 +856,6 @@ static struct clk *clks[] __initdata = { ...@@ -890,30 +856,6 @@ static struct clk *clks[] __initdata = {
&clk_arm, &clk_arm,
}; };
/* simplest change - will aggregate clocks later */
static struct clksrc_clk *clks_src[] = {
&clk_mout_apll,
&clk_mout_mpll,
&clk_mout_onenand,
&clk_mout_epll,
&clk_spi0,
&clk_spi1,
&clk_spi2,
&clk_uart_uclk1,
&clk_audio0,
&clk_audio1,
&clk_audio2,
&clk_spdif,
&clk_lcd,
&clk_fimc0,
&clk_fimc1,
&clk_fimc2,
&clk_mmc0,
&clk_mmc1,
&clk_mmc2,
&clk_usbhost,
};
void __init s5pc100_register_clocks(void) void __init s5pc100_register_clocks(void)
{ {
struct clk *clkp; struct clk *clkp;
...@@ -929,6 +871,6 @@ void __init s5pc100_register_clocks(void) ...@@ -929,6 +871,6 @@ void __init s5pc100_register_clocks(void)
} }
} }
for (ptr = 0; ptr < ARRAY_SIZE(clks_src); ptr++) s3c_register_clksrc(clksrc_audio, ARRAY_SIZE(clksrc_audio));
s3c_register_clksrc(clks_src[ptr], 1); s3c_register_clksrc(clksrc_clks, ARRAY_SIZE(clksrc_clks));
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7