From patchwork Tue May 7 13:01:10 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amit Kachhap X-Patchwork-Id: 2533271 Return-Path: X-Original-To: patchwork-linux-samsung-soc@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id B40B0E014A for ; Tue, 7 May 2013 13:04:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932747Ab3EGNDN (ORCPT ); Tue, 7 May 2013 09:03:13 -0400 Received: from mail-pa0-f44.google.com ([209.85.220.44]:56138 "EHLO mail-pa0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932511Ab3EGNDL (ORCPT ); Tue, 7 May 2013 09:03:11 -0400 Received: by mail-pa0-f44.google.com with SMTP id jh10so484252pab.3 for ; Tue, 07 May 2013 06:03:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:sender:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references; bh=wl2hQm76e9WCWZgVueZfoE2dybms9TQ8OQUko43Q9as=; b=JlHgcxUIYzJnVLhhTXIVCV7XbhG5Zf2GMTQoEOIqiqh67TH+6ad43jlc3PleHC/Qon ZHLTF0xMJNKXFGhldDFfls6a9J5o1j8v3p60xYI0MVySEnn+xA8yfy/0mvYqRYDTQ3S1 goEmzbn0oa0oZOO1oM/YzVeKekefD19B+q2f9OGC57farFv5MCf+xfJTr3GOUK8YFuaU EIU0alD4Fe9ybpByp05n/t0H1619iPC+WvCp4A5ymbaDCb6Rzo2m5eavUIHzm8eOYxM6 YPm58iV+kJF4DlVLjjLarNJnBLUmcQ1fQHi1MdZrjtiTxY8Ip7+X81RNq9OKDH1bNJmQ vZdw== X-Received: by 10.68.129.100 with SMTP id nv4mr1513563pbb.178.1367931790905; Tue, 07 May 2013 06:03:10 -0700 (PDT) Received: from localhost.localdomain ([115.113.119.130]) by mx.google.com with ESMTPSA id l4sm28220809pbo.6.2013.05.07.06.03.05 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 07 May 2013 06:03:09 -0700 (PDT) From: Amit Daniel Kachhap To: linux-pm@vger.kernel.org Cc: Zhang Rui , linux-samsung-soc@vger.kernel.org, linux-kernel@vger.kernel.org, amit.kachhap@gmail.com, Kukjin Kim , Eduardo Valentin Subject: [PATCH V3 20/21] thermal: exynos: Support for TMU regulator defined at device tree Date: Tue, 7 May 2013 18:31:10 +0530 Message-Id: <1367931671-3906-21-git-send-email-amit.daniel@samsung.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1367931671-3906-1-git-send-email-amit.daniel@samsung.com> References: <1367931671-3906-1-git-send-email-amit.daniel@samsung.com> Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org 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. Signed-off-by: Lukasz Majewski Signed-off-by: Kyungmin Park Signed-off-by: Amit Daniel Kachhap --- .../devicetree/bindings/thermal/exynos-thermal.txt | 4 ++++ drivers/thermal/samsung/exynos_tmu.c | 19 +++++++++++++++++++ 2 files changed, 23 insertions(+), 0 deletions(-) diff --git a/Documentation/devicetree/bindings/thermal/exynos-thermal.txt b/Documentation/devicetree/bindings/thermal/exynos-thermal.txt index 970eeba..ff62f7a 100644 --- a/Documentation/devicetree/bindings/thermal/exynos-thermal.txt +++ b/Documentation/devicetree/bindings/thermal/exynos-thermal.txt @@ -14,6 +14,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): @@ -25,6 +28,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 72446c9..b7c609a 100644 --- a/drivers/thermal/samsung/exynos_tmu.c +++ b/drivers/thermal/samsung/exynos_tmu.c @@ -32,6 +32,7 @@ #include #include #include +#include #include #include #include "exynos_thermal_common.h" @@ -52,6 +53,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 { @@ -65,6 +67,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; }; @@ -501,10 +504,23 @@ 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 = data->pdata; struct resource res; + int ret; if (!data) return -ENODEV; + /* Try enabling the regulator if found */ + 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; @@ -669,6 +685,9 @@ static int exynos_tmu_remove(struct platform_device *pdev) clk_unprepare(data->clk); + if (!IS_ERR(data->regulator)) + regulator_disable(data->regulator); + platform_set_drvdata(pdev, NULL); return 0;