Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / arch / arm / mach-omap2 / clock2420_data.c

diff --git a/arch/arm/mach-omap2/clock2420_data.c b/arch/arm/mach-omap2/clock2420_data.c
index 21f856252ad86e3c95ac14ba75620a8385ce1676..0a992bc8d0d89a7d792610f03af68e9dbc256a41 100644 (file)
--- a/arch/arm/mach-omap2/clock2420_data.c
+++ b/arch/arm/mach-omap2/clock2420_data.c
@@ -22,8 +22,8 @@
 #include "clock.h"
 #include "clock2xxx.h"
 #include "opp2xxx.h"
-#include "prm.h"
-#include "cm.h"
+#include "cm2xxx_3xxx.h"
+#include "prm2xxx_3xxx.h"
 #include "prm-regbits-24xx.h"
 #include "cm-regbits-24xx.h"
 #include "sdrc.h"
@@ -812,7 +812,7 @@ static struct clk dss2_fck = {              /* Alt clk used in power management */
        .clksel_reg     = OMAP_CM_REGADDR(CORE_MOD, CM_CLKSEL1),
        .clksel_mask    = OMAP24XX_CLKSEL_DSS2_MASK,
        .clksel         = dss2_fck_clksel,
-       .recalc         = &followparent_recalc,
+       .recalc         = &omap2_clksel_recalc,
 };
 
 static struct clk dss_54m_fck = {      /* Alt clk used in power management */
@@ -1862,10 +1862,10 @@ static struct omap_clk omap2420_clks[] = {
        CLK(NULL,       "eac_fck",      &eac_fck,       CK_242X),
        CLK("omap_hdq.0", "ick",        &hdq_ick,       CK_242X),
        CLK("omap_hdq.1", "fck",        &hdq_fck,       CK_242X),
-       CLK("i2c_omap.1", "ick",        &i2c1_ick,      CK_242X),
-       CLK("i2c_omap.1", "fck",        &i2c1_fck,      CK_242X),
-       CLK("i2c_omap.2", "ick",        &i2c2_ick,      CK_242X),
-       CLK("i2c_omap.2", "fck",        &i2c2_fck,      CK_242X),
+       CLK("omap_i2c.1", "ick",        &i2c1_ick,      CK_242X),
+       CLK("omap_i2c.1", "fck",        &i2c1_fck,      CK_242X),
+       CLK("omap_i2c.2", "ick",        &i2c2_ick,      CK_242X),
+       CLK("omap_i2c.2", "fck",        &i2c2_fck,      CK_242X),
        CLK(NULL,       "gpmc_fck",     &gpmc_fck,      CK_242X),
        CLK(NULL,       "sdma_fck",     &sdma_fck,      CK_242X),
        CLK(NULL,       "sdma_ick",     &sdma_ick,      CK_242X),
@@ -1877,7 +1877,7 @@ static struct omap_clk omap2420_clks[] = {
        CLK("omap-aes", "ick",  &aes_ick,       CK_242X),
        CLK(NULL,       "pka_ick",      &pka_ick,       CK_242X),
        CLK(NULL,       "usb_fck",      &usb_fck,       CK_242X),
-       CLK("musb_hdrc",        "fck",  &osc_ck,        CK_242X),
+       CLK("musb-hdrc",        "fck",  &osc_ck,        CK_242X),
 };
 
 /*