@@ -194,16 +194,6 @@ static struct clk init_clocks_off[] = {
.enable = s3c64xx_hclk_ctrl,
.ctrlbit = S3C_CLKCON_HCLK_IHOST,
}, {
- .name = "dma0",
- .parent = &clk_h,
- .enable = s3c64xx_hclk_ctrl,
- .ctrlbit = S3C_CLKCON_HCLK_DMA0,
- }, {
- .name = "dma1",
- .parent = &clk_h,
- .enable = s3c64xx_hclk_ctrl,
- .ctrlbit = S3C_CLKCON_HCLK_DMA1,
- }, {
.name = "3dse",
.parent = &clk_h,
.enable = s3c64xx_hclk_ctrl,
@@ -345,6 +335,20 @@ static struct clk clk_i2s2 = {
};
#endif
+static struct clk clk_dma0 = {
+ .name = "dma0",
+ .parent = &clk_h,
+ .enable = s3c64xx_hclk_ctrl,
+ .ctrlbit = S3C_CLKCON_HCLK_DMA0,
+};
+
+static struct clk clk_dma1 = {
+ .name = "dma1",
+ .parent = &clk_h,
+ .enable = s3c64xx_hclk_ctrl,
+ .ctrlbit = S3C_CLKCON_HCLK_DMA1,
+};
+
static struct clk init_clocks[] = {
{
.name = "lcd",
@@ -849,6 +853,8 @@ static struct clk *clk_cdev[] = {
&clk_48m_spi1,
&clk_i2s0,
&clk_i2s1,
+ &clk_dma0,
+ &clk_dma1,
};
static struct clk_lookup s3c64xx_clk_lookup[] = {
@@ -873,6 +879,8 @@ static struct clk_lookup s3c64xx_clk_lookup[] = {
CLKDEV_INIT("samsung-i2s.2", "i2s_opclk0", &clk_i2s2),
CLKDEV_INIT("samsung-i2s.2", "i2s_opclk1", &clk_audio_bus2.clk),
#endif
+ CLKDEV_INIT("dma-pl080s.0", "apb_pclk", &clk_dma0),
+ CLKDEV_INIT("dma-pl080s.1", "apb_pclk", &clk_dma1),
};
#define GET_DIV(clk, field) ((((clk) & field##_MASK) >> field##_SHIFT) + 1)
This patch adds clkdev lookup entries for clocks used by PL08x DMA driver. Signed-off-by: Tomasz Figa <tomasz.figa@gmail.com> --- arch/arm/mach-s3c64xx/clock.c | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-)