Merge branch 'master' into for-2.6.35

[safe/jmp/linux-2.6] / arch / arm / mach-omap2 / clock3xxx_data.c

diff --git a/arch/arm/mach-omap2/clock3xxx_data.c b/arch/arm/mach-omap2/clock3xxx_data.c
index f237902..9cba556 100644 (file)
--- a/arch/arm/mach-omap2/clock3xxx_data.c
+++ b/arch/arm/mach-omap2/clock3xxx_data.c
@@ -64,14 +64,12 @@ static struct clk omap_32k_fck = {
        .name           = "omap_32k_fck",
        .ops            = &clkops_null,
        .rate           = 32768,
-       .flags          = RATE_FIXED,
 };
 
 static struct clk secure_32k_fck = {
        .name           = "secure_32k_fck",
        .ops            = &clkops_null,
        .rate           = 32768,
-       .flags          = RATE_FIXED,
 };
 
 /* Virtual source clocks for osc_sys_ck */
@@ -79,42 +77,36 @@ static struct clk virt_12m_ck = {
        .name           = "virt_12m_ck",
        .ops            = &clkops_null,
        .rate           = 12000000,
-       .flags          = RATE_FIXED,
 };
 
 static struct clk virt_13m_ck = {
        .name           = "virt_13m_ck",
        .ops            = &clkops_null,
        .rate           = 13000000,
-       .flags          = RATE_FIXED,
 };
 
 static struct clk virt_16_8m_ck = {
        .name           = "virt_16_8m_ck",
        .ops            = &clkops_null,
        .rate           = 16800000,
-       .flags          = RATE_FIXED,
 };
 
 static struct clk virt_19_2m_ck = {
        .name           = "virt_19_2m_ck",
        .ops            = &clkops_null,
        .rate           = 19200000,
-       .flags          = RATE_FIXED,
 };
 
 static struct clk virt_26m_ck = {
        .name           = "virt_26m_ck",
        .ops            = &clkops_null,
        .rate           = 26000000,
-       .flags          = RATE_FIXED,
 };
 
 static struct clk virt_38_4m_ck = {
        .name           = "virt_38_4m_ck",
        .ops            = &clkops_null,
        .rate           = 38400000,
-       .flags          = RATE_FIXED,
 };
 
 static const struct clksel_rate osc_sys_12m_rates[] = {
@@ -167,7 +159,6 @@ static struct clk osc_sys_ck = {
        .clksel_mask    = OMAP3430_SYS_CLKIN_SEL_MASK,
        .clksel         = osc_sys_clksel,
        /* REVISIT: deal with autoextclkmode? */
-       .flags          = RATE_FIXED,
        .recalc         = &omap2_clksel_recalc,
 };
 
@@ -904,7 +895,7 @@ static struct clk dpll4_m4x2_ck = {
        .ops            = &clkops_omap2_dflt_wait,
        .parent         = &dpll4_m4_ck,
        .enable_reg     = OMAP_CM_REGADDR(PLL_MOD, CM_CLKEN),
-       .enable_bit     = OMAP3430_PWRDN_CAM_SHIFT,
+       .enable_bit     = OMAP3430_PWRDN_DSS1_SHIFT,
        .flags          = INVERT_ENABLE,
        .clkdm_name     = "dpll4_clkdm",
        .recalc         = &omap3_clkoutx2_recalc,
@@ -936,6 +927,8 @@ static struct clk dpll4_m5_ck_3630 __initdata = {
        .clksel_mask    = OMAP3630_CLKSEL_CAM_MASK,
        .clksel         = div32_dpll4_clksel,
        .clkdm_name     = "dpll4_clkdm",
+       .set_rate       = &omap2_clksel_set_rate,
+       .round_rate     = &omap2_clksel_round_rate,
        .recalc         = &omap2_clksel_recalc,
 };
 
@@ -3168,7 +3161,6 @@ static struct clk emac_ick = {
 static struct clk rmii_ck = {
        .name           = "rmii_ck",
        .ops            = &clkops_null,
-       .flags          = RATE_FIXED,
        .rate           = 50000000,
 };
 
@@ -3224,7 +3216,6 @@ static struct clk vpfe_ick = {
 static struct clk pclk_ck = {
        .name           = "pclk_ck",
        .ops            = &clkops_null,
-       .flags          = RATE_FIXED,
        .rate           = 27000000,
 };