On 17-06-2013 02:46, Amit Daniel Kachhap wrote: > TMU probe function now checks for a device tree defined regulator. > For compatibility reasons it is allowed to probe driver even without > this regulator defined. > > Acked-by: Jonghwa Lee <jonghwa3....@samsung.com> > Signed-off-by: Lukasz Majewski <l.majew...@samsung.com> > Signed-off-by: Kyungmin Park <kyungmin.p...@samsung.com> > Signed-off-by: Amit Daniel Kachhap <amit.dan...@samsung.com>
Acked-by: Eduardo Valentin <eduardo.valen...@ti.com>
> ---
> .../devicetree/bindings/thermal/exynos-thermal.txt | 4 +++
> drivers/thermal/samsung/exynos_tmu.c | 23
> ++++++++++++++++++++
> 2 files changed, 27 insertions(+), 0 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/thermal/exynos-thermal.txt
> b/Documentation/devicetree/bindings/thermal/exynos-thermal.txt
> index e6386ea..284f530 100644
> --- a/Documentation/devicetree/bindings/thermal/exynos-thermal.txt
> +++ b/Documentation/devicetree/bindings/thermal/exynos-thermal.txt
> @@ -16,6 +16,9 @@
> - interrupts : Should contain interrupt for thermal system
> - clocks : The main clock for TMU device
> - clock-names : Thermal system clock name
> +- vtmu-supply: This entry is optional and provides the regulator node
> supplying
> + voltage to TMU. If needed this entry can be placed inside
> + board/platform specific dts file.
>
> Example 1):
>
> @@ -27,6 +30,7 @@ Example 1):
> clocks = <&clock 383>;
> clock-names = "tmu_apbif";
> status = "disabled";
> + vtmu-supply = <&tmu_regulator_node>;
> };
>
> Example 2):
> diff --git a/drivers/thermal/samsung/exynos_tmu.c
> b/drivers/thermal/samsung/exynos_tmu.c
> index 7a259f4..441efd5 100644
> --- a/drivers/thermal/samsung/exynos_tmu.c
> +++ b/drivers/thermal/samsung/exynos_tmu.c
> @@ -29,6 +29,7 @@
> #include <linux/of_address.h>
> #include <linux/of_irq.h>
> #include <linux/platform_device.h>
> +#include <linux/regulator/consumer.h>
>
> #include "exynos_thermal_common.h"
> #include "exynos_tmu.h"
> @@ -48,6 +49,7 @@
> * @clk: pointer to the clock structure.
> * @temp_error1: fused value of the first point trim.
> * @temp_error2: fused value of the second point trim.
> + * @regulator: pointer to the TMU regulator structure.
> * @reg_conf: pointer to structure to register with core thermal.
> */
> struct exynos_tmu_data {
> @@ -61,6 +63,7 @@ struct exynos_tmu_data {
> struct mutex lock;
> struct clk *clk;
> u8 temp_error1, temp_error2;
> + struct regulator *regulator;
> struct thermal_sensor_conf *reg_conf;
> };
>
> @@ -510,10 +513,27 @@ static int exynos_map_dt_data(struct platform_device
> *pdev)
> struct exynos_tmu_data *data = platform_get_drvdata(pdev);
> struct exynos_tmu_platform_data *pdata;
> struct resource res;
> + int ret;
>
> if (!data)
> return -ENODEV;
>
> + /*
> + * Try enabling the regulator if found
> + * TODO: Add regulator as an SOC feature, so that regulator enable
> + * is a compulsory call.
> + */
> + data->regulator = devm_regulator_get(&pdev->dev, "vtmu");
> + if (!IS_ERR(data->regulator)) {
> + ret = regulator_enable(data->regulator);
> + if (ret) {
> + dev_err(&pdev->dev, "failed to enable vtmu\n");
> + return ret;
> + }
> + } else {
> + dev_info(&pdev->dev, "Regulator node (vtmu) not found\n");
> + }
> +
> data->id = of_alias_get_id(pdev->dev.of_node, "tmuctrl");
> if (data->id < 0)
> data->id = 0;
> @@ -680,6 +700,9 @@ static int exynos_tmu_remove(struct platform_device *pdev)
>
> clk_unprepare(data->clk);
>
> + if (!IS_ERR(data->regulator))
> + regulator_disable(data->regulator);
> +
> return 0;
> }
>
>
--
You have got to be excited about what you are doing. (L. Lamport)
Eduardo Valentin
signature.asc
Description: OpenPGP digital signature
