Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx

[pandora-kernel.git] / arch / arm / mach-s5pv210 / clock.c

diff --git a/arch/arm/mach-s5pv210/clock.c b/arch/arm/mach-s5pv210/clock.c
index b5c95e6..52a8e60 100644 (file)
--- a/arch/arm/mach-s5pv210/clock.c
+++ b/arch/arm/mach-s5pv210/clock.c
@@ -323,6 +323,12 @@ static struct clk init_clocks_off[] = {
                .parent         = &clk_hclk_dsys.clk,
                .enable         = s5pv210_clk_ip0_ctrl,
                .ctrlbit        = (1 << 26),
+       }, {
+               .name           = "mfc",
+               .devname        = "s5p-mfc",
+               .parent         = &clk_pclk_psys.clk,
+               .enable         = s5pv210_clk_ip0_ctrl,
+               .ctrlbit        = (1 << 16),
        }, {
                .name           = "otg",
                .parent         = &clk_hclk_psys.clk,
@@ -686,47 +692,12 @@ static struct clksrc_sources clkset_sclk_spdif = {
        .nr_sources     = ARRAY_SIZE(clkset_sclk_spdif_list),
 };
 
-static int s5pv210_spdif_set_rate(struct clk *clk, unsigned long rate)
-{
-       struct clk *pclk;
-       int ret;
-
-       pclk = clk_get_parent(clk);
-       if (IS_ERR(pclk))
-               return -EINVAL;
-
-       ret = pclk->ops->set_rate(pclk, rate);
-       clk_put(pclk);
-
-       return ret;
-}
-
-static unsigned long s5pv210_spdif_get_rate(struct clk *clk)
-{
-       struct clk *pclk;
-       int rate;
-
-       pclk = clk_get_parent(clk);
-       if (IS_ERR(pclk))
-               return -EINVAL;
-
-       rate = pclk->ops->get_rate(clk);
-       clk_put(pclk);
-
-       return rate;
-}
-
-static struct clk_ops s5pv210_sclk_spdif_ops = {
-       .set_rate       = s5pv210_spdif_set_rate,
-       .get_rate       = s5pv210_spdif_get_rate,
-};
-
 static struct clksrc_clk clk_sclk_spdif = {
        .clk            = {
                .name           = "sclk_spdif",
                .enable         = s5pv210_clk_mask0_ctrl,
                .ctrlbit        = (1 << 27),
-               .ops            = &s5pv210_sclk_spdif_ops,
+               .ops            = &s5p_sclk_spdif_ops,
        },
        .sources = &clkset_sclk_spdif,
        .reg_src = { .reg = S5P_CLK_SRC6, .shift = 12, .size = 2 },
@@ -914,6 +885,7 @@ static struct clksrc_clk clksrcs[] = {
        }, {
                .clk            = {
                        .name           = "sclk_mfc",
+                       .devname        = "s5p-mfc",
                        .enable         = s5pv210_clk_ip0_ctrl,
                        .ctrlbit        = (1 << 16),
                },