From patchwork Wed Oct 9 12:08:28 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Naveen Krishna Chatradhi X-Patchwork-Id: 3008661 Return-Path: X-Original-To: patchwork-linux-samsung-soc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 0E26A9F431 for ; Wed, 9 Oct 2013 12:06:58 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 45B02201A4 for ; Wed, 9 Oct 2013 12:06:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DA50220142 for ; Wed, 9 Oct 2013 12:06:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757383Ab3JIMGR (ORCPT ); Wed, 9 Oct 2013 08:06:17 -0400 Received: from mailout2.samsung.com ([203.254.224.25]:20454 "EHLO mailout2.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756811Ab3JIMGO (ORCPT ); Wed, 9 Oct 2013 08:06:14 -0400 Received: from epcpsbgr3.samsung.com (u143.gpu120.samsung.co.kr [203.254.230.143]) by mailout2.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MUE00237HMDET10@mailout2.samsung.com>; Wed, 09 Oct 2013 21:06:13 +0900 (KST) Received: from epcpsbgm1.samsung.com ( [172.20.52.124]) by epcpsbgr3.samsung.com (EPCPMTA) with SMTP id C4.16.20109.5B645525; Wed, 09 Oct 2013 21:06:13 +0900 (KST) X-AuditID: cbfee68f-b7f1e6d000004e8d-8c-525546b50f82 Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id 65.50.09055.5B645525; Wed, 09 Oct 2013 21:06:13 +0900 (KST) Received: from naveen-linux.sisodomain.com ([107.108.83.161]) by mmp2.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0MUE000JDHM7GX00@mmp2.samsung.com>; Wed, 09 Oct 2013 21:06:13 +0900 (KST) From: Naveen Krishna Chatradhi To: linux-pm@vger.kernel.org Cc: naveenkrishna.ch@gmail.com, rui.zhang@intel.com, eduardo.valentin@ti.com, linux-samsung-soc@vger.kernel.org, linux-kernel@vger.kernel.org, amit.daniel@samsung.com, kgene.kim@samsung.com, devicetree@vger.kernel.org, b.zolnierkie@samsung.com Subject: [PATCH 2/3 v4] thermal: samsung: change base_common to more meaningful base_second Date: Wed, 09 Oct 2013 17:38:28 +0530 Message-id: <1381320509-23967-2-git-send-email-ch.naveen@samsung.com> X-Mailer: git-send-email 1.7.10.4 In-reply-to: <1381320509-23967-1-git-send-email-ch.naveen@samsung.com> References: <1378268629-2886-3-git-send-email-ch.naveen@samsung.com> <1381320509-23967-1-git-send-email-ch.naveen@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFmplkeLIzCtJLcpLzFFi42JZI2JSo7vVLTTI4MIaI4uGqyEWG2esZ7WY f+Qcq8Wa/T+ZLHoXXGWzuLxrDpvF594jjBYzzu9jsli07T+zxZOHfWwOXB47Z91l91i85yWT R9+WVYwex29sZ/L4vEkugDWKyyYlNSezLLVI3y6BK2PdjLtMBRt1KxoaprE3MK5S7WLk4JAQ MJF4/Lq4i5ETyBSTuHBvPRuILSSwlFHi6wRxiLiJxPHJExi7GLmA4tMZJe482ccE4fQwSfx9 cIERpIpNwEzi4KLV7CC2iICMxNQr+1lBipgFfjJKdM5pBBsrLBAr8ez3MlYQm0VAVWLNgzvM IDavgKvEpN52Zoh1ihLdzyaA1XMKuElcntULta2BUeLC4SYWEEdCYBu7xMa5PVCTBCS+TT7E AvGPrMSmA1CDJCUOrrjBMoFReAEjwypG0dSC5ILipPQiY73ixNzi0rx0veT83E2MwCg4/e9Z /w7GuwesDzEmA42byCwlmpwPjKK8knhDYzMjC1MTU2Mjc0sz0oSVxHnVWqwDhQTSE0tSs1NT C1KL4otKc1KLDzEycXBKNTAGnptTH8dYHpV0/72Lnfk6jidXOI6F6k+zKytjTglbHB9eoHOQ 5WHStlO7mpQsj7446/Gjbv5xG95lM2Z57u57a7TcOU9jq879nR5rn3yOOPB76uulH5mYZFd+ rfuvcn2Z9YGP842/qt1gWP5r+/PpSRLc/gHHZE35f/D0Tpzpl7zm4mevi08ElViKMxINtZiL ihMBVYjaAZgCAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrCIsWRmVeSWpSXmKPExsVy+t9jQd2tbqFBBg9WaFk0XA2x2DhjPavF /CPnWC3W7P/JZNG74CqbxeVdc9gsPvceYbSYcX4fk8Wibf+ZLZ487GNz4PLYOesuu8fiPS+Z PPq2rGL0OH5jO5PH501yAaxRDYw2GamJKalFCql5yfkpmXnptkrewfHO8aZmBoa6hpYW5koK eYm5qbZKLj4Bum6ZOUBXKSmUJeaUAoUCEouLlfTtME0IDXHTtYBpjND1DQmC6zEyQAMJaxgz 1s24y1SwUbeioWEaewPjKtUuRk4OCQETieOTJzBC2GISF+6tZ+ti5OIQEpjOKHHnyT4mCKeH SeLvgwtgVWwCZhIHF61mB7FFBGQkpl7ZzwpSxCzwk1Gic04jG0hCWCBW4tnvZawgNouAqsSa B3eYQWxeAVeJSb3tzBDrFCW6n00Aq+cUcJO4PKsXalsDo8SFw00sExh5FzAyrGIUTS1ILihO Ss811CtOzC0uzUvXS87P3cQIjrNnUjsYVzZYHGIU4GBU4uF9wB8SJMSaWFZcmXuIUYKDWUmE 19ciNEiINyWxsiq1KD++qDQntfgQYzLQWROZpUST84EpIK8k3tDYxNzU2NTSxMLEzJI0YSVx 3gOt1oFCAumJJanZqakFqUUwW5g4OKUaGOe27Tp8eaXJ3KsVedrrlj85pDdH4wXX/O7JaX9O Jt/NiVPo2Sc8r+G4YM7etxt9H/ee2/orUmjeTYn11Y47VyT457ctjll942tk2J3AjWs+VV2Y M+f8JMVMXttmvXurDfoFjr72P6sfe8NOwknjefzN/VaCDVfnF67Njwx9JxystDKS9/vc2XFK LMUZiYZazEXFiQDmVGuG9wIAAA== DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Spam-Status: No, score=-7.1 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 On Exynos5440 and Exynos5420 there are registers common across the TMU channels. To support that, we introduced a ADDRESS_MULTIPLE flag in the driver and the 2nd set of register base and size are provided in the "reg" property of the node. As per Amit's suggestion, this patch changes the base_common to base_second and SHARED_MEMORY to ADDRESS_MULTIPLE. Signed-off-by: Naveen Krishna Chatradhi --- Changes since v1: None Changes since v2: Changed the flag name from SHARED_MEMORY to ADDRESS_MULTIPLE. https://lkml.org/lkml/2013/8/1/38 Changes since v3: None .../devicetree/bindings/thermal/exynos-thermal.txt | 4 ++-- drivers/thermal/samsung/exynos_tmu.c | 12 ++++++------ drivers/thermal/samsung/exynos_tmu.h | 4 ++-- drivers/thermal/samsung/exynos_tmu_data.c | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Documentation/devicetree/bindings/thermal/exynos-thermal.txt b/Documentation/devicetree/bindings/thermal/exynos-thermal.txt index 284f530..116cca0 100644 --- a/Documentation/devicetree/bindings/thermal/exynos-thermal.txt +++ b/Documentation/devicetree/bindings/thermal/exynos-thermal.txt @@ -11,8 +11,8 @@ - reg : Address range of the thermal registers. For soc's which has multiple instances of TMU and some registers are shared across all TMU's like interrupt related then 2 set of register has to supplied. First set - belongs to each instance of TMU and second set belongs to common TMU - registers. + belongs to each instance of TMU and second set belongs to second set + of common TMU registers. - interrupts : Should contain interrupt for thermal system - clocks : The main clock for TMU device - clock-names : Thermal system clock name diff --git a/drivers/thermal/samsung/exynos_tmu.c b/drivers/thermal/samsung/exynos_tmu.c index af69209..40c4243 100644 --- a/drivers/thermal/samsung/exynos_tmu.c +++ b/drivers/thermal/samsung/exynos_tmu.c @@ -41,7 +41,7 @@ * @id: identifier of the one instance of the TMU controller. * @pdata: pointer to the tmu platform/configuration data * @base: base address of the single instance of the TMU controller. - * @base_common: base address of the common registers of the TMU controller. + * @base_second: base address of the common registers of the TMU controller. * @irq: irq number of the TMU controller. * @soc: id of the SOC type. * @irq_work: pointer to the irq work structure. @@ -56,7 +56,7 @@ struct exynos_tmu_data { int id; struct exynos_tmu_platform_data *pdata; void __iomem *base; - void __iomem *base_common; + void __iomem *base_second; int irq; enum soc_type soc; struct work_struct irq_work; @@ -297,7 +297,7 @@ skip_calib_data: } /*Clear the PMIN in the common TMU register*/ if (reg->tmu_pmin && !data->id) - writel(0, data->base_common + reg->tmu_pmin); + writel(0, data->base_second + reg->tmu_pmin); out: clk_disable(data->clk); mutex_unlock(&data->lock); @@ -451,7 +451,7 @@ static void exynos_tmu_work(struct work_struct *work) /* Find which sensor generated this interrupt */ if (reg->tmu_irqstatus) { - val_type = readl(data->base_common + reg->tmu_irqstatus); + val_type = readl(data->base_second + reg->tmu_irqstatus); if (!((val_type >> data->id) & 0x1)) goto out; } @@ -576,7 +576,7 @@ static int exynos_map_dt_data(struct platform_device *pdev) * Check if the TMU shares some registers and then try to map the * memory of common registers. */ - if (!TMU_SUPPORTS(pdata, SHARED_MEMORY)) + if (!TMU_SUPPORTS(pdata, ADDRESS_MULTIPLE)) return 0; if (of_address_to_resource(pdev->dev.of_node, 1, &res)) { @@ -584,7 +584,7 @@ static int exynos_map_dt_data(struct platform_device *pdev) return -ENODEV; } - data->base_common = devm_ioremap(&pdev->dev, res.start, + data->base_second = devm_ioremap(&pdev->dev, res.start, resource_size(&res)); if (!data->base_common) { dev_err(&pdev->dev, "Failed to ioremap memory\n"); diff --git a/drivers/thermal/samsung/exynos_tmu.h b/drivers/thermal/samsung/exynos_tmu.h index 7c6c34a..ebd2ec1 100644 --- a/drivers/thermal/samsung/exynos_tmu.h +++ b/drivers/thermal/samsung/exynos_tmu.h @@ -59,7 +59,7 @@ enum soc_type { * state(active/idle) can be checked. * TMU_SUPPORT_EMUL_TIME - This features allows to set next temp emulation * sample time. - * TMU_SUPPORT_SHARED_MEMORY - This feature tells that the different TMU + * TMU_SUPPORT_ADDRESS_MULTIPLE - This feature tells that the different TMU * sensors shares some common registers. * TMU_SUPPORT - macro to compare the above features with the supplied. */ @@ -69,7 +69,7 @@ enum soc_type { #define TMU_SUPPORT_FALLING_TRIP BIT(3) #define TMU_SUPPORT_READY_STATUS BIT(4) #define TMU_SUPPORT_EMUL_TIME BIT(5) -#define TMU_SUPPORT_SHARED_MEMORY BIT(6) +#define TMU_SUPPORT_ADDRESS_MULTIPLE BIT(6) #define TMU_SUPPORTS(a, b) (a->features & TMU_SUPPORT_ ## b) diff --git a/drivers/thermal/samsung/exynos_tmu_data.c b/drivers/thermal/samsung/exynos_tmu_data.c index 23fea23..58570d0 100644 --- a/drivers/thermal/samsung/exynos_tmu_data.c +++ b/drivers/thermal/samsung/exynos_tmu_data.c @@ -239,7 +239,7 @@ static const struct exynos_tmu_registers exynos5440_tmu_registers = { .type = SOC_ARCH_EXYNOS5440, \ .registers = &exynos5440_tmu_registers, \ .features = (TMU_SUPPORT_EMULATION | TMU_SUPPORT_FALLING_TRIP | \ - TMU_SUPPORT_MULTI_INST | TMU_SUPPORT_SHARED_MEMORY), + TMU_SUPPORT_MULTI_INST | TMU_SUPPORT_ADDRESS_MULTIPLE), struct exynos_tmu_init_data const exynos5440_default_tmu_data = { .tmu_data = {