History

clk: at91: master: Add sam9x60 support

The sam9x60 cpu clock is located at a different offset but is otherwise similar to the master clock.

Alexandre Belloni committed 7 years ago

Commit e5be5371 parent 2423eea3 files · +8 −3Browse files

Unified · Split

3 files
  1. drivers/clk/at91/clk-master.c +5 −3
  2. drivers/clk/at91/pmc.h +1 −0
  3. include/linux/clk/at91_pmc.h +2 −0
drivers/clk/at91/clk-master.c+5−3
@@ -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
34static inline bool clk_master_ready(struct regmap *regmap)35static 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
151const struct clk_master_layout at91rm9200_master_layout = {151const 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
156const struct clk_master_layout at91sam9x5_master_layout = {157const 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};
drivers/clk/at91/pmc.h+1−0
@@ -38,6 +38,7 @@ struct clk_range { · 37 unmodified lines
38#define CLK_RANGE(MIN, MAX) {.min = MIN, .max = MAX,}38#define CLK_RANGE(MIN, MAX) {.min = MIN, .max = MAX,}
39 39
40struct clk_master_layout {40struct clk_master_layout {
41 u32 offset;
41 u32 mask;42 u32 mask;
42 u8 pres_shift;43 u8 pres_shift;
43};44};
include/linux/clk/at91_pmc.h+2−0
@@ -74,6 +74,8 @@ · 73 unmodified lines
74#define AT91_PMC_USBDIV_4 (2 << 28)74#define AT91_PMC_USBDIV_4 (2 << 28)
75#define AT91_PMC_USB96M (1 << 28) /* Divider by 2 Enable (PLLB only) */75#define AT91_PMC_USB96M (1 << 28) /* Divider by 2 Enable (PLLB only) */
76 76
77#define AT91_PMC_CPU_CKR 0x28 /* CPU Clock Register */
78
77#define AT91_PMC_MCKR 0x30 /* Master Clock Register */79#define AT91_PMC_MCKR 0x30 /* Master Clock Register */
78#define AT91_PMC_CSS (3 << 0) /* Master Clock Selection */80#define AT91_PMC_CSS (3 << 0) /* Master Clock Selection */
79#define AT91_PMC_CSS_SLOW (0 << 0)81#define AT91_PMC_CSS_SLOW (0 << 0)

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t