| @@ -29,6 +29,7 @@ struct clk_master { · 28 unmodified lines |
| 29 | struct regmap *regmap; | 29 | struct regmap *regmap; |
| 30 | const struct clk_master_layout *layout; | 30 | const struct clk_master_layout *layout; |
| 31 | const struct clk_master_characteristics *characteristics; | 31 | const struct clk_master_characteristics *characteristics; |
| | 32 | u32 mckr; |
| 32 | }; | 33 | }; |
| 33 | | 34 | |
| 34 | static inline bool clk_master_ready(struct regmap *regmap) | 35 | static inline bool clk_master_ready(struct regmap *regmap) |
| @@ -69,7 +70,7 @@ static unsigned long clk_master_recalc_rate(struct clk_hw *hw, · 34 unmodified lines |
| 69 | master->characteristics; | 70 | master->characteristics; |
| 70 | unsigned int mckr; | 71 | unsigned int mckr; |
| 71 | | 72 | |
| 72 | regmap_read(master->regmap, AT91_PMC_MCKR, &mckr); | 73 | regmap_read(master->regmap, master->layout->offset, &mckr); |
| 73 | mckr &= layout->mask; | 74 | mckr &= layout->mask; |
| 74 | | 75 | |
| 75 | pres = (mckr >> layout->pres_shift) & MASTER_PRES_MASK; | 76 | pres = (mckr >> layout->pres_shift) & MASTER_PRES_MASK; |
| @@ -95,7 +96,7 @@ static u8 clk_master_get_parent(struct clk_hw *hw) · 19 unmodified lines |
| 95 | struct clk_master *master = to_clk_master(hw); | 96 | struct clk_master *master = to_clk_master(hw); |
| 96 | unsigned int mckr; | 97 | unsigned int mckr; |
| 97 | | 98 | |
| 98 | regmap_read(master->regmap, AT91_PMC_MCKR, &mckr); | 99 | regmap_read(master->regmap, master->layout->offset, &mckr); |
| 99 | | 100 | |
| 100 | return mckr & AT91_PMC_CSS; | 101 | return mckr & AT91_PMC_CSS; |
| 101 | } | 102 | } |
| @@ -147,13 +148,14 @@ at91_clk_register_master(struct regmap *regmap, · 45 unmodified lines |
| 147 | return hw; | 148 | return hw; |
| 148 | } | 149 | } |
| 149 | | 150 | |
| 150 | | | |
| 151 | const struct clk_master_layout at91rm9200_master_layout = { | 151 | const struct clk_master_layout at91rm9200_master_layout = { |
| 152 | .mask = 0x31F, | 152 | .mask = 0x31F, |
| 153 | .pres_shift = 2, | 153 | .pres_shift = 2, |
| | 154 | .offset = AT91_PMC_MCKR, |
| 154 | }; | 155 | }; |
| 155 | | 156 | |
| 156 | const struct clk_master_layout at91sam9x5_master_layout = { | 157 | const struct clk_master_layout at91sam9x5_master_layout = { |
| 157 | .mask = 0x373, | 158 | .mask = 0x373, |
| 158 | .pres_shift = 4, | 159 | .pres_shift = 4, |
| | 160 | .offset = AT91_PMC_MCKR, |
| 159 | }; | 161 | }; |