Commit 6496804d authored by Tony Lindgren's avatar Tony Lindgren

Revert "Fix booting of omap1"

This reverts commit 3fa3f8c8.

Some regs are offsets for omap2/3.
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 3fa3f8c8
...@@ -31,7 +31,7 @@ struct clksel { ...@@ -31,7 +31,7 @@ struct clksel {
}; };
struct dpll_data { struct dpll_data {
void __iomem *mult_div1_reg; u16 mult_div1_reg;
u32 mult_mask; u32 mult_mask;
u32 div1_mask; u32 div1_mask;
u16 last_rounded_m; u16 last_rounded_m;
...@@ -41,18 +41,18 @@ struct dpll_data { ...@@ -41,18 +41,18 @@ struct dpll_data {
u16 max_multiplier; u16 max_multiplier;
u8 max_divider; u8 max_divider;
u32 max_tolerance; u32 max_tolerance;
void __iomem *idlest_reg; u16 idlest_reg;
u32 idlest_mask; u32 idlest_mask;
struct clk *bypass_clk; struct clk *bypass_clk;
# if defined(CONFIG_ARCH_OMAP3) # if defined(CONFIG_ARCH_OMAP3)
u32 freqsel_mask; u32 freqsel_mask;
u8 modes; u8 modes;
void __iomem *control_reg; u16 control_reg;
u32 enable_mask; u32 enable_mask;
u8 auto_recal_bit; u8 auto_recal_bit;
u8 recal_en_bit; u8 recal_en_bit;
u8 recal_st_bit; u8 recal_st_bit;
void __iomem *autoidle_reg; u16 autoidle_reg;
u32 autoidle_mask; u32 autoidle_mask;
# endif # endif
}; };
...@@ -67,7 +67,7 @@ struct clk { ...@@ -67,7 +67,7 @@ struct clk {
struct clk *parent; struct clk *parent;
unsigned long rate; unsigned long rate;
__u32 flags; __u32 flags;
void __iomem *enable_reg; u16 enable_reg;
__u8 enable_bit; __u8 enable_bit;
__s8 usecount; __s8 usecount;
u8 idlest_bit; u8 idlest_bit;
...@@ -79,7 +79,7 @@ struct clk { ...@@ -79,7 +79,7 @@ struct clk {
void (*disable)(struct clk *); void (*disable)(struct clk *);
#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3) #if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3)
u8 fixed_div; u8 fixed_div;
void __iomem *clksel_reg; u16 clksel_reg;
u32 clksel_mask; u32 clksel_mask;
const struct clksel *clksel; const struct clksel *clksel;
struct dpll_data *dpll_data; struct dpll_data *dpll_data;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment