Commit c8343e83 authored by Dave Gerlach's avatar Dave Gerlach Committed by Rafael J. Wysocki
Browse files

cpufreq: ti-cpufreq: Add support for multiple regulators 



Some platforms, like those in the DRA7 and AM57 families, require the
scaling of multiple regulators in order to properly support higher OPPs.
Let the ti-cpufreq driver determine when this is required and pass the
appropriate regulator names to the OPP core so that they can be properly
managed.

Acked-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: default avatarDave Gerlach <d-gerlach@ti.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent db410b2b

drivers/cpufreq/ti-cpufreq.c

+24 −4
Original line number Original line Diff line number Diff line
@@ -51,6 +51,7 @@ struct ti_cpufreq_soc_data { 
	unsigned long efuse_mask;

	unsigned long efuse_mask;

	unsigned long efuse_shift;

	unsigned long efuse_shift;

	unsigned long rev_offset;

	unsigned long rev_offset;

	bool multi_regulator;

};

};





struct ti_cpufreq_data {

struct ti_cpufreq_data {
@@ -58,6 +59,7 @@ struct ti_cpufreq_data { 
	struct device_node *opp_node;

	struct device_node *opp_node;

	struct regmap *syscon;

	struct regmap *syscon;

	const struct ti_cpufreq_soc_data *soc_data;

	const struct ti_cpufreq_soc_data *soc_data;

	struct opp_table *opp_table;

};

};





static unsigned long amx3_efuse_xlate(struct ti_cpufreq_data *opp_data,

static unsigned long amx3_efuse_xlate(struct ti_cpufreq_data *opp_data,
@@ -96,6 +98,7 @@ static struct ti_cpufreq_soc_data am3x_soc_data = { 
	.efuse_offset = 0x07fc,

	.efuse_offset = 0x07fc,

	.efuse_mask = 0x1fff,

	.efuse_mask = 0x1fff,

	.rev_offset = 0x600,

	.rev_offset = 0x600,

	.multi_regulator = false,

};

};





static struct ti_cpufreq_soc_data am4x_soc_data = {

static struct ti_cpufreq_soc_data am4x_soc_data = {
@@ -104,6 +107,7 @@ static struct ti_cpufreq_soc_data am4x_soc_data = { 
	.efuse_offset = 0x0610,

	.efuse_offset = 0x0610,

	.efuse_mask = 0x3f,

	.efuse_mask = 0x3f,

	.rev_offset = 0x600,

	.rev_offset = 0x600,

	.multi_regulator = false,

};

};





static struct ti_cpufreq_soc_data dra7_soc_data = {

static struct ti_cpufreq_soc_data dra7_soc_data = {
@@ -112,6 +116,7 @@ static struct ti_cpufreq_soc_data dra7_soc_data = { 
	.efuse_mask = 0xf80000,

	.efuse_mask = 0xf80000,

	.efuse_shift = 19,

	.efuse_shift = 19,

	.rev_offset = 0x204,

	.rev_offset = 0x204,

	.multi_regulator = true,

};

};





/**

/**
@@ -201,7 +206,9 @@ static int ti_cpufreq_probe(struct platform_device *pdev) 
	u32 version[VERSION_COUNT];

	u32 version[VERSION_COUNT];

	struct device_node *np;

	struct device_node *np;

	const struct of_device_id *match;

	const struct of_device_id *match;

	struct opp_table *ti_opp_table;

	struct ti_cpufreq_data *opp_data;

	struct ti_cpufreq_data *opp_data;

	const char * const reg_names[] = {"vdd", "vbb"};

	int ret;

	int ret;





	np = of_find_node_by_path("/");

	np = of_find_node_by_path("/");
@@ -248,16 +255,29 @@ static int ti_cpufreq_probe(struct platform_device *pdev) 
	if (ret)

	if (ret)

		goto fail_put_node;

		goto fail_put_node;





	ret = PTR_ERR_OR_ZERO(dev_pm_opp_set_supported_hw(opp_data->cpu_dev,

	ti_opp_table = dev_pm_opp_set_supported_hw(opp_data->cpu_dev,

							  version, VERSION_COUNT));

						   version, VERSION_COUNT);

	if (ret) {

	if (IS_ERR(ti_opp_table)) {

		dev_err(opp_data->cpu_dev,

		dev_err(opp_data->cpu_dev,

			"Failed to set supported hardware\n");

			"Failed to set supported hardware\n");

		ret = PTR_ERR(ti_opp_table);

		goto fail_put_node;

		goto fail_put_node;

	}

	}





	of_node_put(opp_data->opp_node);

	opp_data->opp_table = ti_opp_table;





	if (opp_data->soc_data->multi_regulator) {

		ti_opp_table = dev_pm_opp_set_regulators(opp_data->cpu_dev,

							 reg_names,

							 ARRAY_SIZE(reg_names));

		if (IS_ERR(ti_opp_table)) {

			dev_pm_opp_put_supported_hw(opp_data->opp_table);

			ret =  PTR_ERR(ti_opp_table);

			goto fail_put_node;

		}

	}



	of_node_put(opp_data->opp_node);

register_cpufreq_dt:

register_cpufreq_dt:

	platform_device_register_simple("cpufreq-dt", -1, NULL, 0);

	platform_device_register_simple("cpufreq-dt", -1, NULL, 0);

CRA Git | Maintained and supported by SUSTech CRA and CCSE