Fix booting of omap1

This got broken because of mismerge from arm-devel.

Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/arch/arm/plat-omap/include/mach/clock.h b/arch/arm/plat-omap/include/mach/clock.h
index f26ad8c3e357f9cbee50dafaba7d8fecf1f45877..24552b27cd45be38363175f48dadaa8b639fad31 100644 (file)
--- a/arch/arm/plat-omap/include/mach/clock.h
+++ b/arch/arm/plat-omap/include/mach/clock.h
@@ -31,7 +31,7 @@ struct clksel {
 };
 
 struct dpll_data {
-       u16                     mult_div1_reg;
+       void __iomem            *mult_div1_reg;
        u32                     mult_mask;
        u32                     div1_mask;
        u16                     last_rounded_m;
@@ -41,18 +41,18 @@ struct dpll_data {
        u16                     max_multiplier;
        u8                      max_divider;
        u32                     max_tolerance;
-       u16                     idlest_reg;
+       void __iomem            *idlest_reg;
        u32                     idlest_mask;
        struct clk              *bypass_clk;
 #  if defined(CONFIG_ARCH_OMAP3)
        u32                     freqsel_mask;
        u8                      modes;
-       u16                     control_reg;
+       void __iomem            *control_reg;
        u32                     enable_mask;
        u8                      auto_recal_bit;
        u8                      recal_en_bit;
        u8                      recal_st_bit;
-       u16                     autoidle_reg;
+       void __iomem            *autoidle_reg;
        u32                     autoidle_mask;
 #  endif
 };
@@ -67,7 +67,7 @@ struct clk {
        struct clk              *parent;
        unsigned long           rate;
        __u32                   flags;
-       u16                     enable_reg;
+       void __iomem            *enable_reg;
        __u8                    enable_bit;
        __s8                    usecount;
        u8                      idlest_bit;
@@ -79,7 +79,7 @@ struct clk {
        void                    (*disable)(struct clk *);
 #if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3)
        u8                      fixed_div;
-       u16                     clksel_reg;
+       void __iomem            *clksel_reg;
        u32                     clksel_mask;
        const struct clksel     *clksel;
        struct dpll_data        *dpll_data;