clk: make several parent names const
Since commit 2893c37946
("clk: make strings in parent name arrays
const") the name of parent clocks can be const. So add more const in
several clock drivers.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Acked-by: Heiko Stuebner <heiko@sntech.de>
Acked-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
This commit is contained in:
parent
90acb40f18
commit
4a1caed3d0
|
@ -38,44 +38,44 @@
|
|||
#include "clk.h"
|
||||
|
||||
/* clock parent list */
|
||||
static const char *timer0_mux_p[] __initdata = { "osc32k", "timerclk01", };
|
||||
static const char *timer1_mux_p[] __initdata = { "osc32k", "timerclk01", };
|
||||
static const char *timer2_mux_p[] __initdata = { "osc32k", "timerclk23", };
|
||||
static const char *timer3_mux_p[] __initdata = { "osc32k", "timerclk23", };
|
||||
static const char *timer4_mux_p[] __initdata = { "osc32k", "timerclk45", };
|
||||
static const char *timer5_mux_p[] __initdata = { "osc32k", "timerclk45", };
|
||||
static const char *timer6_mux_p[] __initdata = { "osc32k", "timerclk67", };
|
||||
static const char *timer7_mux_p[] __initdata = { "osc32k", "timerclk67", };
|
||||
static const char *timer8_mux_p[] __initdata = { "osc32k", "timerclk89", };
|
||||
static const char *timer9_mux_p[] __initdata = { "osc32k", "timerclk89", };
|
||||
static const char *uart0_mux_p[] __initdata = { "osc26m", "pclk", };
|
||||
static const char *uart1_mux_p[] __initdata = { "osc26m", "pclk", };
|
||||
static const char *uart2_mux_p[] __initdata = { "osc26m", "pclk", };
|
||||
static const char *uart3_mux_p[] __initdata = { "osc26m", "pclk", };
|
||||
static const char *uart4_mux_p[] __initdata = { "osc26m", "pclk", };
|
||||
static const char *spi0_mux_p[] __initdata = { "osc26m", "rclk_cfgaxi", };
|
||||
static const char *spi1_mux_p[] __initdata = { "osc26m", "rclk_cfgaxi", };
|
||||
static const char *spi2_mux_p[] __initdata = { "osc26m", "rclk_cfgaxi", };
|
||||
static const char *const timer0_mux_p[] __initconst = { "osc32k", "timerclk01", };
|
||||
static const char *const timer1_mux_p[] __initconst = { "osc32k", "timerclk01", };
|
||||
static const char *const timer2_mux_p[] __initconst = { "osc32k", "timerclk23", };
|
||||
static const char *const timer3_mux_p[] __initconst = { "osc32k", "timerclk23", };
|
||||
static const char *const timer4_mux_p[] __initconst = { "osc32k", "timerclk45", };
|
||||
static const char *const timer5_mux_p[] __initconst = { "osc32k", "timerclk45", };
|
||||
static const char *const timer6_mux_p[] __initconst = { "osc32k", "timerclk67", };
|
||||
static const char *const timer7_mux_p[] __initconst = { "osc32k", "timerclk67", };
|
||||
static const char *const timer8_mux_p[] __initconst = { "osc32k", "timerclk89", };
|
||||
static const char *const timer9_mux_p[] __initconst = { "osc32k", "timerclk89", };
|
||||
static const char *const uart0_mux_p[] __initconst = { "osc26m", "pclk", };
|
||||
static const char *const uart1_mux_p[] __initconst = { "osc26m", "pclk", };
|
||||
static const char *const uart2_mux_p[] __initconst = { "osc26m", "pclk", };
|
||||
static const char *const uart3_mux_p[] __initconst = { "osc26m", "pclk", };
|
||||
static const char *const uart4_mux_p[] __initconst = { "osc26m", "pclk", };
|
||||
static const char *const spi0_mux_p[] __initconst = { "osc26m", "rclk_cfgaxi", };
|
||||
static const char *const spi1_mux_p[] __initconst = { "osc26m", "rclk_cfgaxi", };
|
||||
static const char *const spi2_mux_p[] __initconst = { "osc26m", "rclk_cfgaxi", };
|
||||
/* share axi parent */
|
||||
static const char *saxi_mux_p[] __initdata = { "armpll3", "armpll2", };
|
||||
static const char *pwm0_mux_p[] __initdata = { "osc32k", "osc26m", };
|
||||
static const char *pwm1_mux_p[] __initdata = { "osc32k", "osc26m", };
|
||||
static const char *sd_mux_p[] __initdata = { "armpll2", "armpll3", };
|
||||
static const char *mmc1_mux_p[] __initdata = { "armpll2", "armpll3", };
|
||||
static const char *mmc1_mux2_p[] __initdata = { "osc26m", "mmc1_div", };
|
||||
static const char *g2d_mux_p[] __initdata = { "armpll2", "armpll3", };
|
||||
static const char *venc_mux_p[] __initdata = { "armpll2", "armpll3", };
|
||||
static const char *vdec_mux_p[] __initdata = { "armpll2", "armpll3", };
|
||||
static const char *vpp_mux_p[] __initdata = { "armpll2", "armpll3", };
|
||||
static const char *edc0_mux_p[] __initdata = { "armpll2", "armpll3", };
|
||||
static const char *ldi0_mux_p[] __initdata = { "armpll2", "armpll4",
|
||||
static const char *const saxi_mux_p[] __initconst = { "armpll3", "armpll2", };
|
||||
static const char *const pwm0_mux_p[] __initconst = { "osc32k", "osc26m", };
|
||||
static const char *const pwm1_mux_p[] __initconst = { "osc32k", "osc26m", };
|
||||
static const char *const sd_mux_p[] __initconst = { "armpll2", "armpll3", };
|
||||
static const char *const mmc1_mux_p[] __initconst = { "armpll2", "armpll3", };
|
||||
static const char *const mmc1_mux2_p[] __initconst = { "osc26m", "mmc1_div", };
|
||||
static const char *const g2d_mux_p[] __initconst = { "armpll2", "armpll3", };
|
||||
static const char *const venc_mux_p[] __initconst = { "armpll2", "armpll3", };
|
||||
static const char *const vdec_mux_p[] __initconst = { "armpll2", "armpll3", };
|
||||
static const char *const vpp_mux_p[] __initconst = { "armpll2", "armpll3", };
|
||||
static const char *const edc0_mux_p[] __initconst = { "armpll2", "armpll3", };
|
||||
static const char *const ldi0_mux_p[] __initconst = { "armpll2", "armpll4",
|
||||
"armpll3", "armpll5", };
|
||||
static const char *edc1_mux_p[] __initdata = { "armpll2", "armpll3", };
|
||||
static const char *ldi1_mux_p[] __initdata = { "armpll2", "armpll4",
|
||||
static const char *const edc1_mux_p[] __initconst = { "armpll2", "armpll3", };
|
||||
static const char *const ldi1_mux_p[] __initconst = { "armpll2", "armpll4",
|
||||
"armpll3", "armpll5", };
|
||||
static const char *rclk_hsic_p[] __initdata = { "armpll3", "armpll2", };
|
||||
static const char *mmc2_mux_p[] __initdata = { "armpll2", "armpll3", };
|
||||
static const char *mmc3_mux_p[] __initdata = { "armpll2", "armpll3", };
|
||||
static const char *const rclk_hsic_p[] __initconst = { "armpll3", "armpll2", };
|
||||
static const char *const mmc2_mux_p[] __initconst = { "armpll2", "armpll3", };
|
||||
static const char *const mmc3_mux_p[] __initconst = { "armpll2", "armpll3", };
|
||||
|
||||
|
||||
/* fixed rate clocks */
|
||||
|
|
|
@ -46,15 +46,15 @@ static struct hisi_fixed_rate_clock hix5hd2_fixed_rate_clks[] __initdata = {
|
|||
{ HIX5HD2_FIXED_83M, "83m", NULL, CLK_IS_ROOT, 83333333, },
|
||||
};
|
||||
|
||||
static const char *sfc_mux_p[] __initdata = {
|
||||
static const char *const sfc_mux_p[] __initconst = {
|
||||
"24m", "150m", "200m", "100m", "75m", };
|
||||
static u32 sfc_mux_table[] = {0, 4, 5, 6, 7};
|
||||
|
||||
static const char *sdio_mux_p[] __initdata = {
|
||||
static const char *const sdio_mux_p[] __initconst = {
|
||||
"75m", "100m", "50m", "15m", };
|
||||
static u32 sdio_mux_table[] = {0, 1, 2, 3};
|
||||
|
||||
static const char *fephy_mux_p[] __initdata = { "25m", "125m"};
|
||||
static const char *const fephy_mux_p[] __initconst = { "25m", "125m"};
|
||||
static u32 fephy_mux_table[] = {0, 1};
|
||||
|
||||
|
||||
|
|
|
@ -55,7 +55,7 @@ struct hisi_fixed_factor_clock {
|
|||
struct hisi_mux_clock {
|
||||
unsigned int id;
|
||||
const char *name;
|
||||
const char **parent_names;
|
||||
const char *const *parent_names;
|
||||
u8 num_parents;
|
||||
unsigned long flags;
|
||||
unsigned long offset;
|
||||
|
|
|
@ -77,12 +77,12 @@ static void __init clk_misc_init(void)
|
|||
writel_relaxed(30 << BP_FRAC_IOFRAC, FRAC + SET);
|
||||
}
|
||||
|
||||
static const char *sel_pll[] __initdata = { "pll", "ref_xtal", };
|
||||
static const char *sel_cpu[] __initdata = { "ref_cpu", "ref_xtal", };
|
||||
static const char *sel_pix[] __initdata = { "ref_pix", "ref_xtal", };
|
||||
static const char *sel_io[] __initdata = { "ref_io", "ref_xtal", };
|
||||
static const char *cpu_sels[] __initdata = { "cpu_pll", "cpu_xtal", };
|
||||
static const char *emi_sels[] __initdata = { "emi_pll", "emi_xtal", };
|
||||
static const char *const sel_pll[] __initconst = { "pll", "ref_xtal", };
|
||||
static const char *const sel_cpu[] __initconst = { "ref_cpu", "ref_xtal", };
|
||||
static const char *const sel_pix[] __initconst = { "ref_pix", "ref_xtal", };
|
||||
static const char *const sel_io[] __initconst = { "ref_io", "ref_xtal", };
|
||||
static const char *const cpu_sels[] __initconst = { "cpu_pll", "cpu_xtal", };
|
||||
static const char *const emi_sels[] __initconst = { "emi_pll", "emi_xtal", };
|
||||
|
||||
enum imx23_clk {
|
||||
ref_xtal, pll, ref_cpu, ref_emi, ref_pix, ref_io, saif_sel,
|
||||
|
|
|
@ -125,15 +125,15 @@ static void __init clk_misc_init(void)
|
|||
writel_relaxed(val, FRAC0);
|
||||
}
|
||||
|
||||
static const char *sel_cpu[] __initdata = { "ref_cpu", "ref_xtal", };
|
||||
static const char *sel_io0[] __initdata = { "ref_io0", "ref_xtal", };
|
||||
static const char *sel_io1[] __initdata = { "ref_io1", "ref_xtal", };
|
||||
static const char *sel_pix[] __initdata = { "ref_pix", "ref_xtal", };
|
||||
static const char *sel_gpmi[] __initdata = { "ref_gpmi", "ref_xtal", };
|
||||
static const char *sel_pll0[] __initdata = { "pll0", "ref_xtal", };
|
||||
static const char *cpu_sels[] __initdata = { "cpu_pll", "cpu_xtal", };
|
||||
static const char *emi_sels[] __initdata = { "emi_pll", "emi_xtal", };
|
||||
static const char *ptp_sels[] __initdata = { "ref_xtal", "pll0", };
|
||||
static const char *const sel_cpu[] __initconst = { "ref_cpu", "ref_xtal", };
|
||||
static const char *const sel_io0[] __initconst = { "ref_io0", "ref_xtal", };
|
||||
static const char *const sel_io1[] __initconst = { "ref_io1", "ref_xtal", };
|
||||
static const char *const sel_pix[] __initconst = { "ref_pix", "ref_xtal", };
|
||||
static const char *const sel_gpmi[] __initconst = { "ref_gpmi", "ref_xtal", };
|
||||
static const char *const sel_pll0[] __initconst = { "pll0", "ref_xtal", };
|
||||
static const char *const cpu_sels[] __initconst = { "cpu_pll", "cpu_xtal", };
|
||||
static const char *const emi_sels[] __initconst = { "emi_pll", "emi_xtal", };
|
||||
static const char *const ptp_sels[] __initconst = { "ref_xtal", "pll0", };
|
||||
|
||||
enum imx28_clk {
|
||||
ref_xtal, pll0, pll1, pll2, ref_cpu, ref_emi, ref_io0, ref_io1,
|
||||
|
|
|
@ -49,7 +49,7 @@ static inline struct clk *mxs_clk_gate(const char *name,
|
|||
}
|
||||
|
||||
static inline struct clk *mxs_clk_mux(const char *name, void __iomem *reg,
|
||||
u8 shift, u8 width, const char **parent_names, int num_parents)
|
||||
u8 shift, u8 width, const char *const *parent_names, int num_parents)
|
||||
{
|
||||
return clk_register_mux(NULL, name, parent_names, num_parents,
|
||||
CLK_SET_RATE_PARENT | CLK_SET_RATE_NO_REPARENT,
|
||||
|
|
|
@ -14,7 +14,7 @@
|
|||
#define _CLK_PXA_
|
||||
|
||||
#define PARENTS(name) \
|
||||
static const char *name ## _parents[] __initdata
|
||||
static const char *const name ## _parents[] __initconst
|
||||
#define MUX_RO_RATE_RO_OPS(name, clk_name) \
|
||||
static struct clk_hw name ## _mux_hw; \
|
||||
static struct clk_hw name ## _rate_hw; \
|
||||
|
|
|
@ -231,7 +231,7 @@ static int rockchip_cpuclk_notifier_cb(struct notifier_block *nb,
|
|||
}
|
||||
|
||||
struct clk *rockchip_clk_register_cpuclk(const char *name,
|
||||
const char **parent_names, u8 num_parents,
|
||||
const char *const *parent_names, u8 num_parents,
|
||||
const struct rockchip_cpuclk_reg_data *reg_data,
|
||||
const struct rockchip_cpuclk_rate_table *rates,
|
||||
int nrates, void __iomem *reg_base, spinlock_t *lock)
|
||||
|
|
|
@ -120,7 +120,7 @@ static const struct clk_ops rockchip_mmc_clk_ops = {
|
|||
};
|
||||
|
||||
struct clk *rockchip_clk_register_mmc(const char *name,
|
||||
const char **parent_names, u8 num_parents,
|
||||
const char *const *parent_names, u8 num_parents,
|
||||
void __iomem *reg, int shift)
|
||||
{
|
||||
struct clk_init_data init;
|
||||
|
|
|
@ -329,10 +329,10 @@ static const struct clk_ops rockchip_rk3066_pll_clk_ops = {
|
|||
*/
|
||||
|
||||
struct clk *rockchip_clk_register_pll(enum rockchip_pll_type pll_type,
|
||||
const char *name, const char **parent_names, u8 num_parents,
|
||||
void __iomem *base, int con_offset, int grf_lock_offset,
|
||||
int lock_shift, int mode_offset, int mode_shift,
|
||||
struct rockchip_pll_rate_table *rate_table,
|
||||
const char *name, const char *const *parent_names,
|
||||
u8 num_parents, void __iomem *base, int con_offset,
|
||||
int grf_lock_offset, int lock_shift, int mode_offset,
|
||||
int mode_shift, struct rockchip_pll_rate_table *rate_table,
|
||||
u8 clk_pll_flags, spinlock_t *lock)
|
||||
{
|
||||
const char *pll_parents[3];
|
||||
|
|
|
@ -39,7 +39,7 @@
|
|||
* sometimes without one of those components.
|
||||
*/
|
||||
static struct clk *rockchip_clk_register_branch(const char *name,
|
||||
const char **parent_names, u8 num_parents, void __iomem *base,
|
||||
const char *const *parent_names, u8 num_parents, void __iomem *base,
|
||||
int muxdiv_offset, u8 mux_shift, u8 mux_width, u8 mux_flags,
|
||||
u8 div_shift, u8 div_width, u8 div_flags,
|
||||
struct clk_div_table *div_table, int gate_offset,
|
||||
|
@ -103,8 +103,8 @@ static struct clk *rockchip_clk_register_branch(const char *name,
|
|||
}
|
||||
|
||||
static struct clk *rockchip_clk_register_frac_branch(const char *name,
|
||||
const char **parent_names, u8 num_parents, void __iomem *base,
|
||||
int muxdiv_offset, u8 div_flags,
|
||||
const char *const *parent_names, u8 num_parents,
|
||||
void __iomem *base, int muxdiv_offset, u8 div_flags,
|
||||
int gate_offset, u8 gate_shift, u8 gate_flags,
|
||||
unsigned long flags, spinlock_t *lock)
|
||||
{
|
||||
|
@ -297,7 +297,7 @@ void __init rockchip_clk_register_branches(
|
|||
}
|
||||
|
||||
void __init rockchip_clk_register_armclk(unsigned int lookup_id,
|
||||
const char *name, const char **parent_names,
|
||||
const char *name, const char *const *parent_names,
|
||||
u8 num_parents,
|
||||
const struct rockchip_cpuclk_reg_data *reg_data,
|
||||
const struct rockchip_cpuclk_rate_table *rates,
|
||||
|
|
|
@ -108,7 +108,7 @@ struct rockchip_pll_rate_table {
|
|||
struct rockchip_pll_clock {
|
||||
unsigned int id;
|
||||
const char *name;
|
||||
const char **parent_names;
|
||||
const char *const *parent_names;
|
||||
u8 num_parents;
|
||||
unsigned long flags;
|
||||
int con_offset;
|
||||
|
@ -140,10 +140,10 @@ struct rockchip_pll_clock {
|
|||
}
|
||||
|
||||
struct clk *rockchip_clk_register_pll(enum rockchip_pll_type pll_type,
|
||||
const char *name, const char **parent_names, u8 num_parents,
|
||||
void __iomem *base, int con_offset, int grf_lock_offset,
|
||||
int lock_shift, int reg_mode, int mode_shift,
|
||||
struct rockchip_pll_rate_table *rate_table,
|
||||
const char *name, const char *const *parent_names,
|
||||
u8 num_parents, void __iomem *base, int con_offset,
|
||||
int grf_lock_offset, int lock_shift, int reg_mode,
|
||||
int mode_shift, struct rockchip_pll_rate_table *rate_table,
|
||||
u8 clk_pll_flags, spinlock_t *lock);
|
||||
|
||||
struct rockchip_cpuclk_clksel {
|
||||
|
@ -173,16 +173,16 @@ struct rockchip_cpuclk_reg_data {
|
|||
};
|
||||
|
||||
struct clk *rockchip_clk_register_cpuclk(const char *name,
|
||||
const char **parent_names, u8 num_parents,
|
||||
const char *const *parent_names, u8 num_parents,
|
||||
const struct rockchip_cpuclk_reg_data *reg_data,
|
||||
const struct rockchip_cpuclk_rate_table *rates,
|
||||
int nrates, void __iomem *reg_base, spinlock_t *lock);
|
||||
|
||||
struct clk *rockchip_clk_register_mmc(const char *name,
|
||||
const char **parent_names, u8 num_parents,
|
||||
const char *const *parent_names, u8 num_parents,
|
||||
void __iomem *reg, int shift);
|
||||
|
||||
#define PNAME(x) static const char *x[] __initdata
|
||||
#define PNAME(x) static const char *const x[] __initconst
|
||||
|
||||
enum rockchip_clk_branch_type {
|
||||
branch_composite,
|
||||
|
@ -197,7 +197,7 @@ struct rockchip_clk_branch {
|
|||
unsigned int id;
|
||||
enum rockchip_clk_branch_type branch_type;
|
||||
const char *name;
|
||||
const char **parent_names;
|
||||
const char *const *parent_names;
|
||||
u8 num_parents;
|
||||
unsigned long flags;
|
||||
int muxdiv_offset;
|
||||
|
@ -403,7 +403,7 @@ void rockchip_clk_register_branches(struct rockchip_clk_branch *clk_list,
|
|||
void rockchip_clk_register_plls(struct rockchip_pll_clock *pll_list,
|
||||
unsigned int nr_pll, int grf_lock_offset);
|
||||
void rockchip_clk_register_armclk(unsigned int lookup_id, const char *name,
|
||||
const char **parent_names, u8 num_parents,
|
||||
const char *const *parent_names, u8 num_parents,
|
||||
const struct rockchip_cpuclk_reg_data *reg_data,
|
||||
const struct rockchip_cpuclk_rate_table *rates,
|
||||
int nrates);
|
||||
|
|
|
@ -1156,7 +1156,7 @@ static const struct clk_ops samsung_pll2650xx_clk_min_ops = {
|
|||
};
|
||||
|
||||
static void __init _samsung_clk_register_pll(struct samsung_clk_provider *ctx,
|
||||
struct samsung_pll_clock *pll_clk,
|
||||
const struct samsung_pll_clock *pll_clk,
|
||||
void __iomem *base)
|
||||
{
|
||||
struct samsung_clk_pll *pll;
|
||||
|
@ -1303,7 +1303,7 @@ static void __init _samsung_clk_register_pll(struct samsung_clk_provider *ctx,
|
|||
}
|
||||
|
||||
void __init samsung_clk_register_pll(struct samsung_clk_provider *ctx,
|
||||
struct samsung_pll_clock *pll_list,
|
||||
const struct samsung_pll_clock *pll_list,
|
||||
unsigned int nr_pll, void __iomem *base)
|
||||
{
|
||||
int cnt;
|
||||
|
|
|
@ -169,44 +169,44 @@ static inline void s5pv210_clk_sleep_init(void) { }
|
|||
#endif
|
||||
|
||||
/* Mux parent lists. */
|
||||
static const char *fin_pll_p[] __initdata = {
|
||||
static const char *const fin_pll_p[] __initconst = {
|
||||
"xxti",
|
||||
"xusbxti"
|
||||
};
|
||||
|
||||
static const char *mout_apll_p[] __initdata = {
|
||||
static const char *const mout_apll_p[] __initconst = {
|
||||
"fin_pll",
|
||||
"fout_apll"
|
||||
};
|
||||
|
||||
static const char *mout_mpll_p[] __initdata = {
|
||||
static const char *const mout_mpll_p[] __initconst = {
|
||||
"fin_pll",
|
||||
"fout_mpll"
|
||||
};
|
||||
|
||||
static const char *mout_epll_p[] __initdata = {
|
||||
static const char *const mout_epll_p[] __initconst = {
|
||||
"fin_pll",
|
||||
"fout_epll"
|
||||
};
|
||||
|
||||
static const char *mout_vpllsrc_p[] __initdata = {
|
||||
static const char *const mout_vpllsrc_p[] __initconst = {
|
||||
"fin_pll",
|
||||
"sclk_hdmi27m"
|
||||
};
|
||||
|
||||
static const char *mout_vpll_p[] __initdata = {
|
||||
static const char *const mout_vpll_p[] __initconst = {
|
||||
"mout_vpllsrc",
|
||||
"fout_vpll"
|
||||
};
|
||||
|
||||
static const char *mout_group1_p[] __initdata = {
|
||||
static const char *const mout_group1_p[] __initconst = {
|
||||
"dout_a2m",
|
||||
"mout_mpll",
|
||||
"mout_epll",
|
||||
"mout_vpll"
|
||||
};
|
||||
|
||||
static const char *mout_group2_p[] __initdata = {
|
||||
static const char *const mout_group2_p[] __initconst = {
|
||||
"xxti",
|
||||
"xusbxti",
|
||||
"sclk_hdmi27m",
|
||||
|
@ -218,7 +218,7 @@ static const char *mout_group2_p[] __initdata = {
|
|||
"mout_vpll",
|
||||
};
|
||||
|
||||
static const char *mout_audio0_p[] __initdata = {
|
||||
static const char *const mout_audio0_p[] __initconst = {
|
||||
"xxti",
|
||||
"pcmcdclk0",
|
||||
"sclk_hdmi27m",
|
||||
|
@ -230,7 +230,7 @@ static const char *mout_audio0_p[] __initdata = {
|
|||
"mout_vpll",
|
||||
};
|
||||
|
||||
static const char *mout_audio1_p[] __initdata = {
|
||||
static const char *const mout_audio1_p[] __initconst = {
|
||||
"i2scdclk1",
|
||||
"pcmcdclk1",
|
||||
"sclk_hdmi27m",
|
||||
|
@ -242,7 +242,7 @@ static const char *mout_audio1_p[] __initdata = {
|
|||
"mout_vpll",
|
||||
};
|
||||
|
||||
static const char *mout_audio2_p[] __initdata = {
|
||||
static const char *const mout_audio2_p[] __initconst = {
|
||||
"i2scdclk2",
|
||||
"pcmcdclk2",
|
||||
"sclk_hdmi27m",
|
||||
|
@ -254,63 +254,63 @@ static const char *mout_audio2_p[] __initdata = {
|
|||
"mout_vpll",
|
||||
};
|
||||
|
||||
static const char *mout_spdif_p[] __initdata = {
|
||||
static const char *const mout_spdif_p[] __initconst = {
|
||||
"dout_audio0",
|
||||
"dout_audio1",
|
||||
"dout_audio3",
|
||||
};
|
||||
|
||||
static const char *mout_group3_p[] __initdata = {
|
||||
static const char *const mout_group3_p[] __initconst = {
|
||||
"mout_apll",
|
||||
"mout_mpll"
|
||||
};
|
||||
|
||||
static const char *mout_group4_p[] __initdata = {
|
||||
static const char *const mout_group4_p[] __initconst = {
|
||||
"mout_mpll",
|
||||
"dout_a2m"
|
||||
};
|
||||
|
||||
static const char *mout_flash_p[] __initdata = {
|
||||
static const char *const mout_flash_p[] __initconst = {
|
||||
"dout_hclkd",
|
||||
"dout_hclkp"
|
||||
};
|
||||
|
||||
static const char *mout_dac_p[] __initdata = {
|
||||
static const char *const mout_dac_p[] __initconst = {
|
||||
"mout_vpll",
|
||||
"sclk_hdmiphy"
|
||||
};
|
||||
|
||||
static const char *mout_hdmi_p[] __initdata = {
|
||||
static const char *const mout_hdmi_p[] __initconst = {
|
||||
"sclk_hdmiphy",
|
||||
"dout_tblk"
|
||||
};
|
||||
|
||||
static const char *mout_mixer_p[] __initdata = {
|
||||
static const char *const mout_mixer_p[] __initconst = {
|
||||
"mout_dac",
|
||||
"mout_hdmi"
|
||||
};
|
||||
|
||||
static const char *mout_vpll_6442_p[] __initdata = {
|
||||
static const char *const mout_vpll_6442_p[] __initconst = {
|
||||
"fin_pll",
|
||||
"fout_vpll"
|
||||
};
|
||||
|
||||
static const char *mout_mixer_6442_p[] __initdata = {
|
||||
static const char *const mout_mixer_6442_p[] __initconst = {
|
||||
"mout_vpll",
|
||||
"dout_mixer"
|
||||
};
|
||||
|
||||
static const char *mout_d0sync_6442_p[] __initdata = {
|
||||
static const char *const mout_d0sync_6442_p[] __initconst = {
|
||||
"mout_dsys",
|
||||
"div_apll"
|
||||
};
|
||||
|
||||
static const char *mout_d1sync_6442_p[] __initdata = {
|
||||
static const char *const mout_d1sync_6442_p[] __initconst = {
|
||||
"mout_psys",
|
||||
"div_apll"
|
||||
};
|
||||
|
||||
static const char *mout_group2_6442_p[] __initdata = {
|
||||
static const char *const mout_group2_6442_p[] __initconst = {
|
||||
"fin_pll",
|
||||
"none",
|
||||
"none",
|
||||
|
@ -322,7 +322,7 @@ static const char *mout_group2_6442_p[] __initdata = {
|
|||
"mout_vpll",
|
||||
};
|
||||
|
||||
static const char *mout_audio0_6442_p[] __initdata = {
|
||||
static const char *const mout_audio0_6442_p[] __initconst = {
|
||||
"fin_pll",
|
||||
"pcmcdclk0",
|
||||
"none",
|
||||
|
@ -334,7 +334,7 @@ static const char *mout_audio0_6442_p[] __initdata = {
|
|||
"mout_vpll",
|
||||
};
|
||||
|
||||
static const char *mout_audio1_6442_p[] __initdata = {
|
||||
static const char *const mout_audio1_6442_p[] __initconst = {
|
||||
"i2scdclk1",
|
||||
"pcmcdclk1",
|
||||
"none",
|
||||
|
@ -347,7 +347,7 @@ static const char *mout_audio1_6442_p[] __initdata = {
|
|||
"fin_pll",
|
||||
};
|
||||
|
||||
static const char *mout_clksel_p[] __initdata = {
|
||||
static const char *const mout_clksel_p[] __initconst = {
|
||||
"fout_apll_clkout",
|
||||
"fout_mpll_clkout",
|
||||
"fout_epll",
|
||||
|
@ -370,7 +370,7 @@ static const char *mout_clksel_p[] __initdata = {
|
|||
"div_dclk"
|
||||
};
|
||||
|
||||
static const char *mout_clksel_6442_p[] __initdata = {
|
||||
static const char *const mout_clksel_6442_p[] __initconst = {
|
||||
"fout_apll_clkout",
|
||||
"fout_mpll_clkout",
|
||||
"fout_epll",
|
||||
|
@ -393,7 +393,7 @@ static const char *mout_clksel_6442_p[] __initdata = {
|
|||
"div_dclk"
|
||||
};
|
||||
|
||||
static const char *mout_clkout_p[] __initdata = {
|
||||
static const char *const mout_clkout_p[] __initconst = {
|
||||
"dout_clkout",
|
||||
"none",
|
||||
"xxti",
|
||||
|
@ -401,20 +401,20 @@ static const char *mout_clkout_p[] __initdata = {
|
|||
};
|
||||
|
||||
/* Common fixed factor clocks. */
|
||||
static struct samsung_fixed_factor_clock ffactor_clks[] __initdata = {
|
||||
static const struct samsung_fixed_factor_clock ffactor_clks[] __initconst = {
|
||||
FFACTOR(FOUT_APLL_CLKOUT, "fout_apll_clkout", "fout_apll", 1, 4, 0),
|
||||
FFACTOR(FOUT_MPLL_CLKOUT, "fout_mpll_clkout", "fout_mpll", 1, 2, 0),
|
||||
FFACTOR(DOUT_APLL_CLKOUT, "dout_apll_clkout", "dout_apll", 1, 4, 0),
|
||||
};
|
||||
|
||||
/* PLL input mux (fin_pll), which needs to be registered before PLLs. */
|
||||
static struct samsung_mux_clock early_mux_clks[] __initdata = {
|
||||
static const struct samsung_mux_clock early_mux_clks[] __initconst = {
|
||||
MUX_F(FIN_PLL, "fin_pll", fin_pll_p, OM_STAT, 0, 1,
|
||||
CLK_MUX_READ_ONLY, 0),
|
||||
};
|
||||
|
||||
/* Common clock muxes. */
|
||||
static struct samsung_mux_clock mux_clks[] __initdata = {
|
||||
static const struct samsung_mux_clock mux_clks[] __initconst = {
|
||||
MUX(MOUT_FLASH, "mout_flash", mout_flash_p, CLK_SRC0, 28, 1),
|
||||
MUX(MOUT_PSYS, "mout_psys", mout_group4_p, CLK_SRC0, 24, 1),
|
||||
MUX(MOUT_DSYS, "mout_dsys", mout_group4_p, CLK_SRC0, 20, 1),
|
||||
|
@ -427,7 +427,7 @@ static struct samsung_mux_clock mux_clks[] __initdata = {
|
|||
};
|
||||
|
||||
/* S5PV210-specific clock muxes. */
|
||||
static struct samsung_mux_clock s5pv210_mux_clks[] __initdata = {
|
||||
static const struct samsung_mux_clock s5pv210_mux_clks[] __initconst = {
|
||||
MUX(MOUT_VPLL, "mout_vpll", mout_vpll_p, CLK_SRC0, 12, 1),
|
||||
|
||||
MUX(MOUT_VPLLSRC, "mout_vpllsrc", mout_vpllsrc_p, CLK_SRC1, 28, 1),
|
||||
|
@ -472,7 +472,7 @@ static struct samsung_mux_clock s5pv210_mux_clks[] __initdata = {
|
|||
};
|
||||
|
||||
/* S5P6442-specific clock muxes. */
|
||||
static struct samsung_mux_clock s5p6442_mux_clks[] __initdata = {
|
||||
static const struct samsung_mux_clock s5p6442_mux_clks[] __initconst = {
|
||||
MUX(MOUT_VPLL, "mout_vpll", mout_vpll_6442_p, CLK_SRC0, 12, 1),
|
||||
|
||||
MUX(MOUT_FIMD, "mout_fimd", mout_group2_6442_p, CLK_SRC1, 20, 4),
|
||||
|
@ -504,7 +504,7 @@ static struct samsung_mux_clock s5p6442_mux_clks[] __initdata = {
|
|||
};
|
||||
|
||||
/* S5PV210-specific fixed rate clocks generated inside the SoC. */
|
||||
static struct samsung_fixed_rate_clock s5pv210_frate_clks[] __initdata = {
|
||||
static const struct samsung_fixed_rate_clock s5pv210_frate_clks[] __initconst = {
|
||||
FRATE(SCLK_HDMI27M, "sclk_hdmi27m", NULL, CLK_IS_ROOT, 27000000),
|
||||
FRATE(SCLK_HDMIPHY, "sclk_hdmiphy", NULL, CLK_IS_ROOT, 27000000),
|
||||
FRATE(SCLK_USBPHY0, "sclk_usbphy0", NULL, CLK_IS_ROOT, 48000000),
|
||||
|
@ -512,12 +512,12 @@ static struct samsung_fixed_rate_clock s5pv210_frate_clks[] __initdata = {
|
|||
};
|
||||
|
||||
/* S5P6442-specific fixed rate clocks generated inside the SoC. */
|
||||
static struct samsung_fixed_rate_clock s5p6442_frate_clks[] __initdata = {
|
||||
static const struct samsung_fixed_rate_clock s5p6442_frate_clks[] __initconst = {
|
||||
FRATE(SCLK_USBPHY0, "sclk_usbphy0", NULL, CLK_IS_ROOT, 30000000),
|
||||
};
|
||||
|
||||
/* Common clock dividers. */
|
||||
static struct samsung_div_clock div_clks[] __initdata = {
|
||||
static const struct samsung_div_clock div_clks[] __initconst = {
|
||||
DIV(DOUT_PCLKP, "dout_pclkp", "dout_hclkp", CLK_DIV0, 28, 3),
|
||||
DIV(DOUT_PCLKD, "dout_pclkd", "dout_hclkd", CLK_DIV0, 20, 3),
|
||||
DIV(DOUT_A2M, "dout_a2m", "mout_apll", CLK_DIV0, 4, 3),
|
||||
|
@ -549,7 +549,7 @@ static struct samsung_div_clock div_clks[] __initdata = {
|
|||
};
|
||||
|
||||
/* S5PV210-specific clock dividers. */
|
||||
static struct samsung_div_clock s5pv210_div_clks[] __initdata = {
|
||||
static const struct samsung_div_clock s5pv210_div_clks[] __initconst = {
|
||||
DIV(DOUT_HCLKP, "dout_hclkp", "mout_psys", CLK_DIV0, 24, 4),
|
||||
DIV(DOUT_HCLKD, "dout_hclkd", "mout_dsys", CLK_DIV0, 16, 4),
|
||||
DIV(DOUT_PCLKM, "dout_pclkm", "dout_hclkm", CLK_DIV0, 12, 3),
|
||||
|
@ -578,7 +578,7 @@ static struct samsung_div_clock s5pv210_div_clks[] __initdata = {
|
|||
};
|
||||
|
||||
/* S5P6442-specific clock dividers. */
|
||||
static struct samsung_div_clock s5p6442_div_clks[] __initdata = {
|
||||
static const struct samsung_div_clock s5p6442_div_clks[] __initconst = {
|
||||
DIV(DOUT_HCLKP, "dout_hclkp", "mout_d1sync", CLK_DIV0, 24, 4),
|
||||
DIV(DOUT_HCLKD, "dout_hclkd", "mout_d0sync", CLK_DIV0, 16, 4),
|
||||
|
||||
|
@ -586,7 +586,7 @@ static struct samsung_div_clock s5p6442_div_clks[] __initdata = {
|
|||
};
|
||||
|
||||
/* Common clock gates. */
|
||||
static struct samsung_gate_clock gate_clks[] __initdata = {
|
||||
static const struct samsung_gate_clock gate_clks[] __initconst = {
|
||||
GATE(CLK_ROTATOR, "rotator", "dout_hclkd", CLK_GATE_IP0, 29, 0, 0),
|
||||
GATE(CLK_FIMC2, "fimc2", "dout_hclkd", CLK_GATE_IP0, 26, 0, 0),
|
||||
GATE(CLK_FIMC1, "fimc1", "dout_hclkd", CLK_GATE_IP0, 25, 0, 0),
|
||||
|
@ -666,7 +666,7 @@ static struct samsung_gate_clock gate_clks[] __initdata = {
|
|||
};
|
||||
|
||||
/* S5PV210-specific clock gates. */
|
||||
static struct samsung_gate_clock s5pv210_gate_clks[] __initdata = {
|
||||
static const struct samsung_gate_clock s5pv210_gate_clks[] __initconst = {
|
||||
GATE(CLK_CSIS, "clk_csis", "dout_hclkd", CLK_GATE_IP0, 31, 0, 0),
|
||||
GATE(CLK_MFC, "mfc", "dout_hclkm", CLK_GATE_IP0, 16, 0, 0),
|
||||
GATE(CLK_G2D, "g2d", "dout_hclkd", CLK_GATE_IP0, 12, 0, 0),
|
||||
|
@ -728,7 +728,7 @@ static struct samsung_gate_clock s5pv210_gate_clks[] __initdata = {
|
|||
};
|
||||
|
||||
/* S5P6442-specific clock gates. */
|
||||
static struct samsung_gate_clock s5p6442_gate_clks[] __initdata = {
|
||||
static const struct samsung_gate_clock s5p6442_gate_clks[] __initconst = {
|
||||
GATE(CLK_JPEG, "jpeg", "dout_hclkd", CLK_GATE_IP0, 28, 0, 0),
|
||||
GATE(CLK_MFC, "mfc", "dout_hclkd", CLK_GATE_IP0, 16, 0, 0),
|
||||
GATE(CLK_G2D, "g2d", "dout_hclkd", CLK_GATE_IP0, 12, 0, 0),
|
||||
|
@ -748,14 +748,14 @@ static struct samsung_gate_clock s5p6442_gate_clks[] __initdata = {
|
|||
* Clock aliases for legacy clkdev look-up.
|
||||
* NOTE: Needed only to support legacy board files.
|
||||
*/
|
||||
static struct samsung_clock_alias s5pv210_aliases[] = {
|
||||
static const struct samsung_clock_alias s5pv210_aliases[] __initconst = {
|
||||
ALIAS(DOUT_APLL, NULL, "armclk"),
|
||||
ALIAS(DOUT_HCLKM, NULL, "hclk_msys"),
|
||||
ALIAS(MOUT_DMC0, NULL, "sclk_dmc0"),
|
||||
};
|
||||
|
||||
/* S5PV210-specific PLLs. */
|
||||
static struct samsung_pll_clock s5pv210_pll_clks[] __initdata = {
|
||||
static const struct samsung_pll_clock s5pv210_pll_clks[] __initconst = {
|
||||
[apll] = PLL(pll_4508, FOUT_APLL, "fout_apll", "fin_pll",
|
||||
APLL_LOCK, APLL_CON0, NULL),
|
||||
[mpll] = PLL(pll_4502, FOUT_MPLL, "fout_mpll", "fin_pll",
|
||||
|
@ -767,7 +767,7 @@ static struct samsung_pll_clock s5pv210_pll_clks[] __initdata = {
|
|||
};
|
||||
|
||||
/* S5P6442-specific PLLs. */
|
||||
static struct samsung_pll_clock s5p6442_pll_clks[] __initdata = {
|
||||
static const struct samsung_pll_clock s5p6442_pll_clks[] __initconst = {
|
||||
[apll] = PLL(pll_4502, FOUT_APLL, "fout_apll", "fin_pll",
|
||||
APLL_LOCK, APLL_CON0, NULL),
|
||||
[mpll] = PLL(pll_4502, FOUT_MPLL, "fout_mpll", "fin_pll",
|
||||
|
|
|
@ -98,7 +98,7 @@ void samsung_clk_add_lookup(struct samsung_clk_provider *ctx, struct clk *clk,
|
|||
|
||||
/* register a list of aliases */
|
||||
void __init samsung_clk_register_alias(struct samsung_clk_provider *ctx,
|
||||
struct samsung_clock_alias *list,
|
||||
const struct samsung_clock_alias *list,
|
||||
unsigned int nr_clk)
|
||||
{
|
||||
struct clk *clk;
|
||||
|
@ -132,7 +132,8 @@ void __init samsung_clk_register_alias(struct samsung_clk_provider *ctx,
|
|||
|
||||
/* register a list of fixed clocks */
|
||||
void __init samsung_clk_register_fixed_rate(struct samsung_clk_provider *ctx,
|
||||
struct samsung_fixed_rate_clock *list, unsigned int nr_clk)
|
||||
const struct samsung_fixed_rate_clock *list,
|
||||
unsigned int nr_clk)
|
||||
{
|
||||
struct clk *clk;
|
||||
unsigned int idx, ret;
|
||||
|
@ -161,7 +162,7 @@ void __init samsung_clk_register_fixed_rate(struct samsung_clk_provider *ctx,
|
|||
|
||||
/* register a list of fixed factor clocks */
|
||||
void __init samsung_clk_register_fixed_factor(struct samsung_clk_provider *ctx,
|
||||
struct samsung_fixed_factor_clock *list, unsigned int nr_clk)
|
||||
const struct samsung_fixed_factor_clock *list, unsigned int nr_clk)
|
||||
{
|
||||
struct clk *clk;
|
||||
unsigned int idx;
|
||||
|
@ -181,7 +182,7 @@ void __init samsung_clk_register_fixed_factor(struct samsung_clk_provider *ctx,
|
|||
|
||||
/* register a list of mux clocks */
|
||||
void __init samsung_clk_register_mux(struct samsung_clk_provider *ctx,
|
||||
struct samsung_mux_clock *list,
|
||||
const struct samsung_mux_clock *list,
|
||||
unsigned int nr_clk)
|
||||
{
|
||||
struct clk *clk;
|
||||
|
@ -213,7 +214,7 @@ void __init samsung_clk_register_mux(struct samsung_clk_provider *ctx,
|
|||
|
||||
/* register a list of div clocks */
|
||||
void __init samsung_clk_register_div(struct samsung_clk_provider *ctx,
|
||||
struct samsung_div_clock *list,
|
||||
const struct samsung_div_clock *list,
|
||||
unsigned int nr_clk)
|
||||
{
|
||||
struct clk *clk;
|
||||
|
@ -252,7 +253,7 @@ void __init samsung_clk_register_div(struct samsung_clk_provider *ctx,
|
|||
|
||||
/* register a list of gate clocks */
|
||||
void __init samsung_clk_register_gate(struct samsung_clk_provider *ctx,
|
||||
struct samsung_gate_clock *list,
|
||||
const struct samsung_gate_clock *list,
|
||||
unsigned int nr_clk)
|
||||
{
|
||||
struct clk *clk;
|
||||
|
|
|
@ -121,7 +121,7 @@ struct samsung_mux_clock {
|
|||
unsigned int id;
|
||||
const char *dev_name;
|
||||
const char *name;
|
||||
const char **parent_names;
|
||||
const char *const *parent_names;
|
||||
u8 num_parents;
|
||||
unsigned long flags;
|
||||
unsigned long offset;
|
||||
|
@ -368,28 +368,28 @@ extern void __init samsung_clk_of_register_fixed_ext(
|
|||
extern void samsung_clk_add_lookup(struct samsung_clk_provider *ctx,
|
||||
struct clk *clk, unsigned int id);
|
||||
|
||||
extern void samsung_clk_register_alias(struct samsung_clk_provider *ctx,
|
||||
struct samsung_clock_alias *list,
|
||||
extern void __init samsung_clk_register_alias(struct samsung_clk_provider *ctx,
|
||||
const struct samsung_clock_alias *list,
|
||||
unsigned int nr_clk);
|
||||
extern void __init samsung_clk_register_fixed_rate(
|
||||
struct samsung_clk_provider *ctx,
|
||||
struct samsung_fixed_rate_clock *clk_list,
|
||||
const struct samsung_fixed_rate_clock *clk_list,
|
||||
unsigned int nr_clk);
|
||||
extern void __init samsung_clk_register_fixed_factor(
|
||||
struct samsung_clk_provider *ctx,
|
||||
struct samsung_fixed_factor_clock *list,
|
||||
const struct samsung_fixed_factor_clock *list,
|
||||
unsigned int nr_clk);
|
||||
extern void __init samsung_clk_register_mux(struct samsung_clk_provider *ctx,
|
||||
struct samsung_mux_clock *clk_list,
|
||||
const struct samsung_mux_clock *clk_list,
|
||||
unsigned int nr_clk);
|
||||
extern void __init samsung_clk_register_div(struct samsung_clk_provider *ctx,
|
||||
struct samsung_div_clock *clk_list,
|
||||
const struct samsung_div_clock *clk_list,
|
||||
unsigned int nr_clk);
|
||||
extern void __init samsung_clk_register_gate(struct samsung_clk_provider *ctx,
|
||||
struct samsung_gate_clock *clk_list,
|
||||
const struct samsung_gate_clock *clk_list,
|
||||
unsigned int nr_clk);
|
||||
extern void __init samsung_clk_register_pll(struct samsung_clk_provider *ctx,
|
||||
struct samsung_pll_clock *pll_list,
|
||||
const struct samsung_pll_clock *pll_list,
|
||||
unsigned int nr_clk, void __iomem *base);
|
||||
|
||||
extern struct samsung_clk_provider __init *samsung_cmu_register_one(
|
||||
|
|
|
@ -85,22 +85,29 @@ static DEFINE_SPINLOCK(canmioclk_lock);
|
|||
static DEFINE_SPINLOCK(dbgclk_lock);
|
||||
static DEFINE_SPINLOCK(aperclk_lock);
|
||||
|
||||
static const char *armpll_parents[] __initdata = {"armpll_int", "ps_clk"};
|
||||
static const char *ddrpll_parents[] __initdata = {"ddrpll_int", "ps_clk"};
|
||||
static const char *iopll_parents[] __initdata = {"iopll_int", "ps_clk"};
|
||||
static const char *const armpll_parents[] __initconst = {"armpll_int",
|
||||
"ps_clk"};
|
||||
static const char *const ddrpll_parents[] __initconst = {"ddrpll_int",
|
||||
"ps_clk"};
|
||||
static const char *const iopll_parents[] __initconst = {"iopll_int",
|
||||
"ps_clk"};
|
||||
static const char *gem0_mux_parents[] __initdata = {"gem0_div1", "dummy_name"};
|
||||
static const char *gem1_mux_parents[] __initdata = {"gem1_div1", "dummy_name"};
|
||||
static const char *can0_mio_mux2_parents[] __initdata = {"can0_gate",
|
||||
static const char *const can0_mio_mux2_parents[] __initconst = {"can0_gate",
|
||||
"can0_mio_mux"};
|
||||
static const char *can1_mio_mux2_parents[] __initdata = {"can1_gate",
|
||||
static const char *const can1_mio_mux2_parents[] __initconst = {"can1_gate",
|
||||
"can1_mio_mux"};
|
||||
static const char *dbg_emio_mux_parents[] __initdata = {"dbg_div",
|
||||
"dummy_name"};
|
||||
|
||||
static const char *dbgtrc_emio_input_names[] __initdata = {"trace_emio_clk"};
|
||||
static const char *gem0_emio_input_names[] __initdata = {"gem0_emio_clk"};
|
||||
static const char *gem1_emio_input_names[] __initdata = {"gem1_emio_clk"};
|
||||
static const char *swdt_ext_clk_input_names[] __initdata = {"swdt_ext_clk"};
|
||||
static const char *const dbgtrc_emio_input_names[] __initconst = {
|
||||
"trace_emio_clk"};
|
||||
static const char *const gem0_emio_input_names[] __initconst = {
|
||||
"gem0_emio_clk"};
|
||||
static const char *const gem1_emio_input_names[] __initconst = {
|
||||
"gem1_emio_clk"};
|
||||
static const char *const swdt_ext_clk_input_names[] __initconst = {
|
||||
"swdt_ext_clk"};
|
||||
|
||||
static void __init zynq_clk_register_fclk(enum zynq_clk fclk,
|
||||
const char *clk_name, void __iomem *fclk_ctrl_reg,
|
||||
|
|
Loading…
Reference in New Issue