From patchwork Tue Mar 29 09:18:28 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Ni X-Patchwork-Id: 8684331 X-Patchwork-Delegate: eduardo.valentin@ti.com Return-Path: X-Original-To: patchwork-linux-pm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 0E0459FDCC for ; Tue, 29 Mar 2016 09:19:34 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 077592026F for ; Tue, 29 Mar 2016 09:19:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 70DE420253 for ; Tue, 29 Mar 2016 09:19:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756469AbcC2JSK (ORCPT ); Tue, 29 Mar 2016 05:18:10 -0400 Received: from nat-hk.nvidia.com ([203.18.50.4]:19297 "EHLO hkmmgate102.nvidia.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752040AbcC2JSH (ORCPT ); Tue, 29 Mar 2016 05:18:07 -0400 Received: from hkpgpgate102.nvidia.com (Not Verified[10.18.92.9]) by hkmmgate102.nvidia.com id ; Tue, 29 Mar 2016 17:18:08 +0800 Received: from HKMAIL101.nvidia.com ([10.18.67.137]) by hkpgpgate102.nvidia.com (PGP Universal service); Tue, 29 Mar 2016 02:18:04 -0700 X-PGP-Universal: processed; by hkpgpgate102.nvidia.com on Tue, 29 Mar 2016 02:18:04 -0700 Received: from niwei-dev.nvidia.com (10.19.224.146) by HKMAIL101.nvidia.com (10.18.16.10) with Microsoft SMTP Server (TLS) id 15.0.1130.7; Tue, 29 Mar 2016 09:18:02 +0000 From: Wei Ni To: , , CC: , , , , , , Wei Ni Subject: [PATCH V9 11/14] thermal: tegra: handle HW initialization in one funcotion Date: Tue, 29 Mar 2016 17:18:28 +0800 Message-ID: <1459243108-25633-1-git-send-email-wni@nvidia.com> X-Mailer: git-send-email 1.9.1 X-NVConfidentiality: public MIME-Version: 1.0 X-Originating-IP: [10.19.224.146] X-ClientProxiedBy: HKMAIL104.nvidia.com (10.18.16.13) To HKMAIL101.nvidia.com (10.18.16.10) Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Spam-Status: No, score=-7.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Handle HW initialization in one function soctherm_init(), so that the codes are more clear. Signed-off-by: Wei Ni --- drivers/thermal/tegra/soctherm.c | 85 +++++++++++++++++++++------------------- 1 file changed, 44 insertions(+), 41 deletions(-) diff --git a/drivers/thermal/tegra/soctherm.c b/drivers/thermal/tegra/soctherm.c index deeb3b7e4dac..d2b7c255d71f 100644 --- a/drivers/thermal/tegra/soctherm.c +++ b/drivers/thermal/tegra/soctherm.c @@ -95,19 +95,11 @@ struct tegra_soctherm { struct dentry *debugfs_dir; }; -static int enable_tsensor(struct tegra_soctherm *tegra, - unsigned int i, - const struct tsensor_shared_calib *shared) +static void enable_tsensor(struct tegra_soctherm *tegra, unsigned int i) { const struct tegra_tsensor *sensor = &tegra->soc->tsensors[i]; void __iomem *base = tegra->regs + sensor->base; - u32 *calib = &tegra->calib[i]; unsigned int val; - int err; - - err = tegra_calc_tsensor_calib(sensor, shared, calib); - if (err) - return err; val = sensor->config->tall << SENSOR_CONFIG0_TALL_SHIFT; writel(val, base + SENSOR_CONFIG0); @@ -118,9 +110,7 @@ static int enable_tsensor(struct tegra_soctherm *tegra, val |= SENSOR_CONFIG1_TEMP_ENABLE; writel(val, base + SENSOR_CONFIG1); - writel(*calib, base + SENSOR_CONFIG2); - - return 0; + writel(tegra->calib[i], base + SENSOR_CONFIG2); } /* @@ -461,6 +451,34 @@ static int soctherm_clk_enable(struct platform_device *pdev, bool enable) return 0; } +static void soctherm_init(struct platform_device *pdev) +{ + struct tegra_soctherm *tegra = platform_get_drvdata(pdev); + const struct tegra_tsensor_group **ttgs = tegra->soc->ttgs; + int i; + u32 pdiv, hotspot; + + /* Initialize raw sensors */ + for (i = 0; i < tegra->soc->num_tsensors; ++i) + enable_tsensor(tegra, i); + + /* program pdiv and hotspot offsets per THERM */ + pdiv = readl(tegra->regs + SENSOR_PDIV); + hotspot = readl(tegra->regs + SENSOR_HOTSPOT_OFF); + for (i = 0; i < tegra->soc->num_ttgs; ++i) { + pdiv = REG_SET_MASK(pdiv, ttgs[i]->pdiv_mask, + ttgs[i]->pdiv); + /* hotspot offset from PLLX, doesn't need to configure PLLX */ + if (ttgs[i]->id == TEGRA124_SOCTHERM_SENSOR_PLLX) + continue; + hotspot = REG_SET_MASK(hotspot, + ttgs[i]->pllx_hotspot_mask, + ttgs[i]->pllx_hotspot_diff); + } + writel(pdiv, tegra->regs + SENSOR_PDIV); + writel(hotspot, tegra->regs + SENSOR_HOTSPOT_OFF); +} + static const struct of_device_id tegra_soctherm_of_match[] = { #ifdef CONFIG_ARCH_TEGRA_124_SOC { @@ -488,7 +506,6 @@ static int tegra_soctherm_probe(struct platform_device *pdev) struct tegra_soctherm_soc *soc; unsigned int i; int err; - u32 pdiv, hotspot; match = of_match_node(tegra_soctherm_of_match, pdev->dev.of_node); if (!match) @@ -529,45 +546,31 @@ static int tegra_soctherm_probe(struct platform_device *pdev) return PTR_ERR(tegra->clock_soctherm); } - err = soctherm_clk_enable(pdev, true); - if (err) - return err; - - /* Initialize raw sensors */ - tegra->calib = devm_kzalloc(&pdev->dev, sizeof(u32) * soc->num_tsensors, GFP_KERNEL); - if (!tegra->calib) { - err = -ENOMEM; - goto disable_clocks; - } + if (!tegra->calib) + return -ENOMEM; + /* calculate shared calibration data */ err = tegra_calc_shared_calib(soc->tfuse, &shared_calib); if (err) - goto disable_clocks; + return err; + /* calculate tsensor calibaration data */ for (i = 0; i < soc->num_tsensors; ++i) { - err = enable_tsensor(tegra, i, &shared_calib); + err = tegra_calc_tsensor_calib(&soc->tsensors[i], + &shared_calib, + &tegra->calib[i]); if (err) - goto disable_clocks; + return err; } - /* Program pdiv and hotspot offsets per THERM */ - pdiv = readl(tegra->regs + SENSOR_PDIV); - hotspot = readl(tegra->regs + SENSOR_HOTSPOT_OFF); - for (i = 0; i < soc->num_ttgs; ++i) { - pdiv = REG_SET_MASK(pdiv, soc->ttgs[i]->pdiv_mask, - soc->ttgs[i]->pdiv); - /* hotspot offset from PLLX, doesn't need to configure PLLX */ - if (soc->ttgs[i]->id == TEGRA124_SOCTHERM_SENSOR_PLLX) - continue; - hotspot = REG_SET_MASK(hotspot, - soc->ttgs[i]->pllx_hotspot_mask, - soc->ttgs[i]->pllx_hotspot_diff); - } - writel(pdiv, tegra->regs + SENSOR_PDIV); - writel(hotspot, tegra->regs + SENSOR_HOTSPOT_OFF); + err = soctherm_clk_enable(pdev, true); + if (err) + return err; + + soctherm_init(pdev); for (i = 0; i < soc->num_ttgs; ++i) { struct tegra_thermctl_zone *zone =