Commit 6b612d1b authored by Dhruva Gole's avatar Dhruva Gole Committed by Viresh Kumar
Browse files

cpufreq: ti-cpufreq: Use socinfo to get revision in AM62 family 



In the AM62x, AM62Ax, and AM62Px devices, we already have the revision
info within the k3-socinfo driver. Hence, re-use this information from
there instead of re using the offset for 2 drivers trying to get the
same information ie. revision.

Signed-off-by: default avatarDhruva Gole <d-gole@ti.com>
Signed-off-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
parent 87fa4bd3

drivers/cpufreq/ti-cpufreq.c

+19 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
#include <linux/pm_opp.h>

#include <linux/regmap.h>

#include <linux/slab.h>

#include <linux/sys_soc.h>



#define REVISION_MASK				0xF

#define REVISION_SHIFT				28
@@ -303,6 +304,13 @@ static struct ti_cpufreq_soc_data am3517_soc_data = { 
	.quirks = TI_QUIRK_SYSCON_MAY_BE_MISSING,

};



static const struct soc_device_attribute k3_cpufreq_soc[] = {

	{ .family = "AM62X", .revision = "SR1.0" },

	{ .family = "AM62AX", .revision = "SR1.0" },

	{ .family = "AM62PX", .revision = "SR1.0" },

	{ /* sentinel */ }

};



static struct ti_cpufreq_soc_data am625_soc_data = {

	.efuse_xlate = am625_efuse_xlate,

	.efuse_offset = 0x0018,
@@ -384,6 +392,16 @@ static int ti_cpufreq_get_rev(struct ti_cpufreq_data *opp_data, 
	struct device *dev = opp_data->cpu_dev;

	u32 revision;

	int ret;

	if (soc_device_match(k3_cpufreq_soc)) {

		/*

		 * Since the SR is 1.0, hard code the revision_value as

		 * 0x1 here. This way we avoid re using the same register

		 * that is giving us required information inside socinfo

		 * anyway.

		 */

		*revision_value = 0x1;

		goto done;

	}



	ret = regmap_read(opp_data->syscon, opp_data->soc_data->rev_offset,

			  &revision);
@@ -406,6 +424,7 @@ static int ti_cpufreq_get_rev(struct ti_cpufreq_data *opp_data, 


	*revision_value = BIT((revision >> REVISION_SHIFT) & REVISION_MASK);



done:

	return 0;

}