clk: at91: add sam9x60 pmc clock support
Subsystems (3)
Alexandre Belloni
maintainerv3 cover clk: at91: add sam9x60 pmc clock support
This series add support for the sam9x60 clocks handled by the PMC.
The first four patches are preparatory patches to handle register layout and offset differences. Then, a driver for the new interface for PLLs is added and the final patch is the driver for the sam9x60 PMC.
This supersedes
https://patchwork.kernel.org/project/linux-clk/list/?series=82811 and
https://patchwork.kernel.org/project/linux-clk/list/?series=100115
changes in v2:
- rebased on v5.1-rc1
- changed the PLL_ACR handling to conform to the datasheet errata
changes in v3:
- remove unrelated patches
Alexandre Belloni (7):
clk: at91: allow configuring peripheral PCR layout
clk: at91: allow configuring generated PCR layout
clk: at91: usb: Add sam9x60 support
clk: at91: master: Add sam9x60 support
clk: at91: add sam9x60 PLL driver
dt-bindings: clk: at91: add bindings for SAM9X60 pmc
clk: at91: add sam9x60 pmc driver
.../devicetree/bindings/clock/at91-clock.txt | 3 +- drivers/clk/at91/Makefile | 2 + drivers/clk/at91/at91sam9x5.c | 9 + drivers/clk/at91/clk-generated.c | 48 +-- drivers/clk/at91/clk-master.c | 8 +- drivers/clk/at91/clk-peripheral.c | 46 +-- drivers/clk/at91/clk-sam9x60-pll.c | 330 ++++++++++++++++++ drivers/clk/at91/clk-usb.c | 33 +- drivers/clk/at91/dt-compat.c | 12 +- drivers/clk/at91/pmc.h | 23 ++ drivers/clk/at91/sam9x60.c | 307 ++++++++++++++++ drivers/clk/at91/sama5d2.c | 10 + drivers/clk/at91/sama5d4.c | 8 + include/linux/clk/at91_pmc.h | 12 +- 14 files changed, 786 insertions(+), 65 deletions(-) create mode 100644 drivers/clk/at91/clk-sam9x60-pll.c create mode 100644 drivers/clk/at91/sam9x60.c
Signature · 1 line
2.20.1
Alexandre Belloni
maintainerPATCH v3 1/7 clk: at91: allow configuring peripheral PCR layout
The PCR register actually changed layout for each SoC. By chance, this didn't have impact on sama5d[2-4] support but since sama5d3, PID is seven bits wide and sama5d4 and sama5d2 don't have DIV.
For the DT backward compatibility, keep the layout as is.
--- drivers/clk/at91/at91sam9x5.c | 9 ++++++ drivers/clk/at91/clk-peripheral.c | 46 ++++++++++++++++--------------- drivers/clk/at91/dt-compat.c | 9 ++++++ drivers/clk/at91/pmc.h | 12 ++++++++ drivers/clk/at91/sama5d2.c | 9 ++++++ drivers/clk/at91/sama5d4.c | 8 ++++++ include/linux/clk/at91_pmc.h | 3 -- 7 files changed, 71 insertions(+), 25 deletions(-)
drivers/clk/at91/at91sam9x5.c +9 -0
@@ -49,6 +49,13 @@ static const struct { { .n = "pck1", .p = "prog1", .id = 9 }, }; +static const struct clk_pcr_layout at91sam9x5_pcr_layout = { + .offset =0x10c , + .cmd =BIT (12 ), + .pid_mask =GENMASK (5 ,0 ), + .div_mask =GENMASK (17 ,16 ), +}; + struct pck { char *n; u8 id;
@@ -242,6 +249,7 @@ static void __init at91sam9x5_pmc_setup(struct device_node *np,for (i =0 ; i <ARRAY_SIZE (at91sam9x5_periphck); i++) { hw = at91_clk_register_sam9x5_peripheral(regmap, &pmc_pcr_lock, + &at91sam9x5_pcr_layout, at91sam9x5_periphck[i].n, "masterck", at91sam9x5_periphck[i].id,
@@ -254,6 +262,7 @@ static void __init at91sam9x5_pmc_setup(struct device_node *np,for (i =0 ; extra_pcks[i].id; i++) { hw = at91_clk_register_sam9x5_peripheral(regmap, &pmc_pcr_lock, + &at91sam9x5_pcr_layout, extra_pcks[i].n, "masterck", extra_pcks[i].id,
drivers/clk/at91/clk-peripheral.c +24 -22
104 lines not on this page · raw message
drivers/clk/at91/dt-compat.c +9 -0
@@ -93,6 +93,14 @@ CLK_OF_DECLARE(of_sama5d2_clk_audio_pll_pmc_setup, of_sama5d2_clk_audio_pll_pmc_setup);#endif /* CONFIG_HAVE_AT91_AUDIO_PLL */ +static const struct clk_pcr_layout dt_pcr_layout = { + .offset =0x10c , + .cmd =BIT (12 ), + .pid_mask =GENMASK (5 ,0 ), + .div_mask =GENMASK (17 ,16 ), + .gckcss_mask =GENMASK (10 ,8 ), +}; +#ifdef CONFIG_HAVE_AT91_GENERATED_CLK #define GENERATED_SOURCE_MAX 6
@@ -448,6 +456,7 @@ of_at91_clk_periph_setup(struct device_node *np, u8 type) hw =at91_clk_register_sam9x5_peripheral (regmap, &pmc_pcr_lock, + &dt_pcr_layout, name, parent_name, id, &range);
drivers/clk/at91/pmc.h +12 -0
@@ -80,6 +80,17 @@ extern const struct clk_programmable_layout at91rm9200_programmable_layout;extern const struct clk_programmable_layout at91sam9g45_programmable_layout;extern const struct clk_programmable_layout at91sam9x5_programmable_layout; +struct clk_pcr_layout { +u32 offset; +u32 cmd; +u32 div_mask; +u32 gckcss_mask; +u32 pid_mask; +}; + +#define field_get (_mask, _reg) (((_reg) & (_mask)) >> (ffs(_mask) - 1)) +#define field_prep (_mask, _val) (((_val) << (ffs(_mask) - 1)) & (_mask)) +#define ndck (a, s) (a[s - 1].id + 1)#define nck (a) (a[ARRAY_SIZE(a) - 1].id + 1) struct pmc_data *pmc_data_allocate(unsigned int ncore, unsigned int nsystem,
@@ -143,6 +154,7 @@ at91_clk_register_peripheral(struct regmap *regmap, const char *name, const char *parent_name, u32 id);struct clk_hw *__init at91_clk_register_sam9x5_peripheral (struct regmap *regmap,spinlock_t *lock, +const struct clk_pcr_layout *layout,const char *name,const char *parent_name,u32 id,const struct clk_range *range);
drivers/clk/at91/sama5d2.c +9 -0
@@ -28,6 +28,13 @@ static const struct clk_pll_characteristics plla_characteristics = { .out = plla_out, }; +static const struct clk_pcr_layout sama5d2_pcr_layout = { + .offset =0x10c , + .cmd =BIT (12 ), + .gckcss_mask =GENMASK (10 ,8 ), + .pid_mask =GENMASK (6 ,0 ), +}; + static const struct { char *n; char *p;
@@ -266,6 +273,7 @@ static void __init sama5d2_pmc_setup(struct device_node *np)for (i =0 ; i <ARRAY_SIZE (sama5d2_periphck); i++) { hw = at91_clk_register_sam9x5_peripheral(regmap, &pmc_pcr_lock, + &sama5d2_pcr_layout, sama5d2_periphck[i].n, "masterck", sama5d2_periphck[i].id,
@@ -278,6 +286,7 @@ static void __init sama5d2_pmc_setup(struct device_node *np)for (i =0 ; i <ARRAY_SIZE (sama5d2_periph32ck); i++) { hw = at91_clk_register_sam9x5_peripheral(regmap, &pmc_pcr_lock, + &sama5d2_pcr_layout, sama5d2_periph32ck[i].n, "h32mxck", sama5d2_periph32ck[i].id,
drivers/clk/at91/sama5d4.c +8 -0
@@ -28,6 +28,12 @@ static const struct clk_pll_characteristics plla_characteristics = { .out = plla_out, }; +static const struct clk_pcr_layout sama5d4_pcr_layout = { + .offset =0x10c , + .cmd =BIT (12 ), + .pid_mask =GENMASK (6 ,0 ), +}; + static const struct { char *n; char *p;
@@ -232,6 +238,7 @@ static void __init sama5d4_pmc_setup(struct device_node *np)for (i =0 ; i <ARRAY_SIZE (sama5d4_periphck); i++) { hw = at91_clk_register_sam9x5_peripheral(regmap, &pmc_pcr_lock, + &sama5d4_pcr_layout, sama5d4_periphck[i].n, "masterck", sama5d4_periphck[i].id,
@@ -244,6 +251,7 @@ static void __init sama5d4_pmc_setup(struct device_node *np)for (i =0 ; i <ARRAY_SIZE (sama5d4_periph32ck); i++) { hw = at91_clk_register_sam9x5_peripheral(regmap, &pmc_pcr_lock, + &sama5d4_pcr_layout, sama5d4_periph32ck[i].n, "h32mxck", sama5d4_periph32ck[i].id,
include/linux/clk/at91_pmc.h +0 -3
@@ -191,9 +191,6 @@#define AT91_PMC_PCR_GCKCSS_MASK (0x7 << AT91_PMC_PCR_GCKCSS_OFFSET)#define AT91_PMC_PCR_GCKCSS (n) ((n) << AT91_PMC_PCR_GCKCSS_OFFSET)/* GCK Clock Source Selection */ #define AT91_PMC_PCR_CMD (0x1 << 12)/* Command (read=0, write=1) */ -#define AT91_PMC_PCR_DIV_OFFSET 16 -#define AT91_PMC_PCR_DIV_MASK (0x3 << AT91_PMC_PCR_DIV_OFFSET) -#define AT91_PMC_PCR_DIV (n) ((n) << AT91_PMC_PCR_DIV_OFFSET)/* Divisor Value */ #define AT91_PMC_PCR_GCKDIV_OFFSET 20#define AT91_PMC_PCR_GCKDIV_MASK (0xff << AT91_PMC_PCR_GCKDIV_OFFSET)#define AT91_PMC_PCR_GCKDIV (n) ((n) << AT91_PMC_PCR_GCKDIV_OFFSET)/* Generated Clock Divisor Value */
Signature · 1 line
2.20.1
Re: [PATCH v3 1/7] clk: at91: allow configuring peripheral PCR layout
Quoting Alexandre Belloni (2019-04-02 05:50:50)
Quoted 8 lines
The PCR register actually changed layout for each SoC. By chance, this didn't have impact on sama5d[2-4] support but since sama5d3, PID is seven bits wide and sama5d4 and sama5d2 don't have DIV.
For the DT backward compatibility, keep the layout as is.
Signed-off-by Alexandre Belloni <[email protected]>---
Applied to clk-next
Alexandre Belloni
maintainerPATCH v3 2/7 clk: at91: allow configuring generated PCR layout
In reply to Alexandre BelloniThe PCR register layout for GCLKCSS is changing for the future SoCs, allow configuring it.
--- drivers/clk/at91/clk-generated.c | 48 +++++++++++++++++--------------- drivers/clk/at91/dt-compat.c | 3 +- drivers/clk/at91/pmc.h | 1 + drivers/clk/at91/sama5d2.c | 1 + include/linux/clk/at91_pmc.h | 7 +---- 5 files changed, 30 insertions(+), 30 deletions(-)
drivers/clk/at91/clk-generated.c +25 -23
@@ -11,6 +11,7 @@* */ +#include <linux/bitfield.h> #include <linux/clk-provider.h> #include <linux/clkdev.h> #include <linux/clk/at91_pmc.h>
@@ -31,6 +32,7 @@ struct clk_generated {spinlock_t *lock;u32 id;u32 gckdiv; +const struct clk_pcr_layout *layout;u8 parent_id;bool audio_pll_allowed; };
@@ -47,14 +49,14 @@ static int clk_generated_enable(struct clk_hw *hw) __func__, gck->gckdiv, gck->parent_id);spin_lock_irqsave (gck->lock, flags); -regmap_write (gck->regmap,AT91_PMC_PCR , - (gck->id &AT91_PMC_PCR_PID_MASK )); -regmap_update_bits (gck->regmap,AT91_PMC_PCR , -AT91_PMC_PCR_GCKDIV_MASK |AT91_PMC_PCR_GCKCSS_MASK | -AT91_PMC_PCR_CMD |AT91_PMC_PCR_GCKEN , -AT91_PMC_PCR_GCKCSS (gck->parent_id) | -AT91_PMC_PCR_CMD | -AT91_PMC_PCR_GCKDIV (gck->gckdiv) | +regmap_write (gck->regmap, gck->layout->offset, + (gck->id & gck->layout->pid_mask)); +regmap_update_bits (gck->regmap, gck->layout->offset, +AT91_PMC_PCR_GCKDIV_MASK | gck->layout->gckcss_mask | + gck->layout->cmd |AT91_PMC_PCR_GCKEN , +field_prep (gck->layout->gckcss_mask, gck->parent_id) | + gck->layout->cmd | +FIELD_PREP (AT91_PMC_PCR_GCKDIV_MASK , gck->gckdiv) |AT91_PMC_PCR_GCKEN );spin_unlock_irqrestore (gck->lock, flags);return 0 ;
@@ -66,11 +68,11 @@ static void clk_generated_disable(struct clk_hw *hw)unsigned long flags;spin_lock_irqsave (gck->lock, flags); -regmap_write (gck->regmap,AT91_PMC_PCR , - (gck->id &AT91_PMC_PCR_PID_MASK )); -regmap_update_bits (gck->regmap,AT91_PMC_PCR , -AT91_PMC_PCR_CMD |AT91_PMC_PCR_GCKEN , -AT91_PMC_PCR_CMD ); +regmap_write (gck->regmap, gck->layout->offset, + (gck->id & gck->layout->pid_mask)); +regmap_update_bits (gck->regmap, gck->layout->offset, + gck->layout->cmd |AT91_PMC_PCR_GCKEN , + gck->layout->cmd);spin_unlock_irqrestore (gck->lock, flags); }
@@ -81,9 +83,9 @@ static int clk_generated_is_enabled(struct clk_hw *hw)unsigned int status;spin_lock_irqsave (gck->lock, flags); -regmap_write (gck->regmap,AT91_PMC_PCR , - (gck->id &AT91_PMC_PCR_PID_MASK )); -regmap_read (gck->regmap,AT91_PMC_PCR , &status); +regmap_write (gck->regmap, gck->layout->offset, + (gck->id & gck->layout->pid_mask)); +regmap_read (gck->regmap, gck->layout->offset, &status);spin_unlock_irqrestore (gck->lock, flags);return status &AT91_PMC_PCR_GCKEN ?1 :0 ;
@@ -259,19 +261,18 @@ static void clk_generated_startup(struct clk_generated *gck)unsigned long flags;spin_lock_irqsave (gck->lock, flags); -regmap_write (gck->regmap,AT91_PMC_PCR , - (gck->id &AT91_PMC_PCR_PID_MASK )); -regmap_read (gck->regmap,AT91_PMC_PCR , &tmp); +regmap_write (gck->regmap, gck->layout->offset, + (gck->id & gck->layout->pid_mask)); +regmap_read (gck->regmap, gck->layout->offset, &tmp);spin_unlock_irqrestore (gck->lock, flags); - gck->parent_id = (tmp &AT91_PMC_PCR_GCKCSS_MASK ) - >>AT91_PMC_PCR_GCKCSS_OFFSET ; - gck->gckdiv = (tmp &AT91_PMC_PCR_GCKDIV_MASK ) - >>AT91_PMC_PCR_GCKDIV_OFFSET ; + gck->parent_id =field_get (gck->layout->gckcss_mask, tmp); + gck->gckdiv =FIELD_GET (AT91_PMC_PCR_GCKDIV_MASK , tmp); }struct clk_hw *__init at91_clk_register_generated (struct regmap *regmap,spinlock_t *lock, +const struct clk_pcr_layout *layout,const char *name,const char **parent_names,u8 num_parents,u8 id,bool pll_audio,const struct clk_range *range)
@@ -298,6 +299,7 @@ at91_clk_register_generated(struct regmap *regmap, spinlock_t *lock, gck->lock = lock; gck->range = *range; gck->audio_pll_allowed = pll_audio; + gck->layout = layout;clk_generated_startup (gck); 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) id == GCK_ID_CLASSD)) pll_audio = true; - hw =at91_clk_register_generated (regmap, &pmc_pcr_lock, name, + hw =at91_clk_register_generated (regmap, &pmc_pcr_lock, + &dt_pcr_layout, name, parent_names, num_parents, id, pll_audio, &range);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,struct clk_hw *__init at91_clk_register_generated (struct regmap *regmap,spinlock_t *lock, +const struct clk_pcr_layout *layout,const char *name,const char **parent_names,u8 num_parents,u8 id,bool pll_audio,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) parent_names[5 ] ="audiopll_pmcck" ;for (i =0 ; i <ARRAY_SIZE (sama5d2_gck); i++) { hw = at91_clk_register_generated(regmap, &pmc_pcr_lock, + &sama5d2_pcr_layout, sama5d2_gck[i].n, parent_names, 6, sama5d2_gck[i].id,
include/linux/clk/at91_pmc.h +1 -6
@@ -187,13 +187,8 @@#define AT91_PMC_PCR 0x10c/* Peripheral Control Register [some SAM9 and SAMA5] */ #define AT91_PMC_PCR_PID_MASK 0x3f -#define AT91_PMC_PCR_GCKCSS_OFFSET 8 -#define AT91_PMC_PCR_GCKCSS_MASK (0x7 << AT91_PMC_PCR_GCKCSS_OFFSET) -#define AT91_PMC_PCR_GCKCSS (n) ((n) << AT91_PMC_PCR_GCKCSS_OFFSET)/* GCK Clock Source Selection */ #define AT91_PMC_PCR_CMD (0x1 << 12)/* Command (read=0, write=1) */ -#define AT91_PMC_PCR_GCKDIV_OFFSET 20 -#define AT91_PMC_PCR_GCKDIV_MASK (0xff << AT91_PMC_PCR_GCKDIV_OFFSET) -#define AT91_PMC_PCR_GCKDIV (n) ((n) << AT91_PMC_PCR_GCKDIV_OFFSET)/* Generated Clock Divisor Value */ +#define AT91_PMC_PCR_GCKDIV_MASK GENMASK(27, 20)#define AT91_PMC_PCR_EN (0x1 << 28)/* Enable */ #define AT91_PMC_PCR_GCKEN (0x1 << 29)/* GCK Enable */
Signature · 1 line
2.20.1
Re: [PATCH v3 2/7] clk: at91: allow configuring generated PCR layout
Quoting Alexandre Belloni (2019-04-02 05:50:51)
Quoted 5 lines
The PCR register layout for GCLKCSS is changing for the future SoCs, allow configuring it.
Signed-off-by Alexandre Belloni <[email protected]>---
Applied to clk-next
Alexandre Belloni
maintainerPATCH v3 3/7 clk: at91: usb: Add sam9x60 support
In reply to Alexandre BelloniThe sam9x60 USB clock supports four different parents, ensure they can be selected.
--- drivers/clk/at91/clk-usb.c | 33 +++++++++++++++++++++++++++------ drivers/clk/at91/pmc.h | 3 +++ 2 files changed, 30 insertions(+), 6 deletions(-)
drivers/clk/at91/clk-usb.c +27 -6
@@ -23,9 +23,13 @@#define RM9200_USB_DIV_SHIFT 28#define RM9200_USB_DIV_TAB_SIZE 4 +#define SAM9X5_USBS_MASK GENMASK(0, 0) +#define SAM9X60_USBS_MASK GENMASK(1, 0) +struct at91sam9x5_clk_usb {struct clk_hw hw;struct regmap *regmap; +u32 usbs_mask; };#define to_at91sam9x5_clk_usb (hw) \
@@ -111,8 +115,7 @@ static int at91sam9x5_clk_usb_set_parent(struct clk_hw *hw, u8 index)if (index >1 )return -EINVAL ; -regmap_update_bits (usb->regmap,AT91_PMC_USB ,AT91_PMC_USBS , - index ?AT91_PMC_USBS :0 ); +regmap_update_bits (usb->regmap,AT91_PMC_USB , usb->usbs_mask, index);return 0 ; }
@@ -124,7 +127,7 @@ static u8 at91sam9x5_clk_usb_get_parent(struct clk_hw *hw)regmap_read (usb->regmap,AT91_PMC_USB , &usbr); -return usbr &AT91_PMC_USBS ; +return usbr & usb->usbs_mask; } static int at91sam9x5_clk_usb_set_rate(struct clk_hw *hw, unsigned long rate,
@@ -190,9 +193,10 @@ static const struct clk_ops at91sam9n12_usb_ops = { .set_rate = at91sam9x5_clk_usb_set_rate, }; -struct clk_hw *__init -at91sam9x5_clk_register_usb (struct regmap *regmap,const char *name, -const char **parent_names,u8 num_parents) +static struct clk_hw *__init +_at91sam9x5_clk_register_usb (struct regmap *regmap,const char *name, +const char **parent_names,u8 num_parents, +u32 usbs_mask) {struct at91sam9x5_clk_usb *usb;struct clk_hw *hw;
@@ -212,6 +216,7 @@ at91sam9x5_clk_register_usb(struct regmap *regmap, const char *name, usb->hw.init = &init; usb->regmap = regmap; + usb->usbs_mask =SAM9X5_USBS_MASK ; hw = &usb->hw; ret =clk_hw_register (NULL , &usb->hw);
@@ -223,6 +228,22 @@ at91sam9x5_clk_register_usb(struct regmap *regmap, const char *name,return hw; } +struct clk_hw *__init +at91sam9x5_clk_register_usb (struct regmap *regmap,const char *name, +const char **parent_names,u8 num_parents) +{ +return _at91sam9x5_clk_register_usb (regmap, name, parent_names, + num_parents,SAM9X5_USBS_MASK ); +} + +struct clk_hw *__init +sam9x60_clk_register_usb (struct regmap *regmap,const char *name, +const char **parent_names,u8 num_parents) +{ +return _at91sam9x5_clk_register_usb (regmap, name, parent_names, + num_parents,SAM9X60_USBS_MASK ); +} +struct clk_hw *__init at91sam9n12_clk_register_usb (struct regmap *regmap,const char *name,const char *parent_name)
drivers/clk/at91/pmc.h +3 -0
@@ -194,6 +194,9 @@ struct clk_hw * __init at91sam9n12_clk_register_usb(struct regmap *regmap, const char *name, const char *parent_name);struct clk_hw *__init +sam9x60_clk_register_usb (struct regmap *regmap,const char *name, +const char **parent_names,u8 num_parents); +struct clk_hw *__init at91rm9200_clk_register_usb (struct regmap *regmap,const char *name,const char *parent_name,const u32 *divisors);
Signature · 1 line
2.20.1
Re: [PATCH v3 3/7] clk: at91: usb: Add sam9x60 support
Quoting Alexandre Belloni (2019-04-02 05:50:52)
Quoted 5 lines
The sam9x60 USB clock supports four different parents, ensure they can be selected.
Signed-off-by Alexandre Belloni <[email protected]>---
Applied to clk-next
Alexandre Belloni
maintainerPATCH v3 4/7 clk: at91: master: Add sam9x60 support
In reply to Alexandre BelloniThe sam9x60 cpu clock is located at a different offset but is otherwise similar to the master clock.
--- drivers/clk/at91/clk-master.c | 8 +++++--- drivers/clk/at91/pmc.h | 1 + include/linux/clk/at91_pmc.h | 2 ++ 3 files changed, 8 insertions(+), 3 deletions(-)
drivers/clk/at91/clk-master.c +5 -3
@@ -29,6 +29,7 @@ struct clk_master {struct regmap *regmap;const struct clk_master_layout *layout;const struct clk_master_characteristics *characteristics; +u32 mckr; };static inline bool clk_master_ready (struct regmap *regmap)
@@ -69,7 +70,7 @@ static unsigned long clk_master_recalc_rate(struct clk_hw *hw, master->characteristics;unsigned int mckr; -regmap_read (master->regmap,AT91_PMC_MCKR , &mckr); +regmap_read (master->regmap, master->layout->offset, &mckr); mckr &= layout->mask; pres = (mckr >> layout->pres_shift) &MASTER_PRES_MASK ;
@@ -95,7 +96,7 @@ static u8 clk_master_get_parent(struct clk_hw *hw)struct clk_master *master =to_clk_master (hw);unsigned int mckr; -regmap_read (master->regmap,AT91_PMC_MCKR , &mckr); +regmap_read (master->regmap, master->layout->offset, &mckr);return mckr &AT91_PMC_CSS ; }
@@ -147,13 +148,14 @@ at91_clk_register_master(struct regmap *regmap,return hw; } -const struct clk_master_layout at91rm9200_master_layout = { .mask =0x31F , .pres_shift =2 , + .offset =AT91_PMC_MCKR , };const struct clk_master_layout at91sam9x5_master_layout = { .mask =0x373 , .pres_shift =4 , + .offset =AT91_PMC_MCKR , };
drivers/clk/at91/pmc.h +1 -0
@@ -38,6 +38,7 @@ struct clk_range {#define CLK_RANGE (MIN ,MAX ) {.min = MIN, .max = MAX,}struct clk_master_layout { +u32 offset;u32 mask;u8 pres_shift; };
include/linux/clk/at91_pmc.h +2 -0
@@ -74,6 +74,8 @@#define AT91_PMC_USBDIV_4 (2 << 28)#define AT91_PMC_USB96M (1 << 28)/* Divider by 2 Enable (PLLB only) */ +#define AT91_PMC_CPU_CKR 0x28/* CPU Clock Register */ +#define AT91_PMC_MCKR 0x30/* Master Clock Register */ #define AT91_PMC_CSS (3 << 0)/* Master Clock Selection */ #define AT91_PMC_CSS_SLOW (0 << 0)
Signature · 1 line
2.20.1
Re: [PATCH v3 4/7] clk: at91: master: Add sam9x60 support
Quoting Alexandre Belloni (2019-04-02 05:50:53)
Quoted 5 lines
The sam9x60 cpu clock is located at a different offset but is otherwise similar to the master clock.
Signed-off-by Alexandre Belloni <[email protected]>---
Applied to clk-next
Alexandre Belloni
maintainerPATCH v3 5/7 clk: at91: add sam9x60 PLL driver
In reply to Alexandre BelloniThe PLLs on the sam9x60 (PLLA and USB PLL) use a different register set and programming model than the previous SoCs.
--- drivers/clk/at91/Makefile | 1 + drivers/clk/at91/clk-sam9x60-pll.c | 330 +++++++++++++++++++++++++++++ drivers/clk/at91/pmc.h | 6 + 3 files changed, 337 insertions(+) create mode 100644 drivers/clk/at91/clk-sam9x60-pll.c
drivers/clk/at91/Makefile +1 -0
@@ -14,6 +14,7 @@ obj-$(CONFIG_HAVE_AT91_SMD) += clk-smd.o obj-$(CONFIG_HAVE_AT91_H32MX) += clk-h32mx.o obj-$(CONFIG_HAVE_AT91_GENERATED_CLK) += clk-generated.o obj-$(CONFIG_HAVE_AT91_I2S_MUX_CLK) += clk-i2s-mux.o +obj-$(CONFIG_HAVE_AT91_SAM9X60_PLL) += clk-sam9x60-pll.o obj-$(CONFIG_SOC_AT91SAM9) += at91sam9260.o at91sam9rl.o at91sam9x5.o obj-$(CONFIG_SOC_SAMA5D4) += sama5d4.o obj-$(CONFIG_SOC_SAMA5D2) += sama5d2.o
drivers/clk/at91/clk-sam9x60-pll.c new file +330 -0
330 lines not on this page · raw message
drivers/clk/at91/pmc.h +6 -0
@@ -69,6 +69,7 @@ struct clk_pll_characteristics {struct clk_range *output;u16 *icpll;u8 *out; + u8 upll : 1; };struct clk_programmable_layout {
@@ -169,6 +170,11 @@ struct clk_hw * __init at91_clk_register_plldiv(struct regmap *regmap, const char *name, const char *parent_name); +struct clk_hw *__init +sam9x60_clk_register_pll (struct regmap *regmap,spinlock_t *lock, +const char *name,const char *parent_name,u8 id, +const struct clk_pll_characteristics *characteristics); +struct clk_hw *__init at91_clk_register_programmable(struct regmap *regmap, const char *name, const char **parent_names, u8 num_parents, u8 id,
Signature · 1 line
2.20.1
Re: [PATCH v3 5/7] clk: at91: add sam9x60 PLL driver
Quoting Alexandre Belloni (2019-04-02 05:50:54)
Quoted 5 lines
The PLLs on the sam9x60 (PLLA and USB PLL) use a different register set and programming model than the previous SoCs.
Signed-off-by Alexandre Belloni <[email protected]>---
Applied to clk-next
Alexandre Belloni
maintainerPATCH v3 6/7 dt-bindings: clk: at91: add bindings for SAM9X60 pmc
In reply to Alexandre BelloniAdd SAM9X60 PMC compatible string.
--- Documentation/devicetree/bindings/clock/at91-clock.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
Documentation/devicetree/bindings/clock/at91-clock.txt +2 -1
@@ -37,7 +37,8 @@ For example: Power Management Controller (PMC): Required properties: -- compatible : shall be "atmel,<chip>-pmc", "syscon": +- compatible : shall be "atmel,<chip>-pmc", "syscon" or + "microchip,sam9x60-pmc" <chip> can be: at91rm9200, at91sam9260, at91sam9261, at91sam9263, at91sam9g45, at91sam9n12, at91sam9rl, at91sam9g15, at91sam9g25, at91sam9g35, at91sam9x25, at91sam9x35, at91sam9x5,
Signature · 1 line
2.20.1
Re: [PATCH v3 6/7] dt-bindings: clk: at91: add bindings for SAM9X60 pmc
Quoting Alexandre Belloni (2019-04-02 05:50:55)
Quoted 4 lines
Add SAM9X60 PMC compatible string.
Signed-off-by Alexandre Belloni <[email protected]>---
Applied to clk-next
Alexandre Belloni
maintainerPATCH v3 7/7 clk: at91: add sam9x60 pmc driver
In reply to Alexandre BelloniAdd a driver for the PMC clocks of the sam9c60.
--- drivers/clk/at91/Makefile | 1 + drivers/clk/at91/sam9x60.c | 307 +++++++++++++++++++++++++++++++++++++ 2 files changed, 308 insertions(+) create mode 100644 drivers/clk/at91/sam9x60.c
drivers/clk/at91/Makefile +1 -0
@@ -16,5 +16,6 @@ obj-$(CONFIG_HAVE_AT91_GENERATED_CLK) += clk-generated.o obj-$(CONFIG_HAVE_AT91_I2S_MUX_CLK) += clk-i2s-mux.o obj-$(CONFIG_HAVE_AT91_SAM9X60_PLL) += clk-sam9x60-pll.o obj-$(CONFIG_SOC_AT91SAM9) += at91sam9260.o at91sam9rl.o at91sam9x5.o +obj-$(CONFIG_SOC_SAM9X60) += sam9x60.o obj-$(CONFIG_SOC_SAMA5D4) += sama5d4.o obj-$(CONFIG_SOC_SAMA5D2) += sama5d2.o
drivers/clk/at91/sam9x60.c new file +307 -0
307 lines not on this page · raw message
Signature · 1 line
2.20.1
Stephen Boyd
maintainerRe: [PATCH v3 7/7] clk: at91: add sam9x60 pmc driver
Quoting Alexandre Belloni (2019-04-02 05:50:56)
Quoted 20 lines
drivers/clk/at91/sam9x60.c new file +14
-0@@ -0,0 +1,307 @@ +// SPDX-License-Identifier: GPL-2.0 +#include <linux/clk-provider.h> +#include <linux/mfd/syscon.h> +#include <linux/slab.h> + +#include <dt-bindings/clock/at91.h> + +#include "pmc.h" + +DEFINE_SPINLOCK (pmc_pll_lock); + +static const struct clk_master_characteristics mck_characteristics = { + .output = { .min =140000000 , .max =200000000 }, + .divisors = {1 ,2 ,4 ,3 },
drivers/clk/at91/sam9x60.c line 24
Quoted 10 lines
drivers/clk/at91/sam9x60.c new file +10
-0+ .have_div3_pres = 1, +}; + +static const struct clk_master_layout sam9x60_master_layout = { + .mask =0x373 , + .pres_shift =4 , + .offset =0x28 , +}; + +static struct clk_range plla_outputs[] = {
const?
Quoted 2 lines
drivers/clk/at91/sam9x60.c new file +2
-0+ { .min = 300000000, .max = 600000000 }, +};
[...]
drivers/clk/at91/sam9x60.c line 307
Quoted 5 lines
drivers/clk/at91/sam9x60.c new file +4
-0+ +} + +CLK_OF_DECLARE_DRIVER (sam9x60_pmc,"microchip,sam9x60-pmc" , sam9x60_pmc_setup);
Can't be platform device?
Alexandre Belloni
maintainerRe: [PATCH v3 7/7] clk: at91: add sam9x60 pmc driver
Quoted 25 lines · Stephen Boyd
Quoting Alexandre Belloni (2019-04-02 05:50:56)
Quoted 24 lines
drivers/clk/at91/sam9x60.c new file +18
-0@@ -0,0 +1,307 @@ +// SPDX-License-Identifier: GPL-2.0 +#include <linux/clk-provider.h> +#include <linux/mfd/syscon.h> +#include <linux/slab.h> + +#include <dt-bindings/clock/at91.h> + +#include "pmc.h" + +DEFINE_SPINLOCK (pmc_pll_lock); + +static const struct clk_master_characteristics mck_characteristics = { + .output = { .min =140000000 , .max =200000000 }, + .divisors = {1 ,2 ,4 ,3 }, + .have_div3_pres =1 , +}; + +static const struct clk_master_layout sam9x60_master_layout = {
Quoted 9 lines
drivers/clk/at91/sam9x60.c line 24
Quoted 6 lines
drivers/clk/at91/sam9x60.c new file +6
-0+ .mask = 0x373, + .pres_shift = 4, + .offset = 0x28, +}; + +static struct clk_range plla_outputs[] = {const?
Right, can you fix that up or should I send a new version?
Quoted 11 lines
Quoted 2 lines
drivers/clk/at91/sam9x60.c new file +2
-0+ { .min = 300000000, .max = 600000000 }, +};[...]
drivers/clk/at91/sam9x60.c line 307
Quoted 5 lines
drivers/clk/at91/sam9x60.c new file +4
-0+ +} + +CLK_OF_DECLARE_DRIVER (sam9x60_pmc,"microchip,sam9x60-pmc" , sam9x60_pmc_setup);Can't be platform device?
IIRC two clocks are used by the clocksource and having it as a platform device make the clocksource driver fail with -EPROBE_DEFER.
Signature · 3 lines
Alexandre Belloni, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
Stephen Boyd
maintainerRe: [PATCH v3 7/7] clk: at91: add sam9x60 pmc driver
Quoting Alexandre Belloni (2019-04-25 13:31:39)
Quoted 36 lines · Stephen Boyd
Quoted 25 lines
Quoting Alexandre Belloni (2019-04-02 05:50:56)
Quoted 24 lines
drivers/clk/at91/sam9x60.c new file +18
-0@@ -0,0 +1,307 @@ +// SPDX-License-Identifier: GPL-2.0 +#include <linux/clk-provider.h> +#include <linux/mfd/syscon.h> +#include <linux/slab.h> + +#include <dt-bindings/clock/at91.h> + +#include "pmc.h" + +DEFINE_SPINLOCK (pmc_pll_lock); + +static const struct clk_master_characteristics mck_characteristics = { + .output = { .min =140000000 , .max =200000000 }, + .divisors = {1 ,2 ,4 ,3 }, + .have_div3_pres =1 , +}; + +static const struct clk_master_layout sam9x60_master_layout = {Quoted 9 lines
drivers/clk/at91/sam9x60.c line 24
Quoted 6 lines
drivers/clk/at91/sam9x60.c new file +6
-0+ .mask = 0x373, + .pres_shift = 4, + .offset = 0x28, +}; + +static struct clk_range plla_outputs[] = {const?
Quoted 2 lines
Right, can you fix that up or should I send a new version?
I can fix it.
Quoted 12 lines
Quoted 11 lines
Quoted 2 lines
drivers/clk/at91/sam9x60.c new file +2
-0+ { .min = 300000000, .max = 600000000 }, +};[...]
drivers/clk/at91/sam9x60.c line 307
Quoted 5 lines
drivers/clk/at91/sam9x60.c new file +4
-0+ +} + +CLK_OF_DECLARE_DRIVER (sam9x60_pmc,"microchip,sam9x60-pmc" , sam9x60_pmc_setup);Can't be platform device?
Quoted 3 lines
IIRC two clocks are used by the clocksource and having it as a platform device make the clocksource driver fail with -EPROBE_DEFER.
Ok. I'll add a comment in the driver. It needs to be CLK_OF_DECLARE_DRIVER() because it's used somewhere else too? Or it can be CLK_OF_DECLARE() instead?
Alexandre Belloni
maintainerRe: [PATCH v3 7/7] clk: at91: add sam9x60 pmc driver
Quoted 7 lines · Stephen Boyd
Quoted 3 lines
IIRC two clocks are used by the clocksource and having it as a platform device make the clocksource driver fail with -EPROBE_DEFER.
Ok. I'll add a comment in the driver. It needs to be
CLK_OF_DECLARE_DRIVER()because it's used somewhere else too? Or it can beCLK_OF_DECLARE()instead?
It is coming from that comment:
https://lore.kernel.org/lkml/153573753043.93865.2420370848457480370@swboyd.mtv.corp.google.com/
Maybe I misinterpreted it.
Signature · 3 lines
Alexandre Belloni, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
Stephen Boyd
maintainerRe: [PATCH v3 7/7] clk: at91: add sam9x60 pmc driver
Quoting Alexandre Belloni (2019-04-25 14:10:09)
Quoted 5 lines · Stephen Boyd
Quoted 4 lines
Quoted 3 lines
IIRC two clocks are used by the clocksource and having it as a platform device make the clocksource driver fail with -EPROBE_DEFER.
Quoted 9 lines
Quoted 3 lines
Ok. I'll add a comment in the driver. It needs to be
CLK_OF_DECLARE_DRIVER()because it's used somewhere else too? Or it can beCLK_OF_DECLARE()instead?It is coming from that comment:
https://lore.kernel.org/lkml/153573753043.93865.2420370848457480370@swboyd.mtv.corp.google.com/Maybe I misinterpreted it.
Hmm I was just confused it seems. If you don't have two devices probing the same DT node with this compatible string then I think it can just be CLK_OF_DECLARE(). I was thinking that you were running into some sort of issue where the other driver using this same compatible couldn't probe.
Alexandre Belloni
maintainerRe: [PATCH v3 7/7] clk: at91: add sam9x60 pmc driver
Quoted 13 lines · Stephen Boyd
Quoting Alexandre Belloni (2019-04-25 14:10:09)
Quoted 12 lines · Stephen Boyd
Quoted 7 lines
Quoted 3 lines
IIRC two clocks are used by the clocksource and having it as a platform device make the clocksource driver fail with -EPROBE_DEFER.
Ok. I'll add a comment in the driver. It needs to be
CLK_OF_DECLARE_DRIVER()because it's used somewhere else too? Or it can beCLK_OF_DECLARE()instead?It is coming from that comment:
https://lore.kernel.org/lkml/153573753043.93865.2420370848457480370@swboyd.mtv.corp.google.com/
Quoted 8 lines
Quoted 2 lines
Maybe I misinterpreted it.
Hmm I was just confused it seems. If you don't have two devices probing the same DT node with this compatible string then I think it can just be
CLK_OF_DECLARE(). I was thinking that you were running into some sort of issue where the other driver using this same compatible couldn't probe.
I tried separating it into two initializations and do as much as possible in the platform driver but because the TCB clocks are peripheral clocks that depend on most of the other ones, I didn't find it convenient. This can safely be changed to CLK_OF_DECLARE. I can send v4 if you want. This should probably be changed for the other drivers too.
Signature · 3 lines
Alexandre Belloni, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
Stephen Boyd
maintainerRe: [PATCH v3 7/7] clk: at91: add sam9x60 pmc driver
Quoting Alexandre Belloni (2019-04-26 14:06:51)
Quoted 8 lines · Stephen Boyd
Quoted 6 lines
Hmm I was just confused it seems. If you don't have two devices probing the same DT node with this compatible string then I think it can just be
CLK_OF_DECLARE(). I was thinking that you were running into some sort of issue where the other driver using this same compatible couldn't probe.
Quoted 6 lines
I tried separating it into two initializations and do as much as possible in the platform driver but because the TCB clocks are peripheral clocks that depend on most of the other ones, I didn't find it convenient. This can safely be changed to
CLK_OF_DECLARE. I can send v4 if you want. This should probably be changed for the other drivers too.
I've fixed it locally, just haven't pushed it out. If you have other drivers that should be using CLK_OF_DECLARE then feel free to send a patch for it.
Stephen Boyd
maintainerRe: [PATCH v3 7/7] clk: at91: add sam9x60 pmc driver
In reply to Stephen BoydQuoting Stephen Boyd (2019-04-25 13:58:10)
Quoted 10 lines
Quoting Alexandre Belloni (2019-04-25 13:31:39)
Quoted 7 lines · Stephen Boyd
Quoted 3 lines
const?
Right, can you fix that up or should I send a new version?
I can fix it.
It's more complicated. I'll pile this patch on top. Maybe other static data in drivers/clk/at91 can be const, but this at least covers the struct clk_range ones.
drivers/clk/at91/at91sam9260.c +7 -7
@@ -41,7 +41,7 @@ static u8 sam9260_plla_out[] = { 0, 2 };static u16 sam9260_plla_icpll[] = {1 ,1 }; -static struct clk_range sam9260_plla_outputs[] = { +static const struct clk_range sam9260_plla_outputs[] = { { .min =80000000 , .max =160000000 }, { .min =150000000 , .max =240000000 }, };
@@ -58,7 +58,7 @@ static u8 sam9260_pllb_out[] = { 1 };static u16 sam9260_pllb_icpll[] = {1 }; -static struct clk_range sam9260_pllb_outputs[] = { +static const struct clk_range sam9260_pllb_outputs[] = { { .min =70000000 , .max =130000000 }, };
@@ -128,7 +128,7 @@ static u8 sam9g20_plla_out[] = { 0, 1, 2, 3, 0, 1, 2, 3 };static u16 sam9g20_plla_icpll[] = {0 ,0 ,0 ,0 ,1 ,1 ,1 ,1 }; -static struct clk_range sam9g20_plla_outputs[] = { +static const struct clk_range sam9g20_plla_outputs[] = { { .min =745000000 , .max =800000000 }, { .min =695000000 , .max =750000000 }, { .min =645000000 , .max =700000000 },
@@ -151,7 +151,7 @@ static u8 sam9g20_pllb_out[] = { 0 };static u16 sam9g20_pllb_icpll[] = {0 }; -static struct clk_range sam9g20_pllb_outputs[] = { +static const struct clk_range sam9g20_pllb_outputs[] = { { .min =30000000 , .max =100000000 }, };
@@ -182,7 +182,7 @@ static const struct clk_master_characteristics sam9261_mck_characteristics = { .divisors = { 1, 2, 4, 0 }, }; -static struct clk_range sam9261_plla_outputs[] = { +static const struct clk_range sam9261_plla_outputs[] = { { .min =80000000 , .max =200000000 }, { .min =190000000 , .max =240000000 }, };
@@ -199,7 +199,7 @@ static u8 sam9261_pllb_out[] = { 1 };static u16 sam9261_pllb_icpll[] = {1 }; -static struct clk_range sam9261_pllb_outputs[] = { +static const struct clk_range sam9261_pllb_outputs[] = { { .min =70000000 , .max =130000000 }, };
@@ -262,7 +262,7 @@ static const struct clk_master_characteristics sam9263_mck_characteristics = { .divisors = { 1, 2, 4, 0 }, }; -static struct clk_range sam9263_pll_outputs[] = { +static const struct clk_range sam9263_pll_outputs[] = { { .min =80000000 , .max =200000000 }, { .min =190000000 , .max =240000000 }, };
drivers/clk/at91/at91sam9rl.c +1 -1
@@ -14,7 +14,7 @@ static const struct clk_master_characteristics sam9rl_mck_characteristics = {static u8 sam9rl_plla_out[] = {0 ,2 }; -static struct clk_range sam9rl_plla_outputs[] = { +static const struct clk_range sam9rl_plla_outputs[] = { { .min =80000000 , .max =200000000 }, { .min =190000000 , .max =240000000 }, };
drivers/clk/at91/at91sam9x5.c +1 -1
@@ -17,7 +17,7 @@ static u8 plla_out[] = { 0, 1, 2, 3, 0, 1, 2, 3 };static u16 plla_icpll[] = {0 ,0 ,0 ,0 ,1 ,1 ,1 ,1 }; -static struct clk_range plla_outputs[] = { +static const struct clk_range plla_outputs[] = { { .min =745000000 , .max =800000000 }, { .min =695000000 , .max =750000000 }, { .min =645000000 , .max =700000000 },
drivers/clk/at91/pmc.h +1 -1
@@ -66,7 +66,7 @@ extern const struct clk_pll_layout sama5d3_pll_layout;struct clk_pll_characteristics {struct clk_range input;int num_output; -struct clk_range *output; +const struct clk_range *output;u16 *icpll;u8 *out;u8 upll :1 ;
drivers/clk/at91/sam9x60.c +2 -2
@@ -21,7 +21,7 @@ static const struct clk_master_layout sam9x60_master_layout = { .offset = 0x28, }; -static struct clk_range plla_outputs[] = { +static const struct clk_range plla_outputs[] = { { .min =300000000 , .max =600000000 }, };
@@ -31,7 +31,7 @@ static const struct clk_pll_characteristics plla_characteristics = { .output = plla_outputs, }; -static struct clk_range upll_outputs[] = { +static const struct clk_range upll_outputs[] = { { .min =300000000 , .max =500000000 }, };
drivers/clk/at91/sama5d2.c +1 -1
@@ -16,7 +16,7 @@ static u8 plla_out[] = { 0 };static u16 plla_icpll[] = {0 }; -static struct clk_range plla_outputs[] = { +static const struct clk_range plla_outputs[] = { { .min =600000000 , .max =1200000000 }, };
drivers/clk/at91/sama5d4.c +1 -1
@@ -16,7 +16,7 @@ static u8 plla_out[] = { 0 };static u16 plla_icpll[] = {0 }; -static struct clk_range plla_outputs[] = { +static const struct clk_range plla_outputs[] = { { .min =600000000 , .max =1200000000 }, };
Alexandre Belloni
maintainerRe: [PATCH v3 7/7] clk: at91: add sam9x60 pmc driver
Quoted 7 lines · Stephen Boyd
Quoting Stephen Boyd (2019-04-25 13:58:10)
Quoted 6 lines
Quoting Alexandre Belloni (2019-04-25 13:31:39)
Quoted 5 lines · Stephen Boyd
Quoted 3 lines
const?
Quoted 9 lines
Quoted 4 lines
Quoted 2 lines
Right, can you fix that up or should I send a new version?
I can fix it.
It's more complicated. I'll pile this patch on top. Maybe other static data in
drivers/clk/at91can be const, but this at least covers the structclk_rangeones.
Seems good to me.
Quoted 154 lines
drivers/clk/at91/at91sam9260.c +7
-7@@ -41,7 +41,7 @@ static u8 sam9260_plla_out[] = { 0, 2 };static u16 sam9260_plla_icpll[] = {1 ,1 }; -static struct clk_range sam9260_plla_outputs[] = { +static const struct clk_range sam9260_plla_outputs[] = { { .min =80000000 , .max =160000000 }, { .min =150000000 , .max =240000000 }, };@@ -58,7 +58,7 @@ static u8 sam9260_pllb_out[] = { 1 };static u16 sam9260_pllb_icpll[] = {1 }; -static struct clk_range sam9260_pllb_outputs[] = { +static const struct clk_range sam9260_pllb_outputs[] = { { .min =70000000 , .max =130000000 }, };@@ -128,7 +128,7 @@ static u8 sam9g20_plla_out[] = { 0, 1, 2, 3, 0, 1, 2, 3 };static u16 sam9g20_plla_icpll[] = {0 ,0 ,0 ,0 ,1 ,1 ,1 ,1 }; -static struct clk_range sam9g20_plla_outputs[] = { +static const struct clk_range sam9g20_plla_outputs[] = { { .min =745000000 , .max =800000000 }, { .min =695000000 , .max =750000000 }, { .min =645000000 , .max =700000000 },@@ -151,7 +151,7 @@ static u8 sam9g20_pllb_out[] = { 0 };static u16 sam9g20_pllb_icpll[] = {0 }; -static struct clk_range sam9g20_pllb_outputs[] = { +static const struct clk_range sam9g20_pllb_outputs[] = { { .min =30000000 , .max =100000000 }, };@@ -182,7 +182,7 @@ static const struct clk_master_characteristics sam9261_mck_characteristics = { .divisors = { 1, 2, 4, 0 }, }; -static struct clk_range sam9261_plla_outputs[] = { +static const struct clk_range sam9261_plla_outputs[] = { { .min =80000000 , .max =200000000 }, { .min =190000000 , .max =240000000 }, };@@ -199,7 +199,7 @@ static u8 sam9261_pllb_out[] = { 1 };static u16 sam9261_pllb_icpll[] = {1 }; -static struct clk_range sam9261_pllb_outputs[] = { +static const struct clk_range sam9261_pllb_outputs[] = { { .min =70000000 , .max =130000000 }, };@@ -262,7 +262,7 @@ static const struct clk_master_characteristics sam9263_mck_characteristics = { .divisors = { 1, 2, 4, 0 }, }; -static struct clk_range sam9263_pll_outputs[] = { +static const struct clk_range sam9263_pll_outputs[] = { { .min =80000000 , .max =200000000 }, { .min =190000000 , .max =240000000 }, };drivers/clk/at91/at91sam9rl.c +1
-1@@ -14,7 +14,7 @@ static const struct clk_master_characteristics sam9rl_mck_characteristics = {static u8 sam9rl_plla_out[] = {0 ,2 }; -static struct clk_range sam9rl_plla_outputs[] = { +static const struct clk_range sam9rl_plla_outputs[] = { { .min =80000000 , .max =200000000 }, { .min =190000000 , .max =240000000 }, };drivers/clk/at91/at91sam9x5.c +1
-1@@ -17,7 +17,7 @@ static u8 plla_out[] = { 0, 1, 2, 3, 0, 1, 2, 3 };static u16 plla_icpll[] = {0 ,0 ,0 ,0 ,1 ,1 ,1 ,1 }; -static struct clk_range plla_outputs[] = { +static const struct clk_range plla_outputs[] = { { .min =745000000 , .max =800000000 }, { .min =695000000 , .max =750000000 }, { .min =645000000 , .max =700000000 },drivers/clk/at91/pmc.h +1
-1@@ -66,7 +66,7 @@ extern const struct clk_pll_layout sama5d3_pll_layout;struct clk_pll_characteristics {struct clk_range input;int num_output; -struct clk_range *output; +const struct clk_range *output;u16 *icpll;u8 *out;u8 upll :1 ;drivers/clk/at91/sam9x60.c +2
-2@@ -21,7 +21,7 @@ static const struct clk_master_layout sam9x60_master_layout = { .offset = 0x28, }; -static struct clk_range plla_outputs[] = { +static const struct clk_range plla_outputs[] = { { .min =300000000 , .max =600000000 }, };@@ -31,7 +31,7 @@ static const struct clk_pll_characteristics plla_characteristics = { .output = plla_outputs, }; -static struct clk_range upll_outputs[] = { +static const struct clk_range upll_outputs[] = { { .min =300000000 , .max =500000000 }, };drivers/clk/at91/sama5d2.c +1
-1@@ -16,7 +16,7 @@ static u8 plla_out[] = { 0 };static u16 plla_icpll[] = {0 }; -static struct clk_range plla_outputs[] = { +static const struct clk_range plla_outputs[] = { { .min =600000000 , .max =1200000000 }, };drivers/clk/at91/sama5d4.c +1
-1@@ -16,7 +16,7 @@ static u8 plla_out[] = { 0 };static u16 plla_icpll[] = {0 }; -static struct clk_range plla_outputs[] = { +static const struct clk_range plla_outputs[] = { { .min =600000000 , .max =1200000000 }, };
Signature · 3 lines
Alexandre Belloni, Bootlin Embedded Linux and Kernel engineering https://bootlin.com