diff options
Diffstat (limited to 'drivers/cpufreq/qcom-cpufreq-hw.c')
| -rw-r--r-- | drivers/cpufreq/qcom-cpufreq-hw.c | 22 | 
1 files changed, 20 insertions, 2 deletions
| diff --git a/drivers/cpufreq/qcom-cpufreq-hw.c b/drivers/cpufreq/qcom-cpufreq-hw.c index 340fed35e45d..9505a812d6a1 100644 --- a/drivers/cpufreq/qcom-cpufreq-hw.c +++ b/drivers/cpufreq/qcom-cpufreq-hw.c @@ -649,9 +649,10 @@ static int qcom_cpufreq_hw_driver_probe(struct platform_device *pdev)  {  	struct clk_hw_onecell_data *clk_data;  	struct device *dev = &pdev->dev; +	struct device_node *soc_node;  	struct device *cpu_dev;  	struct clk *clk; -	int ret, i, num_domains; +	int ret, i, num_domains, reg_sz;  	clk = clk_get(dev, "xo");  	if (IS_ERR(clk)) @@ -679,7 +680,21 @@ static int qcom_cpufreq_hw_driver_probe(struct platform_device *pdev)  		return ret;  	/* Allocate qcom_cpufreq_data based on the available frequency domains in DT */ -	num_domains = of_property_count_elems_of_size(dev->of_node, "reg", sizeof(u32) * 4); +	soc_node = of_get_parent(dev->of_node); +	if (!soc_node) +		return -EINVAL; + +	ret = of_property_read_u32(soc_node, "#address-cells", ®_sz); +	if (ret) +		goto of_exit; + +	ret = of_property_read_u32(soc_node, "#size-cells", &i); +	if (ret) +		goto of_exit; + +	reg_sz += i; + +	num_domains = of_property_count_elems_of_size(dev->of_node, "reg", sizeof(u32) * reg_sz);  	if (num_domains <= 0)  		return num_domains; @@ -743,6 +758,9 @@ static int qcom_cpufreq_hw_driver_probe(struct platform_device *pdev)  	else  		dev_dbg(dev, "QCOM CPUFreq HW driver initialized\n"); +of_exit: +	of_node_put(soc_node); +  	return ret;  } |