From patchwork Sat Feb 24 08:02:49 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Anson Huang X-Patchwork-Id: 10240325 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 8454860209 for ; Sat, 24 Feb 2018 08:07:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 77CEE29B40 for ; Sat, 24 Feb 2018 08:07:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6C27B29B61; Sat, 24 Feb 2018 08:07:08 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 2150F29B40 for ; Sat, 24 Feb 2018 08:07:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=ad6bihCsJVvu1l66D3c8icMZ36O/mOPygf3LCEnwTtY=; b=L1vd3myO+nHxDX eWA4lGqGBfFzJeZ/p8oykkl9EwMqhK9rpOH9RyWr2bbxnlZZvfNg+tKRFOc2gyPfXjQzcpNrjzVcd 9j3+PHGOecxKL3AukthvMW2f518dZKMGjcRhBjn7kCeQc8qSa1jC5d5h6zhhaTzT6G8MLmUlUsPDO lQrknffWz+F8hrHZip6Dq1N4ZvujGqnxItOE33zxKGtpZVDxGvtQ4Abpy/0m8J3aBCMLSof6iP/Wj +wGYji0DkUwwEqNxN/24q8Raq/qo1dvzLbeyGY75iFdXKVmpRzvA4Ha1cga8Q3lJpDQe7WuIzAk3T 7cUg+2rJ+Q3u3a2YiNmw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.89 #1 (Red Hat Linux)) id 1epUr7-0001Ze-QW; Sat, 24 Feb 2018 08:06:53 +0000 Received: from mail-by2nam01on0086.outbound.protection.outlook.com ([104.47.34.86] helo=NAM01-BY2-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1epUqX-0001II-Er for linux-arm-kernel@lists.infradead.org; Sat, 24 Feb 2018 08:06:20 +0000 Received: from BN3PR03CA0101.namprd03.prod.outlook.com (2603:10b6:400:4::19) by DM2PR03MB480.namprd03.prod.outlook.com (2a01:111:e400:2420::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.506.18; Sat, 24 Feb 2018 08:06:05 +0000 Received: from BL2FFO11OLC001.protection.gbl (2a01:111:f400:7c09::144) by BN3PR03CA0101.outlook.office365.com (2603:10b6:400:4::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.527.15 via Frontend Transport; Sat, 24 Feb 2018 08:06:05 +0000 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=nxp.com; lists.infradead.org; dkim=none (message not signed) header.d=none;lists.infradead.org; dmarc=fail action=none header.from=nxp.com; Received-SPF: Fail (protection.outlook.com: domain of nxp.com does not designate 192.88.168.50 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.168.50; helo=tx30smr01.am.freescale.net; Received: from tx30smr01.am.freescale.net (192.88.168.50) by BL2FFO11OLC001.mail.protection.outlook.com (10.173.161.185) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.506.19 via Frontend Transport; Sat, 24 Feb 2018 08:06:04 +0000 Received: from anson-OptiPlex-790.ap.freescale.net (anson-OptiPlex-790.ap.freescale.net [10.192.242.177]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id w1O85us2022349; Sat, 24 Feb 2018 01:06:00 -0700 From: Anson Huang To: , , , , , , , Subject: [PATCH V4 2/2] thermal: imx: add i.MX7 thermal sensor support Date: Sat, 24 Feb 2018 16:02:49 +0800 Message-ID: <1519459369-29083-2-git-send-email-Anson.Huang@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1519459369-29083-1-git-send-email-Anson.Huang@nxp.com> References: <1519459369-29083-1-git-send-email-Anson.Huang@nxp.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-Matching-Connectors: 131639331651365757; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.168.50; IPV:CAL; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(39860400002)(396003)(376002)(346002)(39380400002)(2980300002)(1110001)(1109001)(339900001)(189003)(199004)(59450400001)(47776003)(105606002)(356003)(26005)(6666003)(2950100002)(50226002)(305945005)(5660300001)(76176011)(2906002)(106466001)(316002)(36756003)(81156014)(81166006)(336011)(4326008)(97736004)(77096007)(5820100001)(110136005)(54906003)(2870700001)(50466002)(104016004)(53936002)(8936002)(26826003)(85426001)(72206003)(23676004)(86362001)(498600001)(8676002)(2201001)(68736007); DIR:OUT; SFP:1101; SCL:1; SRVR:DM2PR03MB480; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11OLC001; 1:h11j23axzNcXypac7Ac4HhefmkHr87sa3ogipXQ18Muxjhklq2WF6MRccO8zA06DgB21rPOPedTJdgRX+A6aVOWFyGU2HRBXAk/GXBP6GYbUKc8OQqfi+YwdJCBtGuva X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 652bad3c-d258-4323-4a1f-08d57b5d7401 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(5600026)(4604075)(2017052603307); SRVR:DM2PR03MB480; X-Microsoft-Exchange-Diagnostics: 1; DM2PR03MB480; 3:btFRO3ZHdsVfq2H484qFk4ot/ha3p1bZ69q22H7FhHUj0HihZYJdXWz3XDF40LgFsPxbq/Dw6YV0396aKGDmm71OHX5KfjtdR+1CCd50LZImDna8Hso/e7wsnlSk2kXtCucPAqXeHcoVJ9rw6SymJJttCgjsEBqiBbvlD1LJLsD4r1SJmWNq47+otHBqMkOqtiRvNnmgc9Am+QYIFd4DQo2VEq8xw8pw1lU6k7lgLtz0EytqjgP7cJ+NpL6NaMyxNiMVnv7hyNBvkrqJawoxBgru4mF/d7KcgHj+Qx4YgBPEKMMoJSisgApO04J68Sh12FFMvx6WQq/cAPr+8SAcRB3EohYI6jN6J8wwOWgMbYM=; 25:upbEPCFqzJ632YzXfll/yzKnMaz10MPIu9yMZMeOtlMivOLZIiq0RApqtvl44bSkih/5Nejp4cbakUGXDSGvG3bJGg16gbOCx07X+1McVwQW7tKMiCufdjqeop9yY/SHcFOIqlh5BV4iJHKfwd6A09fUatApmazFpairpM0eb9e0e87cnAEpGmpBZ/b1F994LZ7TvTeGUm2kCSTeQVrWGPUesXhkezWmQcDSek1IT8tBdbdPyOQmfy62yRXcAGaQLES29eEUg5eS57V2StTsBEmDSlKhNXCztpSg4PqN+K4dKz8RYr78X+xX2Zk4o9ah1K895wh2iFpMm3zq7fM4Mw== X-MS-TrafficTypeDiagnostic: DM2PR03MB480: X-Microsoft-Exchange-Diagnostics: 1; DM2PR03MB480; 31:PF/JUTP/zlwyb0ea1LKK29opSsjF63ghx8aLruA7hoTaWMB5nnclHr9hlhtpkUZDVp7LRXPHndU1ifTE71q2ESd2bMV5Oaqqu0ok1+W59jpLVeuUZFVNuHddFAg885quXohYDB0WL3J8YgzMDSbH/DrBx1WyA61enkZN/Hdz7fmATTnJ30eihWgPEoh4NcGRcexhWCZJfDFG33LaGNobwSU/ovx/tIeNgz86ux8i4dI=; 4:qfYNluRie6s5lV/MN+QyS4Ryd5PiAz3LOwSv/JmQ8D2YDCHXbx9VPZQKtgvz8awhF6pzHGKsj66z2g8jVBhgboOMwgAKNQdfUD0RznYnrvh/pwvPTaOgXPHKUzsgotmz6wZqB6+Y96QfRsUudgVZCt936qCo0eeCLjaaAOx4lefi+1m2Mji0pn922Vo34i+43NOsEI0nEmnaSBmehTc9XOwfjCvb3F9anE40emzat0Ly/kgfFwZP6Vzh/oodlKcjHWPCFOkD8+ZvhWCZtFkbnwCHKszEdV3UP0Msvsxivy0VfgCijxGVKavUbfALvqT5 X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6095135)(2401047)(8121501046)(5005006)(10201501046)(93006095)(93001095)(3002001)(3231101)(944501161)(6055026)(6096035)(20161123561025)(20161123556025)(20161123565025)(20161123559100)(20161123563025)(201703131430075)(201703131448075)(201703131433075)(201703151042153)(201708071742011); SRVR:DM2PR03MB480; BCL:0; PCL:0; RULEID:(400006); SRVR:DM2PR03MB480; X-Forefront-PRVS: 0593E261C4 X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtETTJQUjAzTUI0ODA7MjM6eUZWb1hTanlNYm1UYkxyT3hCZUo1NVVQUHMy?= =?utf-8?B?OXBHaFR5TW5VL2VQcTcyeUNhbkRQazZnWkJ6OVptQTlSY3I1Ym9GWFpCM1dh?= =?utf-8?B?NFNCNElFdWliMlh3bGNsRERrRE81QzQ0a2UrTDN4OEJWNFQ0L216N3FXVzNz?= =?utf-8?B?WThBK05sSDZLVWgzRmUrM1gydEk4aGtaSEQ3Q01wZDRSa2hnSnV3L2pJa2d6?= =?utf-8?B?QWlQa0NPNDN2WitRMkQ0Wkh4TjF4MHpQdzN1RFhISmdqNkhhcVhFeWoyL3JH?= =?utf-8?B?Y1JwcHEwSGJlY0RkamZXb2N5a0RqeHh1elN3ZjRPM1lyczUrSndseUdZTFZu?= =?utf-8?B?WmdWNTljMkJDNC9NNmk4UFpWK3ZvbFIwcXNycnhHNjl1bEpZVGV4YWM2djd4?= =?utf-8?B?R3NraWoxbk1qVEFwcHZWWENLOHVEU2pFcEJreTNzcjMrWEkvVVFsT3hhZGo2?= =?utf-8?B?Z1NxaUVGVXArdGh4Mzk2ejJna2lRU0t0UEFROUdiLzAwWVhkQmJhRFA3TU9M?= =?utf-8?B?RExaeGVLd005Rit0ekJEV1RpanZsVVlFQ3A3dS84UmxsTDZPSkZhSG93aE9y?= =?utf-8?B?NlVpSWtQRkRYTjdlbXZrZFdoZHdxVEFheUZjQlhodWluc0NJUFJxbG8vU3dz?= =?utf-8?B?aHdNdlRzZXVLZUZyUW9vaDdUSlpmYzU0ODdHVTdLWGk4REVCVUtiMjBPOVB5?= =?utf-8?B?YUVJSFRhRW9DRnJYT2dscTVwNGcxaDljWENkSDZhbW8zRGYweUpSTWtlUS9N?= =?utf-8?B?eGxVZWNvRXZ0bWloeFBobWxHMllBc3hpbHRWb3ZWckU3MWlnSDQzRU1MK0Zs?= =?utf-8?B?RHFZalVqdTdzVzQxdk8rR0xvazBZbVlqTDArZUJHdDllOEhqWWlpOVU4SEpx?= =?utf-8?B?YkVpaDcvOUNWM0ttUE5yMS9nbnBkVnZkRk4yZXBtbGpWbGdPQWhhTFREUFJB?= =?utf-8?B?b0I0MTNUbDl0WmIyUnRTVjR2Z0N3VjhsTmx5VlBpeExOTW1xR2pyUHpicWlQ?= =?utf-8?B?bGJTMG1Za3hjd2ZQSXdrZkJkdERXYm9SMFRLN2llRVdxQ016ald6L0JOS09B?= =?utf-8?B?WU1Sa0M1SXlFb3g1VzdCRFFnRkxHeVhvMG5wYUFkZWtQYmZVYnFWVjVKNkx1?= =?utf-8?B?VkIvc0Q1VVdWMFl0bzIxNGJ0bXR1Tnh6TEpCSk5mQTFUeEx3T2kxRGRKSWZC?= =?utf-8?B?S0syeEdvblh2NXNhTFJNdFV3bEs5bWtvSDYxT2IwaUtucmdQWHVtRit6T1lH?= =?utf-8?B?cGx2WGR4NS9BK2RadFpqU2gzTTdScjNqdnVzRmViNFpNczhFbXhONmNyWWZO?= =?utf-8?B?ZGpjd1U5RGZ6NGk2T1RVNFF2TE45UTR4ZkxoWTNBTG9JTElqdkFLVHV2ZkVh?= =?utf-8?B?SWxaY3BGSk1kM1BKd0dLZmtwVWh1bkQ2SUxiQmpYQkx6dHdUbE4vSnM0b3hn?= =?utf-8?B?RFptdGRGWnNEUEFMMVFMSDBJSWVaTGE2L1d1RVdvU3YrWXZTRjQvRkFWeGJv?= =?utf-8?B?S084Z21vdWVOL1JuYzZVSndEVDVnaTV6YnY2Z1k1dXA2M01FTHpTREpjUEJP?= =?utf-8?B?c1F5UE1Hdlh4RXhnQ0JVTHZkc0FRQT09?= X-Microsoft-Exchange-Diagnostics: 1; DM2PR03MB480; 6:clQMRjiCkeoe6guL/t/xJYO7KZJMXnd+v+XEr9wXGkVCu/lqdBb/dnEltWRKmGqWkrHiEE8vUw27fPUbYd/v5gGvs3Mid5wbqgiOGdBO/Rg+JAXcUCtMacVOza7F7tUlpl0hEkUUwA5gPCGHwTEbgzUqFzeTgptA/YE6TyZRpdMlT3RicNsscOrNKpB2bZE3f14woeLPc/6IO0h8Y/O1FdiSno5saFVMIEFiurAKfGpr6wU7uUIV7e/p/Gmd0OXk25eouYy7WBu7e3SfPZ9RIjoEEmoeA4AF8267M4l3AIMQJNzegTsKWct7Ai9WL3IkYMU6cxqS5WecEiqLTu0jYBkkKrq/3uqrZg2cEGD8k8o=; 5:HyS9H9g3GVZ++WUgJce4eiC05uR0sp+JlMizSXucdAiPLRxgt/gu5Ibbay4Z/6qn1cEM2vUOr0KfkrOowsckXv3Ut9Qpyqc/1HsSUNxITvih4uLi7P08U62TxOPSu3FT+xEHNgd/u+TqB/zRqzJjCnqg3fWA5Ox1tTlGELtuNhg=; 24:x/MqeYWdf6f3FrvVW9hepCIts6fxz+tPy5oFU9Cp8AOgtGq+QaxOWf7tJ3CyT0PG6H3872nXJqR4+N5OySdyZqb19Diq/7tQPddB1BL6lYc=; 7:4LT2ZhqdJ2mZ3b6V4JX0JeYbUGGx+5HP/lrfFH3NzsLaKXLRrUsCkmiZk2CtTITDVRzTcmbNijBO6X4zwBHw9vrQeO/nQ71nE/0mBeeecFcBk0Ja3ndbGq1g6+jX9cj8T9RUc2gTz16ThISxMciXt2hKmD/hkwjDCW2ZpRYMelgfFUFlorTFpVvSdwEUI1bqIctcM7prCuTSTdBhhjMCgHgXesAKs5oQ8DsS9ED91ttB4lcdGxqUyApPu5Ul09CN SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Feb 2018 08:06:04.8713 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 652bad3c-d258-4323-4a1f-08d57b5d7401 X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e; Ip=[192.88.168.50]; Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM2PR03MB480 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180224_000617_569909_35F3A7E9 X-CRM114-Status: GOOD ( 16.91 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, Linux-imx@nxp.com, linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP This patch adds i.MX7 thermal sensor support, most of the i.MX7 thermal sensor functions are same with i.MX6 except the registers offset/layout, so we move those registers offset/layout definitions to soc data structure. i.MX7 uses single calibration data @25C, the calibration data is located at OCOTP offset 0x4F0, bit[17:9], the formula is as below: Tmeas = (Nmeas - n1) + 25; n1 is the fuse value for 25C. Signed-off-by: Anson Huang Signed-off-by: Bai Ping Acked-by: Shawn Guo Acked-by: Dong Aisheng --- changes since V3: use "fsl,imx7d-tempmon" instead of "fsl,imx7-tempmon" as compatible string; rebase to latest 4.16-rc2; improve local variable definition sequence. .../devicetree/bindings/thermal/imx-thermal.txt | 9 +- drivers/thermal/imx_thermal.c | 314 ++++++++++++++++----- 2 files changed, 254 insertions(+), 69 deletions(-) diff --git a/Documentation/devicetree/bindings/thermal/imx-thermal.txt b/Documentation/devicetree/bindings/thermal/imx-thermal.txt index 28be51a..38bffcc 100644 --- a/Documentation/devicetree/bindings/thermal/imx-thermal.txt +++ b/Documentation/devicetree/bindings/thermal/imx-thermal.txt @@ -1,8 +1,13 @@ * Temperature Monitor (TEMPMON) on Freescale i.MX SoCs Required properties: -- compatible : "fsl,imx6q-tempmon" for i.MX6Q, "fsl,imx6sx-tempmon" for i.MX6SX. - i.MX6SX has two more IRQs than i.MX6Q, one is IRQ_LOW and the other is IRQ_PANIC, +- compatible : must be one of following: + - "fsl,imx6q-tempmon" for i.MX6Q, + - "fsl,imx6sx-tempmon" for i.MX6SX, + - "fsl,imx7d-tempmon" for i.MX7S/D. +- interrupts : the interrupt output of the controller: + i.MX6Q has one IRQ which will be triggered when temperature is higher than high threshold, + i.MX6SX and i.MX7S/D have two more IRQs than i.MX6Q, one is IRQ_LOW and the other is IRQ_PANIC, when temperature is below than low threshold, IRQ_LOW will be triggered, when temperature is higher than panic threshold, system will auto reboot by SRC module. - fsl,tempmon : phandle pointer to system controller that contains TEMPMON diff --git a/drivers/thermal/imx_thermal.c b/drivers/thermal/imx_thermal.c index a67781b..3928e2c 100644 --- a/drivers/thermal/imx_thermal.c +++ b/drivers/thermal/imx_thermal.c @@ -31,34 +31,58 @@ #define REG_CLR 0x8 #define REG_TOG 0xc -#define MISC0 0x0150 -#define MISC0_REFTOP_SELBIASOFF (1 << 3) -#define MISC1 0x0160 -#define MISC1_IRQ_TEMPHIGH (1 << 29) +/* i.MX6 specific */ +#define IMX6_MISC0 0x0150 +#define IMX6_MISC0_REFTOP_SELBIASOFF (1 << 3) +#define IMX6_MISC1 0x0160 +#define IMX6_MISC1_IRQ_TEMPHIGH (1 << 29) /* Below LOW and PANIC bits are only for TEMPMON_IMX6SX */ -#define MISC1_IRQ_TEMPLOW (1 << 28) -#define MISC1_IRQ_TEMPPANIC (1 << 27) - -#define TEMPSENSE0 0x0180 -#define TEMPSENSE0_ALARM_VALUE_SHIFT 20 -#define TEMPSENSE0_ALARM_VALUE_MASK (0xfff << TEMPSENSE0_ALARM_VALUE_SHIFT) -#define TEMPSENSE0_TEMP_CNT_SHIFT 8 -#define TEMPSENSE0_TEMP_CNT_MASK (0xfff << TEMPSENSE0_TEMP_CNT_SHIFT) -#define TEMPSENSE0_FINISHED (1 << 2) -#define TEMPSENSE0_MEASURE_TEMP (1 << 1) -#define TEMPSENSE0_POWER_DOWN (1 << 0) - -#define TEMPSENSE1 0x0190 -#define TEMPSENSE1_MEASURE_FREQ 0xffff -/* Below TEMPSENSE2 is only for TEMPMON_IMX6SX */ -#define TEMPSENSE2 0x0290 -#define TEMPSENSE2_LOW_VALUE_SHIFT 0 -#define TEMPSENSE2_LOW_VALUE_MASK 0xfff -#define TEMPSENSE2_PANIC_VALUE_SHIFT 16 -#define TEMPSENSE2_PANIC_VALUE_MASK 0xfff0000 +#define IMX6_MISC1_IRQ_TEMPLOW (1 << 28) +#define IMX6_MISC1_IRQ_TEMPPANIC (1 << 27) + +#define IMX6_TEMPSENSE0 0x0180 +#define IMX6_TEMPSENSE0_ALARM_VALUE_SHIFT 20 +#define IMX6_TEMPSENSE0_ALARM_VALUE_MASK (0xfff << 20) +#define IMX6_TEMPSENSE0_TEMP_CNT_SHIFT 8 +#define IMX6_TEMPSENSE0_TEMP_CNT_MASK (0xfff << 8) +#define IMX6_TEMPSENSE0_FINISHED (1 << 2) +#define IMX6_TEMPSENSE0_MEASURE_TEMP (1 << 1) +#define IMX6_TEMPSENSE0_POWER_DOWN (1 << 0) + +#define IMX6_TEMPSENSE1 0x0190 +#define IMX6_TEMPSENSE1_MEASURE_FREQ 0xffff +#define IMX6_TEMPSENSE1_MEASURE_FREQ_SHIFT 0 -#define OCOTP_MEM0 0x0480 -#define OCOTP_ANA1 0x04e0 +/* Below TEMPSENSE2 is only for TEMPMON_IMX6SX */ +#define IMX6_TEMPSENSE2 0x0290 +#define IMX6_TEMPSENSE2_LOW_VALUE_SHIFT 0 +#define IMX6_TEMPSENSE2_LOW_VALUE_MASK 0xfff +#define IMX6_TEMPSENSE2_PANIC_VALUE_SHIFT 16 +#define IMX6_TEMPSENSE2_PANIC_VALUE_MASK 0xfff0000 + +/* i.MX7 specific */ +#define IMX7_ANADIG_DIGPROG 0x800 +#define IMX7_TEMPSENSE0 0x300 +#define IMX7_TEMPSENSE0_PANIC_ALARM_SHIFT 18 +#define IMX7_TEMPSENSE0_PANIC_ALARM_MASK (0x1ff << 18) +#define IMX7_TEMPSENSE0_HIGH_ALARM_SHIFT 9 +#define IMX7_TEMPSENSE0_HIGH_ALARM_MASK (0x1ff << 9) +#define IMX7_TEMPSENSE0_LOW_ALARM_SHIFT 0 +#define IMX7_TEMPSENSE0_LOW_ALARM_MASK 0x1ff + +#define IMX7_TEMPSENSE1 0x310 +#define IMX7_TEMPSENSE1_MEASURE_FREQ_SHIFT 16 +#define IMX7_TEMPSENSE1_MEASURE_FREQ_MASK (0xffff << 16) +#define IMX7_TEMPSENSE1_FINISHED (1 << 11) +#define IMX7_TEMPSENSE1_MEASURE_TEMP (1 << 10) +#define IMX7_TEMPSENSE1_POWER_DOWN (1 << 9) +#define IMX7_TEMPSENSE1_TEMP_VALUE_SHIFT 0 +#define IMX7_TEMPSENSE1_TEMP_VALUE_MASK 0x1ff + +#define IMX6_OCOTP_MEM0 0x0480 +#define IMX6_OCOTP_ANA1 0x04e0 +#define IMX7_OCOTP_TESTER3 0x0440 +#define IMX7_OCOTP_ANA1 0x04f0 /* The driver supports 1 passive trip point and 1 critical trip point */ enum imx_thermal_trip { @@ -72,17 +96,114 @@ enum imx_thermal_trip { #define TEMPMON_IMX6Q 1 #define TEMPMON_IMX6SX 2 +#define TEMPMON_IMX7D 3 struct thermal_soc_data { u32 version; + + u32 sensor_ctrl; + u32 power_down_mask; + u32 measure_temp_mask; + + u32 measure_freq_ctrl; + u32 measure_freq_mask; + u32 measure_freq_shift; + + u32 temp_data; + u32 temp_value_mask; + u32 temp_value_shift; + u32 temp_valid_mask; + + u32 panic_alarm_ctrl; + u32 panic_alarm_mask; + u32 panic_alarm_shift; + + u32 high_alarm_ctrl; + u32 high_alarm_mask; + u32 high_alarm_shift; + + u32 low_alarm_ctrl; + u32 low_alarm_mask; + u32 low_alarm_shift; }; static struct thermal_soc_data thermal_imx6q_data = { .version = TEMPMON_IMX6Q, + + .sensor_ctrl = IMX6_TEMPSENSE0, + .power_down_mask = IMX6_TEMPSENSE0_POWER_DOWN, + .measure_temp_mask = IMX6_TEMPSENSE0_MEASURE_TEMP, + + .measure_freq_ctrl = IMX6_TEMPSENSE1, + .measure_freq_shift = IMX6_TEMPSENSE1_MEASURE_FREQ_SHIFT, + .measure_freq_mask = IMX6_TEMPSENSE1_MEASURE_FREQ, + + .temp_data = IMX6_TEMPSENSE0, + .temp_value_mask = IMX6_TEMPSENSE0_TEMP_CNT_MASK, + .temp_value_shift = IMX6_TEMPSENSE0_TEMP_CNT_SHIFT, + .temp_valid_mask = IMX6_TEMPSENSE0_FINISHED, + + .high_alarm_ctrl = IMX6_TEMPSENSE0, + .high_alarm_mask = IMX6_TEMPSENSE0_ALARM_VALUE_MASK, + .high_alarm_shift = IMX6_TEMPSENSE0_ALARM_VALUE_SHIFT, }; static struct thermal_soc_data thermal_imx6sx_data = { .version = TEMPMON_IMX6SX, + + .sensor_ctrl = IMX6_TEMPSENSE0, + .power_down_mask = IMX6_TEMPSENSE0_POWER_DOWN, + .measure_temp_mask = IMX6_TEMPSENSE0_MEASURE_TEMP, + + .measure_freq_ctrl = IMX6_TEMPSENSE1, + .measure_freq_shift = IMX6_TEMPSENSE1_MEASURE_FREQ_SHIFT, + .measure_freq_mask = IMX6_TEMPSENSE1_MEASURE_FREQ, + + .temp_data = IMX6_TEMPSENSE0, + .temp_value_mask = IMX6_TEMPSENSE0_TEMP_CNT_MASK, + .temp_value_shift = IMX6_TEMPSENSE0_TEMP_CNT_SHIFT, + .temp_valid_mask = IMX6_TEMPSENSE0_FINISHED, + + .high_alarm_ctrl = IMX6_TEMPSENSE0, + .high_alarm_mask = IMX6_TEMPSENSE0_ALARM_VALUE_MASK, + .high_alarm_shift = IMX6_TEMPSENSE0_ALARM_VALUE_SHIFT, + + .panic_alarm_ctrl = IMX6_TEMPSENSE2, + .panic_alarm_mask = IMX6_TEMPSENSE2_PANIC_VALUE_MASK, + .panic_alarm_shift = IMX6_TEMPSENSE2_PANIC_VALUE_SHIFT, + + .low_alarm_ctrl = IMX6_TEMPSENSE2, + .low_alarm_mask = IMX6_TEMPSENSE2_LOW_VALUE_MASK, + .low_alarm_shift = IMX6_TEMPSENSE2_LOW_VALUE_SHIFT, +}; + +static struct thermal_soc_data thermal_imx7d_data = { + .version = TEMPMON_IMX7D, + + .sensor_ctrl = IMX7_TEMPSENSE1, + .power_down_mask = IMX7_TEMPSENSE1_POWER_DOWN, + .measure_temp_mask = IMX7_TEMPSENSE1_MEASURE_TEMP, + + .measure_freq_ctrl = IMX7_TEMPSENSE1, + .measure_freq_shift = IMX7_TEMPSENSE1_MEASURE_FREQ_SHIFT, + .measure_freq_mask = IMX7_TEMPSENSE1_MEASURE_FREQ_MASK, + + .temp_data = IMX7_TEMPSENSE1, + .temp_value_mask = IMX7_TEMPSENSE1_TEMP_VALUE_MASK, + .temp_value_shift = IMX7_TEMPSENSE1_TEMP_VALUE_SHIFT, + .temp_valid_mask = IMX7_TEMPSENSE1_FINISHED, + + .panic_alarm_ctrl = IMX7_TEMPSENSE1, + .panic_alarm_mask = IMX7_TEMPSENSE0_PANIC_ALARM_MASK, + .panic_alarm_shift = IMX7_TEMPSENSE0_PANIC_ALARM_SHIFT, + + .high_alarm_ctrl = IMX7_TEMPSENSE0, + .high_alarm_mask = IMX7_TEMPSENSE0_HIGH_ALARM_MASK, + .high_alarm_shift = IMX7_TEMPSENSE0_HIGH_ALARM_SHIFT, + + .low_alarm_ctrl = IMX7_TEMPSENSE0, + .low_alarm_mask = IMX7_TEMPSENSE0_LOW_ALARM_MASK, + .low_alarm_shift = IMX7_TEMPSENSE0_LOW_ALARM_SHIFT, }; struct imx_thermal_data { @@ -107,31 +228,42 @@ struct imx_thermal_data { static void imx_set_panic_temp(struct imx_thermal_data *data, int panic_temp) { + const struct thermal_soc_data *soc_data = data->socdata; struct regmap *map = data->tempmon; int critical_value; critical_value = (data->c2 - panic_temp) / data->c1; - regmap_write(map, TEMPSENSE2 + REG_CLR, TEMPSENSE2_PANIC_VALUE_MASK); - regmap_write(map, TEMPSENSE2 + REG_SET, critical_value << - TEMPSENSE2_PANIC_VALUE_SHIFT); + + regmap_write(map, soc_data->panic_alarm_ctrl + REG_CLR, + soc_data->panic_alarm_mask); + regmap_write(map, soc_data->panic_alarm_ctrl + REG_SET, + critical_value << soc_data->panic_alarm_shift); } static void imx_set_alarm_temp(struct imx_thermal_data *data, int alarm_temp) { struct regmap *map = data->tempmon; + const struct thermal_soc_data *soc_data = data->socdata; int alarm_value; data->alarm_temp = alarm_temp; - alarm_value = (data->c2 - alarm_temp) / data->c1; - regmap_write(map, TEMPSENSE0 + REG_CLR, TEMPSENSE0_ALARM_VALUE_MASK); - regmap_write(map, TEMPSENSE0 + REG_SET, alarm_value << - TEMPSENSE0_ALARM_VALUE_SHIFT); + + if (data->socdata->version == TEMPMON_IMX7D) + alarm_value = alarm_temp / 1000 + data->c1 - 25; + else + alarm_value = (data->c2 - alarm_temp) / data->c1; + + regmap_write(map, soc_data->high_alarm_ctrl + REG_CLR, + soc_data->high_alarm_mask); + regmap_write(map, soc_data->high_alarm_ctrl + REG_SET, + alarm_value << soc_data->high_alarm_shift); } static int imx_get_temp(struct thermal_zone_device *tz, int *temp) { struct imx_thermal_data *data = tz->devdata; + const struct thermal_soc_data *soc_data = data->socdata; struct regmap *map = data->tempmon; unsigned int n_meas; bool wait; @@ -139,16 +271,18 @@ static int imx_get_temp(struct thermal_zone_device *tz, int *temp) if (data->mode == THERMAL_DEVICE_ENABLED) { /* Check if a measurement is currently in progress */ - regmap_read(map, TEMPSENSE0, &val); - wait = !(val & TEMPSENSE0_FINISHED); + regmap_read(map, soc_data->temp_data, &val); + wait = !(val & soc_data->temp_valid_mask); } else { /* * Every time we measure the temperature, we will power on the * temperature sensor, enable measurements, take a reading, * disable measurements, power off the temperature sensor. */ - regmap_write(map, TEMPSENSE0 + REG_CLR, TEMPSENSE0_POWER_DOWN); - regmap_write(map, TEMPSENSE0 + REG_SET, TEMPSENSE0_MEASURE_TEMP); + regmap_write(map, soc_data->sensor_ctrl + REG_CLR, + soc_data->power_down_mask); + regmap_write(map, soc_data->sensor_ctrl + REG_SET, + soc_data->measure_temp_mask); wait = true; } @@ -160,22 +294,28 @@ static int imx_get_temp(struct thermal_zone_device *tz, int *temp) if (wait) usleep_range(20, 50); - regmap_read(map, TEMPSENSE0, &val); + regmap_read(map, soc_data->temp_data, &val); if (data->mode != THERMAL_DEVICE_ENABLED) { - regmap_write(map, TEMPSENSE0 + REG_CLR, TEMPSENSE0_MEASURE_TEMP); - regmap_write(map, TEMPSENSE0 + REG_SET, TEMPSENSE0_POWER_DOWN); + regmap_write(map, soc_data->sensor_ctrl + REG_CLR, + soc_data->measure_temp_mask); + regmap_write(map, soc_data->sensor_ctrl + REG_SET, + soc_data->power_down_mask); } - if ((val & TEMPSENSE0_FINISHED) == 0) { + if ((val & soc_data->temp_valid_mask) == 0) { dev_dbg(&tz->device, "temp measurement never finished\n"); return -EAGAIN; } - n_meas = (val & TEMPSENSE0_TEMP_CNT_MASK) >> TEMPSENSE0_TEMP_CNT_SHIFT; + n_meas = (val & soc_data->temp_value_mask) + >> soc_data->temp_value_shift; /* See imx_init_calib() for formula derivation */ - *temp = data->c2 - n_meas * data->c1; + if (data->socdata->version == TEMPMON_IMX7D) + *temp = (n_meas - data->c1 + 25) * 1000; + else + *temp = data->c2 - n_meas * data->c1; /* Update alarm value to next higher trip point for TEMPMON_IMX6Q */ if (data->socdata->version == TEMPMON_IMX6Q) { @@ -219,21 +359,26 @@ static int imx_set_mode(struct thermal_zone_device *tz, { struct imx_thermal_data *data = tz->devdata; struct regmap *map = data->tempmon; + const struct thermal_soc_data *soc_data = data->socdata; if (mode == THERMAL_DEVICE_ENABLED) { tz->polling_delay = IMX_POLLING_DELAY; tz->passive_delay = IMX_PASSIVE_DELAY; - regmap_write(map, TEMPSENSE0 + REG_CLR, TEMPSENSE0_POWER_DOWN); - regmap_write(map, TEMPSENSE0 + REG_SET, TEMPSENSE0_MEASURE_TEMP); + regmap_write(map, soc_data->sensor_ctrl + REG_CLR, + soc_data->power_down_mask); + regmap_write(map, soc_data->sensor_ctrl + REG_SET, + soc_data->measure_temp_mask); if (!data->irq_enabled) { data->irq_enabled = true; enable_irq(data->irq); } } else { - regmap_write(map, TEMPSENSE0 + REG_CLR, TEMPSENSE0_MEASURE_TEMP); - regmap_write(map, TEMPSENSE0 + REG_SET, TEMPSENSE0_POWER_DOWN); + regmap_write(map, soc_data->sensor_ctrl + REG_CLR, + soc_data->measure_temp_mask); + regmap_write(map, soc_data->sensor_ctrl + REG_SET, + soc_data->power_down_mask); tz->polling_delay = 0; tz->passive_delay = 0; @@ -355,6 +500,15 @@ static int imx_init_calib(struct platform_device *pdev, u32 ocotp_ana1) } /* + * On i.MX7D, we only use the calibration data at 25C to get the temp, + * Tmeas = ( Nmeas - n1) + 25; n1 is the fuse value for 25C. + */ + if (data->socdata->version == TEMPMON_IMX7D) { + data->c1 = (ocotp_ana1 >> 9) & 0x1ff; + return 0; + } + + /* * The sensor is calibrated at 25 °C (aka T1) and the value measured * (aka N1) at this temperature is provided in bits [31:20] in the * i.MX's OCOTP value ANA1. @@ -418,6 +572,7 @@ static void imx_init_temp_grade(struct platform_device *pdev, u32 ocotp_mem0) static int imx_init_from_tempmon_data(struct platform_device *pdev) { + const struct imx_thermal_data *data = platform_get_drvdata(pdev); struct regmap *map; int ret; u32 val; @@ -430,7 +585,11 @@ static int imx_init_from_tempmon_data(struct platform_device *pdev) return ret; } - ret = regmap_read(map, OCOTP_ANA1, &val); + if (data->socdata->version == TEMPMON_IMX7D) + ret = regmap_read(map, IMX7_OCOTP_ANA1, &val); + else + ret = regmap_read(map, IMX6_OCOTP_ANA1, &val); + if (ret) { dev_err(&pdev->dev, "failed to read sensor data: %d\n", ret); return ret; @@ -439,7 +598,11 @@ static int imx_init_from_tempmon_data(struct platform_device *pdev) if (ret) return ret; - ret = regmap_read(map, OCOTP_MEM0, &val); + /* use OTP for thermal grade */ + if (data->socdata->version == TEMPMON_IMX7D) + ret = regmap_read(map, IMX7_OCOTP_TESTER3, &val); + else + ret = regmap_read(map, IMX6_OCOTP_MEM0, &val); if (ret) { dev_err(&pdev->dev, "failed to read sensor data: %d\n", ret); return ret; @@ -492,6 +655,7 @@ static irqreturn_t imx_thermal_alarm_irq_thread(int irq, void *dev) static const struct of_device_id of_imx_thermal_match[] = { { .compatible = "fsl,imx6q-tempmon", .data = &thermal_imx6q_data, }, { .compatible = "fsl,imx6sx-tempmon", .data = &thermal_imx6sx_data, }, + { .compatible = "fsl,imx7d-tempmon", .data = &thermal_imx7d_data, }, { /* end */ } }; MODULE_DEVICE_TABLE(of, of_imx_thermal_match); @@ -523,14 +687,15 @@ static int imx_thermal_probe(struct platform_device *pdev) /* make sure the IRQ flag is clear before enabling irq on i.MX6SX */ if (data->socdata->version == TEMPMON_IMX6SX) { - regmap_write(map, MISC1 + REG_CLR, MISC1_IRQ_TEMPHIGH | - MISC1_IRQ_TEMPLOW | MISC1_IRQ_TEMPPANIC); + regmap_write(map, IMX6_MISC1 + REG_CLR, + IMX6_MISC1_IRQ_TEMPHIGH | IMX6_MISC1_IRQ_TEMPLOW + | IMX6_MISC1_IRQ_TEMPPANIC); /* * reset value of LOW ALARM is incorrect, set it to lowest * value to avoid false trigger of low alarm. */ - regmap_write(map, TEMPSENSE2 + REG_SET, - TEMPSENSE2_LOW_VALUE_MASK); + regmap_write(map, data->socdata->low_alarm_ctrl + REG_SET, + data->socdata->low_alarm_mask); } data->irq = platform_get_irq(pdev, 0); @@ -557,11 +722,17 @@ static int imx_thermal_probe(struct platform_device *pdev) } /* Make sure sensor is in known good state for measurements */ - regmap_write(map, TEMPSENSE0 + REG_CLR, TEMPSENSE0_POWER_DOWN); - regmap_write(map, TEMPSENSE0 + REG_CLR, TEMPSENSE0_MEASURE_TEMP); - regmap_write(map, TEMPSENSE1 + REG_CLR, TEMPSENSE1_MEASURE_FREQ); - regmap_write(map, MISC0 + REG_SET, MISC0_REFTOP_SELBIASOFF); - regmap_write(map, TEMPSENSE0 + REG_SET, TEMPSENSE0_POWER_DOWN); + regmap_write(map, data->socdata->sensor_ctrl + REG_CLR, + data->socdata->power_down_mask); + regmap_write(map, data->socdata->sensor_ctrl + REG_CLR, + data->socdata->measure_temp_mask); + regmap_write(map, data->socdata->measure_freq_ctrl + REG_CLR, + data->socdata->measure_freq_mask); + if (data->socdata->version != TEMPMON_IMX7D) + regmap_write(map, IMX6_MISC0 + REG_SET, + IMX6_MISC0_REFTOP_SELBIASOFF); + regmap_write(map, data->socdata->sensor_ctrl + REG_SET, + data->socdata->power_down_mask); data->policy = cpufreq_cpu_get(0); if (!data->policy) { @@ -626,16 +797,20 @@ static int imx_thermal_probe(struct platform_device *pdev) data->temp_passive / 1000); /* Enable measurements at ~ 10 Hz */ - regmap_write(map, TEMPSENSE1 + REG_CLR, TEMPSENSE1_MEASURE_FREQ); + regmap_write(map, data->socdata->measure_freq_ctrl + REG_CLR, + data->socdata->measure_freq_mask); measure_freq = DIV_ROUND_UP(32768, 10); /* 10 Hz */ - regmap_write(map, TEMPSENSE1 + REG_SET, measure_freq); + regmap_write(map, data->socdata->measure_freq_ctrl + REG_SET, + measure_freq << data->socdata->measure_freq_shift); imx_set_alarm_temp(data, data->temp_passive); if (data->socdata->version == TEMPMON_IMX6SX) imx_set_panic_temp(data, data->temp_critical); - regmap_write(map, TEMPSENSE0 + REG_CLR, TEMPSENSE0_POWER_DOWN); - regmap_write(map, TEMPSENSE0 + REG_SET, TEMPSENSE0_MEASURE_TEMP); + regmap_write(map, data->socdata->sensor_ctrl + REG_CLR, + data->socdata->power_down_mask); + regmap_write(map, data->socdata->sensor_ctrl + REG_SET, + data->socdata->measure_temp_mask); ret = devm_request_threaded_irq(&pdev->dev, data->irq, imx_thermal_alarm_irq, imx_thermal_alarm_irq_thread, @@ -661,7 +836,8 @@ static int imx_thermal_remove(struct platform_device *pdev) struct regmap *map = data->tempmon; /* Disable measurements */ - regmap_write(map, TEMPSENSE0 + REG_SET, TEMPSENSE0_POWER_DOWN); + regmap_write(map, data->socdata->sensor_ctrl + REG_SET, + data->socdata->power_down_mask); if (!IS_ERR(data->thermal_clk)) clk_disable_unprepare(data->thermal_clk); @@ -684,8 +860,10 @@ static int imx_thermal_suspend(struct device *dev) * temperature will be read as the thermal sensor is powered * down. */ - regmap_write(map, TEMPSENSE0 + REG_CLR, TEMPSENSE0_MEASURE_TEMP); - regmap_write(map, TEMPSENSE0 + REG_SET, TEMPSENSE0_POWER_DOWN); + regmap_write(map, data->socdata->sensor_ctrl + REG_CLR, + data->socdata->measure_temp_mask); + regmap_write(map, data->socdata->sensor_ctrl + REG_SET, + data->socdata->power_down_mask); data->mode = THERMAL_DEVICE_DISABLED; clk_disable_unprepare(data->thermal_clk); @@ -702,8 +880,10 @@ static int imx_thermal_resume(struct device *dev) if (ret) return ret; /* Enabled thermal sensor after resume */ - regmap_write(map, TEMPSENSE0 + REG_CLR, TEMPSENSE0_POWER_DOWN); - regmap_write(map, TEMPSENSE0 + REG_SET, TEMPSENSE0_MEASURE_TEMP); + regmap_write(map, data->socdata->sensor_ctrl + REG_CLR, + data->socdata->power_down_mask); + regmap_write(map, data->socdata->sensor_ctrl + REG_SET, + data->socdata->measure_temp_mask); data->mode = THERMAL_DEVICE_ENABLED; return 0;