Merge branch 'opp/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm

  frequency for a short duration of time limited by the device's power, current

  and thermal limits.

- opp-suspend: Marks the OPP to be used during device suspend. Only one OPP in

  the table should have this.

- opp-suspend: Marks the OPP to be used during device suspend. If multiple OPPs

  in the table have this, the OPP with highest opp-hz will be used.

- opp-supported-hw: This enables us to select only a subset of OPPs from the

  larger OPP table, based on what version of the hardware we are running on. We

Qualcomm Technologies, Inc. KRYO CPUFreq and OPP bindings

Qualcomm Technologies, Inc. NVMEM CPUFreq and OPP bindings

===================================

In Certain Qualcomm Technologies, Inc. SoCs like apq8096 and msm8996

that have KRYO processors, the CPU ferequencies subset and voltage value

of each OPP varies based on the silicon variant in use.

In Certain Qualcomm Technologies, Inc. SoCs like apq8096 and msm8996,

the CPU frequencies subset and voltage value of each OPP varies based on

the silicon variant in use.

Qualcomm Technologies, Inc. Process Voltage Scaling Tables

defines the voltage and frequency value based on the msm-id in SMEM

and speedbin blown in the efuse combination.

The qcom-cpufreq-kryo driver reads the msm-id and efuse value from the SoC

The qcom-cpufreq-nvmem driver reads the msm-id and efuse value from the SoC

to provide the OPP framework with required information (existing HW bitmap).

This is used to determine the voltage and frequency value for each OPP of

operating-points-v2 table when it is parsed by the OPP framework.

Required properties:

--------------------

In 'cpus' nodes:

In 'cpu' nodes:

- operating-points-v2: Phandle to the operating-points-v2 table to use.

In 'operating-points-v2' table:

- compatible: Should be

	- 'operating-points-v2-kryo-cpu' for apq8096 and msm8996.

Optional properties:

--------------------

In 'cpu' nodes:

- power-domains: A phandle pointing to the PM domain specifier which provides

		the performance states available for active state management.

		Please refer to the power-domains bindings

		Documentation/devicetree/bindings/power/power_domain.txt

		and also examples below.

- power-domain-names: Should be

	- 'cpr' for qcs404.

In 'operating-points-v2' table:

- nvmem-cells: A phandle pointing to a nvmem-cells node representing the

		efuse registers that has information about the

		speedbin that is used to select the right frequency/voltage

		};

	};

};

Example 2:

---------

	cpus {

		#address-cells = <1>;

		#size-cells = <0>;

		CPU0: cpu@100 {

			device_type = "cpu";

			compatible = "arm,cortex-a53";

			reg = <0x100>;

			....

			clocks = <&apcs_glb>;

			operating-points-v2 = <&cpu_opp_table>;

			power-domains = <&cpr>;

			power-domain-names = "cpr";

		};

		CPU1: cpu@101 {

			device_type = "cpu";

			compatible = "arm,cortex-a53";

			reg = <0x101>;

			....

			clocks = <&apcs_glb>;

			operating-points-v2 = <&cpu_opp_table>;

			power-domains = <&cpr>;

			power-domain-names = "cpr";

		};

		CPU2: cpu@102 {

			device_type = "cpu";

			compatible = "arm,cortex-a53";

			reg = <0x102>;

			....

			clocks = <&apcs_glb>;

			operating-points-v2 = <&cpu_opp_table>;

			power-domains = <&cpr>;

			power-domain-names = "cpr";

		};

		CPU3: cpu@103 {

			device_type = "cpu";

			compatible = "arm,cortex-a53";

			reg = <0x103>;

			....

			clocks = <&apcs_glb>;

			operating-points-v2 = <&cpu_opp_table>;

			power-domains = <&cpr>;

			power-domain-names = "cpr";

		};

	};

	cpu_opp_table: cpu-opp-table {

		compatible = "operating-points-v2-kryo-cpu";

		opp-shared;

		opp-1094400000 {

			opp-hz = /bits/ 64 <1094400000>;

			required-opps = <&cpr_opp1>;

		};

		opp-1248000000 {

			opp-hz = /bits/ 64 <1248000000>;

			required-opps = <&cpr_opp2>;

		};

		opp-1401600000 {

			opp-hz = /bits/ 64 <1401600000>;

			required-opps = <&cpr_opp3>;

		};

	};

	cpr_opp_table: cpr-opp-table {

		compatible = "operating-points-v2-qcom-level";

		cpr_opp1: opp1 {

			opp-level = <1>;

			qcom,opp-fuse-level = <1>;

		};

		cpr_opp2: opp2 {

			opp-level = <2>;

			qcom,opp-fuse-level = <2>;

		};

		cpr_opp3: opp3 {

			opp-level = <3>;

			qcom,opp-fuse-level = <3>;

		};

	};

....

soc {

....

	cpr: power-controller@b018000 {

		compatible = "qcom,qcs404-cpr", "qcom,cpr";

		reg = <0x0b018000 0x1000>;

		....

		vdd-apc-supply = <&pms405_s3>;

		#power-domain-cells = <0>;

		operating-points-v2 = <&cpr_opp_table>;

		....

	};

};

Qualcomm OPP bindings to describe OPP nodes

The bindings are based on top of the operating-points-v2 bindings

described in Documentation/devicetree/bindings/opp/opp.txt

Additional properties are described below.

* OPP Table Node

Required properties:

- compatible: Allow OPPs to express their compatibility. It should be:

  "operating-points-v2-qcom-level"

* OPP Node

Required properties:

