.dvfs_rail = &tegra11_dvfs_rail_vdd_cpu,
};
-static struct tegra_cl_dvfs_soc_data cpu_dfll_data = {
+static struct tegra_cl_dvfs_dfll_data cpu_dfll_data = {
.dfll_clk_name = "dfll_cpu",
.tune0 = 0x030201,
.tune1 = 0x000BB0AA,
- .dfll_droop_rate_min = 640000000,
+ .droop_rate_min = 640000000,
};
/* Core DVFS tables */
}
static int __init get_cpu_nominal_mv_index(int speedo_id,
- struct dvfs *cpu_dvfs, struct tegra_cl_dvfs_soc_data *dfll_data)
+ struct dvfs *cpu_dvfs, struct tegra_cl_dvfs_dfll_data *dfll_data)
{
int i, j, mv, dfll_mv;
unsigned long fmax_at_vmin = 0;
}
cpu_dvfs->speedo_id = speedo_id;
- dfll_data->dfll_out_rate_min = fmax_at_vmin * MHZ;
- dfll_data->dfll_millivolts_min = d->min_mv;
+ dfll_data->out_rate_min = fmax_at_vmin * MHZ;
+ dfll_data->millivolts_min = d->min_mv;
return j - 1;
}
init_dvfs_one(&cpu_dvfs, cpu_nominal_mv_index);
/* CL DVFS characterization data */
- tegra_cl_dvfs_set_soc_data(&cpu_dfll_data);
+ tegra_cl_dvfs_set_dfll_data(&cpu_dfll_data);
/* Finally disable dvfs on rails if necessary */
if (tegra_dvfs_core_disabled)
millivolts = cld->safe_dvfs->dfll_millivolts;
v_max = millivolts[n - 1];
- v = cld->soc_data->dfll_millivolts_min;
+ v = cld->dfll_data->millivolts_min;
BUG_ON(v > millivolts[0]);
cld->out_map[0] = find_vdd_map_entry(cld, v, true);
(param->cg_scale ? CL_DVFS_PARAMS_CG_SCALE : 0);
cl_dvfs_writel(cld, val, CL_DVFS_PARAMS);
- cl_dvfs_writel(cld, cld->soc_data->tune0, CL_DVFS_TUNE0);
- cl_dvfs_writel(cld, cld->soc_data->tune1, CL_DVFS_TUNE1);
+ cl_dvfs_writel(cld, cld->dfll_data->tune0, CL_DVFS_TUNE0);
+ cl_dvfs_writel(cld, cld->dfll_data->tune1, CL_DVFS_TUNE1);
/* configure droop (skipper 1) and scale (skipper 2) */
- val = GET_DROOP_FREQ(cld->soc_data->dfll_droop_rate_min, cld->ref_rate);
+ val = GET_DROOP_FREQ(cld->dfll_data->droop_rate_min, cld->ref_rate);
val <<= CL_DVFS_DROOP_CTRL_MIN_FREQ_SHIFT;
BUG_ON(val > CL_DVFS_DROOP_CTRL_MIN_FREQ_MASK);
val |= (param->droop_cut_value << CL_DVFS_DROOP_CTRL_CUT_SHIFT);
cl_dvfs_writel(cld, val, CL_DVFS_DROOP_CTRL);
/* round minimum rate to request unit (ref_rate/2) boundary */
- cld->dfll_rate_min = cld->soc_data->dfll_out_rate_min;
+ cld->dfll_rate_min = cld->dfll_data->out_rate_min;
cld->dfll_rate_min = ROUND_MIN_RATE(cld->dfll_rate_min, cld->ref_rate);
cld->last_req.freq = 0;
int ret;
/* Check platform and SoC data, get i2c clock */
- if (!cld->soc_data) {
+ if (!cld->dfll_data) {
pr_err("%s: SoC tuning data is not available\n", __func__);
return -EINVAL;
}
c->u.dfll.cl_dvfs->p_data = data;
}
-void tegra_cl_dvfs_set_soc_data(struct tegra_cl_dvfs_soc_data *data)
+void tegra_cl_dvfs_set_dfll_data(struct tegra_cl_dvfs_dfll_data *data)
{
struct clk *c = tegra_get_clock_by_name(data->dfll_clk_name);
if (c && c->u.dfll.cl_dvfs)
- c->u.dfll.cl_dvfs->soc_data = data;
+ c->u.dfll.cl_dvfs->dfll_data = data;
}
/*
struct tegra_cl_dvfs_cfg_param *cfg_param;
};
-struct tegra_cl_dvfs_soc_data {
+struct tegra_cl_dvfs_dfll_data {
const char *dfll_clk_name;
u32 tune0;
u32 tune1;
- unsigned long dfll_droop_rate_min;
- unsigned long dfll_out_rate_min;
- int dfll_millivolts_min;
+ unsigned long droop_rate_min;
+ unsigned long out_rate_min;
+ int millivolts_min;
};
struct dfll_rate_req {
struct tegra_cl_dvfs {
u32 cl_base;
- struct tegra_cl_dvfs_soc_data *soc_data;
+ struct tegra_cl_dvfs_dfll_data *dfll_data;
struct tegra_cl_dvfs_platform_data *p_data;
struct dvfs *safe_dvfs;
#ifdef CONFIG_ARCH_TEGRA_HAS_CL_DVFS
void tegra_cl_dvfs_set_plarform_data(struct tegra_cl_dvfs_platform_data *data);
-void tegra_cl_dvfs_set_soc_data(struct tegra_cl_dvfs_soc_data *data);
+void tegra_cl_dvfs_set_dfll_data(struct tegra_cl_dvfs_dfll_data *data);
int tegra_init_cl_dvfs(struct tegra_cl_dvfs *cld);
void tegra_cl_dvfs_disable(struct tegra_cl_dvfs *cld);
static inline void tegra_cl_dvfs_set_plarform_data(
struct tegra_cl_dvfs_platform_data *data)
{}
-static inline void tegra_cl_dvfs_set_soc_data(
- struct tegra_cl_dvfs_soc_data *data)
+static inline void tegra_cl_dvfs_set_dfll_data(
+ struct tegra_cl_dvfs_dfll_data *data)
{}
static inline int tegra_init_cl_dvfs(struct tegra_cl_dvfs *cld)
{ return -ENOSYS; }