History

clk: at91: allow configuring generated PCR layout

The PCR register layout for GCLKCSS is changing for the future SoCs, allow configuring it.

Alexandre Belloni committed 7 years ago

Commit e4cfb821 parent cb4f4945 files · +30 −30Browse files

Unified · Split

5 files
  1. drivers/clk/at91/clk-generated.c +25 −23
  2. drivers/clk/at91/dt-compat.c +2 −1
  3. drivers/clk/at91/pmc.h +1 −0
  4. drivers/clk/at91/sama5d2.c +1 −0
  5. include/linux/clk/at91_pmc.h +1 −6
drivers/clk/at91/clk-generated.c+25−23
@@ -11,6 +11,7 @@ · 10 unmodified lines
11 *11 *
12 */12 */
13 13
14#include <linux/bitfield.h>
14#include <linux/clk-provider.h>15#include <linux/clk-provider.h>
15#include <linux/clkdev.h>16#include <linux/clkdev.h>
16#include <linux/clk/at91_pmc.h>17#include <linux/clk/at91_pmc.h>
@@ -31,6 +32,7 @@ struct clk_generated { · 14 unmodified lines
31 spinlock_t *lock;32 spinlock_t *lock;
32 u32 id;33 u32 id;
33 u32 gckdiv;34 u32 gckdiv;
35 const struct clk_pcr_layout *layout;
34 u8 parent_id;36 u8 parent_id;
35 bool audio_pll_allowed;37 bool audio_pll_allowed;
36};38};
@@ -47,14 +49,14 @@ static int clk_generated_enable(struct clk_hw *hw) · 10 unmodified lines
47 __func__, gck->gckdiv, gck->parent_id);49 __func__, gck->gckdiv, gck->parent_id);
48 50
49 spin_lock_irqsave(gck->lock, flags);51 spin_lock_irqsave(gck->lock, flags);
50 regmap_write(gck->regmap, AT91_PMC_PCR,52 regmap_write(gck->regmap, gck->layout->offset,
51 (gck->id & AT91_PMC_PCR_PID_MASK));53 (gck->id & gck->layout->pid_mask));
52 regmap_update_bits(gck->regmap, AT91_PMC_PCR,54 regmap_update_bits(gck->regmap, gck->layout->offset,
53 AT91_PMC_PCR_GCKDIV_MASK | AT91_PMC_PCR_GCKCSS_MASK |55 AT91_PMC_PCR_GCKDIV_MASK | gck->layout->gckcss_mask |
54 AT91_PMC_PCR_CMD | AT91_PMC_PCR_GCKEN,56 gck->layout->cmd | AT91_PMC_PCR_GCKEN,
55 AT91_PMC_PCR_GCKCSS(gck->parent_id) |57 field_prep(gck->layout->gckcss_mask, gck->parent_id) |
56 AT91_PMC_PCR_CMD |58 gck->layout->cmd |
57 AT91_PMC_PCR_GCKDIV(gck->gckdiv) |59 FIELD_PREP(AT91_PMC_PCR_GCKDIV_MASK, gck->gckdiv) |
58 AT91_PMC_PCR_GCKEN);60 AT91_PMC_PCR_GCKEN);
59 spin_unlock_irqrestore(gck->lock, flags);61 spin_unlock_irqrestore(gck->lock, flags);
60 return 0;62 return 0;
@@ -66,11 +68,11 @@ static void clk_generated_disable(struct clk_hw *hw) · 5 unmodified lines
66 unsigned long flags;68 unsigned long flags;
67 69
68 spin_lock_irqsave(gck->lock, flags);70 spin_lock_irqsave(gck->lock, flags);
69 regmap_write(gck->regmap, AT91_PMC_PCR,71 regmap_write(gck->regmap, gck->layout->offset,
70 (gck->id & AT91_PMC_PCR_PID_MASK));72 (gck->id & gck->layout->pid_mask));
71 regmap_update_bits(gck->regmap, AT91_PMC_PCR,73 regmap_update_bits(gck->regmap, gck->layout->offset,
72 AT91_PMC_PCR_CMD | AT91_PMC_PCR_GCKEN,74 gck->layout->cmd | AT91_PMC_PCR_GCKEN,
73 AT91_PMC_PCR_CMD);75 gck->layout->cmd);
74 spin_unlock_irqrestore(gck->lock, flags);76 spin_unlock_irqrestore(gck->lock, flags);
75}77}
76 78
@@ -81,9 +83,9 @@ static int clk_generated_is_enabled(struct clk_hw *hw) · 4 unmodified lines
81 unsigned int status;83 unsigned int status;
82 84
83 spin_lock_irqsave(gck->lock, flags);85 spin_lock_irqsave(gck->lock, flags);
84 regmap_write(gck->regmap, AT91_PMC_PCR,86 regmap_write(gck->regmap, gck->layout->offset,
85 (gck->id & AT91_PMC_PCR_PID_MASK));87 (gck->id & gck->layout->pid_mask));
86 regmap_read(gck->regmap, AT91_PMC_PCR, &status);88 regmap_read(gck->regmap, gck->layout->offset, &status);
87 spin_unlock_irqrestore(gck->lock, flags);89 spin_unlock_irqrestore(gck->lock, flags);
88 90
89 return status & AT91_PMC_PCR_GCKEN ? 1 : 0;91 return status & AT91_PMC_PCR_GCKEN ? 1 : 0;
@@ -259,19 +261,18 @@ static void clk_generated_startup(struct clk_generated *gck) · 169 unmodified lines
259 unsigned long flags;261 unsigned long flags;
260 262
261 spin_lock_irqsave(gck->lock, flags);263 spin_lock_irqsave(gck->lock, flags);
262 regmap_write(gck->regmap, AT91_PMC_PCR,264 regmap_write(gck->regmap, gck->layout->offset,
263 (gck->id & AT91_PMC_PCR_PID_MASK));265 (gck->id & gck->layout->pid_mask));
264 regmap_read(gck->regmap, AT91_PMC_PCR, &tmp);266 regmap_read(gck->regmap, gck->layout->offset, &tmp);
265 spin_unlock_irqrestore(gck->lock, flags);267 spin_unlock_irqrestore(gck->lock, flags);
266 268
267 gck->parent_id = (tmp & AT91_PMC_PCR_GCKCSS_MASK)269 gck->parent_id = field_get(gck->layout->gckcss_mask, tmp);
268 >> AT91_PMC_PCR_GCKCSS_OFFSET;270 gck->gckdiv = FIELD_GET(AT91_PMC_PCR_GCKDIV_MASK, tmp);
269 gck->gckdiv = (tmp & AT91_PMC_PCR_GCKDIV_MASK)
270 >> AT91_PMC_PCR_GCKDIV_OFFSET;
271}271}
272 272
273struct clk_hw * __init273struct clk_hw * __init
274at91_clk_register_generated(struct regmap *regmap, spinlock_t *lock,274at91_clk_register_generated(struct regmap *regmap, spinlock_t *lock,
275 const struct clk_pcr_layout *layout,
275 const char *name, const char **parent_names,276 const char *name, const char **parent_names,
276 u8 num_parents, u8 id, bool pll_audio,277 u8 num_parents, u8 id, bool pll_audio,
277 const struct clk_range *range)278 const struct clk_range *range)
@@ -298,6 +299,7 @@ at91_clk_register_generated(struct regmap *regmap, spinlock_t *lock, · 20 unmodified lines
298 gck->lock = lock;299 gck->lock = lock;
299 gck->range = *range;300 gck->range = *range;
300 gck->audio_pll_allowed = pll_audio;301 gck->audio_pll_allowed = pll_audio;
302 gck->layout = layout;
301 303
302 clk_generated_startup(gck);304 clk_generated_startup(gck);
303 hw = &gck->hw;305 hw = &gck->hw;
drivers/clk/at91/dt-compat.c+2−1
@@ -154,7 +154,8 @@ static void __init of_sama5d2_clk_generated_setup(struct device_node *np) · 153 unmodified lines
154 id == GCK_ID_CLASSD))154 id == GCK_ID_CLASSD))
155 pll_audio = true;155 pll_audio = true;
156 156
157 hw = at91_clk_register_generated(regmap, &pmc_pcr_lock, name,157 hw = at91_clk_register_generated(regmap, &pmc_pcr_lock,
158 &dt_pcr_layout, name,
158 parent_names, num_parents,159 parent_names, num_parents,
159 id, pll_audio, &range);160 id, pll_audio, &range);
160 if (IS_ERR(hw))161 if (IS_ERR(hw))
drivers/clk/at91/pmc.h+1−0
@@ -116,6 +116,7 @@ at91_clk_register_audio_pll_pmc(struct regmap *regmap, const char *name, · 115 unmodified lines
116 116
117struct clk_hw * __init117struct clk_hw * __init
118at91_clk_register_generated(struct regmap *regmap, spinlock_t *lock,118at91_clk_register_generated(struct regmap *regmap, spinlock_t *lock,
119 const struct clk_pcr_layout *layout,
119 const char *name, const char **parent_names,120 const char *name, const char **parent_names,
120 u8 num_parents, u8 id, bool pll_audio,121 u8 num_parents, u8 id, bool pll_audio,
121 const struct clk_range *range);122 const struct clk_range *range);
drivers/clk/at91/sama5d2.c+1−0
@@ -305,6 +305,7 @@ static void __init sama5d2_pmc_setup(struct device_node *np) · 304 unmodified lines
305 parent_names[5] = "audiopll_pmcck";305 parent_names[5] = "audiopll_pmcck";
306 for (i = 0; i < ARRAY_SIZE(sama5d2_gck); i++) {306 for (i = 0; i < ARRAY_SIZE(sama5d2_gck); i++) {
307 hw = at91_clk_register_generated(regmap, &pmc_pcr_lock,307 hw = at91_clk_register_generated(regmap, &pmc_pcr_lock,
308 &sama5d2_pcr_layout,
308 sama5d2_gck[i].n,309 sama5d2_gck[i].n,
309 parent_names, 6,310 parent_names, 6,
310 sama5d2_gck[i].id,311 sama5d2_gck[i].id,
include/linux/clk/at91_pmc.h+1−6
@@ -187,13 +187,8 @@ · 186 unmodified lines
187 187
188#define AT91_PMC_PCR 0x10c /* Peripheral Control Register [some SAM9 and SAMA5] */188#define AT91_PMC_PCR 0x10c /* Peripheral Control Register [some SAM9 and SAMA5] */
189#define AT91_PMC_PCR_PID_MASK 0x3f189#define AT91_PMC_PCR_PID_MASK 0x3f
190#define AT91_PMC_PCR_GCKCSS_OFFSET 8
191#define AT91_PMC_PCR_GCKCSS_MASK (0x7 << AT91_PMC_PCR_GCKCSS_OFFSET)
192#define AT91_PMC_PCR_GCKCSS(n) ((n) << AT91_PMC_PCR_GCKCSS_OFFSET) /* GCK Clock Source Selection */
193#define AT91_PMC_PCR_CMD (0x1 << 12) /* Command (read=0, write=1) */190#define AT91_PMC_PCR_CMD (0x1 << 12) /* Command (read=0, write=1) */
194#define AT91_PMC_PCR_GCKDIV_OFFSET 20191#define AT91_PMC_PCR_GCKDIV_MASK GENMASK(27, 20)
195#define AT91_PMC_PCR_GCKDIV_MASK (0xff << AT91_PMC_PCR_GCKDIV_OFFSET)
196#define AT91_PMC_PCR_GCKDIV(n) ((n) << AT91_PMC_PCR_GCKDIV_OFFSET) /* Generated Clock Divisor Value */
197#define AT91_PMC_PCR_EN (0x1 << 28) /* Enable */192#define AT91_PMC_PCR_EN (0x1 << 28) /* Enable */
198#define AT91_PMC_PCR_GCKEN (0x1 << 29) /* GCK Enable */193#define AT91_PMC_PCR_GCKEN (0x1 << 29) /* GCK Enable */
199 194

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