- qcom,opp-fuse-level: A positive value representing the fuse corner/level

  associated with this OPP node. Sometimes several corners/levels shares

  a certain fuse corner/level. A fuse corner/level contains e.g. ref uV,

  min uV, and max uV.

----------------------------------------

OPP library provides a set of helper functions to organize and query the OPP

information. The library is located in drivers/base/power/opp.c and the header

information. The library is located in drivers/opp/ directory and the header

is located in include/linux/pm_opp.h. OPP library can be enabled by enabling

CONFIG_PM_OPP from power management menuconfig menu. OPP library depends on

CONFIG_PM as certain SoCs such as Texas Instrument's OMAP framework allows to

}

EXPORT_SYMBOL_GPL(dev_pm_opp_find_freq_exact);

/**

 * dev_pm_opp_find_level_exact() - search for an exact level

 * @dev:		device for which we do this operation

 * @level:		level to search for

 *

 * Return: Searches for exact match in the opp table and returns pointer to the

 * matching opp if found, else returns ERR_PTR in case of error and should

 * be handled using IS_ERR. Error return values can be:

 * EINVAL:	for bad pointer

 * ERANGE:	no match found for search

 * ENODEV:	if device not found in list of registered devices

 *

 * The callers are required to call dev_pm_opp_put() for the returned OPP after

 * use.

 */

struct dev_pm_opp *dev_pm_opp_find_level_exact(struct device *dev,

					       unsigned int level)

{

	struct opp_table *opp_table;

	struct dev_pm_opp *temp_opp, *opp = ERR_PTR(-ERANGE);

	opp_table = _find_opp_table(dev);

	if (IS_ERR(opp_table)) {

		int r = PTR_ERR(opp_table);

		dev_err(dev, "%s: OPP table not found (%d)\n", __func__, r);

		return ERR_PTR(r);

	}

	mutex_lock(&opp_table->lock);

	list_for_each_entry(temp_opp, &opp_table->opp_list, node) {

		if (temp_opp->level == level) {

			opp = temp_opp;

			/* Increment the reference count of OPP */

			dev_pm_opp_get(opp);

			break;

		}

	}

	mutex_unlock(&opp_table->lock);

	dev_pm_opp_put_opp_table(opp_table);

	return opp;

}

EXPORT_SYMBOL_GPL(dev_pm_opp_find_level_exact);

static noinline struct dev_pm_opp *_find_freq_ceil(struct opp_table *opp_table,

						   unsigned long *freq)

{

	BLOCKING_INIT_NOTIFIER_HEAD(&opp_table->head);

	INIT_LIST_HEAD(&opp_table->opp_list);

	kref_init(&opp_table->kref);

	kref_init(&opp_table->list_kref);

	/* Secure the device table modification */

	list_add(&opp_table->node, &opp_tables);

			goto free_regulators;

		}

		ret = regulator_enable(reg);

		if (ret < 0) {

			regulator_put(reg);

			goto free_regulators;

		}

		opp_table->regulators[i] = reg;

	}

	return opp_table;

free_regulators:

	while (i != 0)

		regulator_put(opp_table->regulators[--i]);

	while (i--) {

		regulator_disable(opp_table->regulators[i]);

		regulator_put(opp_table->regulators[i]);

	}

	kfree(opp_table->regulators);

	opp_table->regulators = NULL;

	/* Make sure there are no concurrent readers while updating opp_table */

	WARN_ON(!list_empty(&opp_table->opp_list));

	for (i = opp_table->regulator_count - 1; i >= 0; i--)

	for (i = opp_table->regulator_count - 1; i >= 0; i--) {

		regulator_disable(opp_table->regulators[i]);

		regulator_put(opp_table->regulators[i]);

	}

	_free_set_opp_data(opp_table);

 * dev_pm_opp_attach_genpd - Attach genpd(s) for the device and save virtual device pointer

 * @dev: Consumer device for which the genpd is getting attached.

 * @names: Null terminated array of pointers containing names of genpd to attach.

 * @virt_devs: Pointer to return the array of virtual devices.

 *

 * Multiple generic power domains for a device are supported with the help of

 * virtual genpd devices, which are created for each consumer device - genpd

 *

 * This helper needs to be called once with a list of all genpd to attach.

 * Otherwise the original device structure will be used instead by the OPP core.

 *

 * The order of entries in the names array must match the order in which

 * "required-opps" are added in DT.

 */

struct opp_table *dev_pm_opp_attach_genpd(struct device *dev, const char **names)

struct opp_table *dev_pm_opp_attach_genpd(struct device *dev,

		const char **names, struct device ***virt_devs)

{

	struct opp_table *opp_table;

	struct device *virt_dev;

	int index, ret = -EINVAL;

	int index = 0, ret = -EINVAL;

	const char **name = names;

	opp_table = dev_pm_opp_get_opp_table(dev);

		goto unlock;

	while (*name) {

		index = of_property_match_string(dev->of_node,

						 "power-domain-names", *name);

		if (index < 0) {

			dev_err(dev, "Failed to find power domain: %s (%d)\n",

				*name, index);

			goto err;

		}

		if (index >= opp_table->required_opp_count) {

			dev_err(dev, "Index can't be greater than required-opp-count - 1, %s (%d : %d)\n",

				*name, opp_table->required_opp_count, index);

		}

		opp_table->genpd_virt_devs[index] = virt_dev;

		index++;

		name++;

	}

	if (virt_devs)

		*virt_devs = opp_table->genpd_virt_devs;

	mutex_unlock(&opp_table->genpd_virt_dev_lock);

	return opp_table;