From patchwork Mon Feb 5 08:12:27 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anson Huang X-Patchwork-Id: 10199977 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 B8A3460247 for ; Mon, 5 Feb 2018 08:16:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A6A5128685 for ; Mon, 5 Feb 2018 08:16:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9AB6C28687; Mon, 5 Feb 2018 08:16:09 +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=-4.2 required=2.0 tests=BAD_ENC_HEADER,BAYES_00, DKIM_SIGNED, DKIM_VALID, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.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 47CBB28685 for ; Mon, 5 Feb 2018 08:16:08 +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=01iqd+5CPcTVx9Rk3ugfX58Y2v5r1dw+TogVdgmLAfc=; b=DBoPD3r4CCvHJl Z67ZnWNNV65CcgNHdqHy/8BTEfsTijUj6y5FpNRynxKNnGfg8C1vFrb+IBNIcIaVCR09uUuEY3aOx f4yInTwk3Q2A2dY8qiAU8Pm8VS8W6TAPV0/3DLWbxI9+yWNwqFFegnn4+DfX/EMF76EkMHF4lHCQf 3jHVe+ODp7tFdAMF4sGGD1gEN2btP9Of9Zjj+Idg+PDU0188k8Hnc2u2QFoMbZS4egCI63oBNknK0 SIuh3nu9S4fDDvvX8/EzvodKbmOkgz/A5AXvqXsQKPWVNFJkaqYFIWdCIRum6oQRbFL3WDDDEGe7T Df+QiJY4ZdSAVlpRqDmA==; 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 1eibwc-0005Fv-Hp; Mon, 05 Feb 2018 08:16:06 +0000 Received: from mail-bn3nam01on0088.outbound.protection.outlook.com ([104.47.33.88] helo=NAM01-BN3-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1eibwN-0004yn-Jm for linux-arm-kernel@lists.infradead.org; Mon, 05 Feb 2018 08:15:56 +0000 Received: from CY4PR03CA0009.namprd03.prod.outlook.com (10.168.162.19) by BN3PR03MB1413.namprd03.prod.outlook.com (10.163.34.20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.464.11; Mon, 5 Feb 2018 08:15:39 +0000 Received: from BY2FFO11FD030.protection.gbl (2a01:111:f400:7c0c::117) by CY4PR03CA0009.outlook.office365.com (2603:10b6:903:33::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.464.11 via Frontend Transport; Mon, 5 Feb 2018 08:15:38 +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 BY2FFO11FD030.mail.protection.outlook.com (10.1.14.211) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.464.8 via Frontend Transport; Mon, 5 Feb 2018 08:15:38 +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 w158FRdi021393; Mon, 5 Feb 2018 01:15:33 -0700 From: Anson Huang To: , , , , , , , Subject: [PATCH V3 2/2] thermal: imx: add i.MX7 thermal sensor support Date: Mon, 5 Feb 2018 16:12:27 +0800 Message-ID: <1517818347-7436-2-git-send-email-Anson.Huang@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1517818347-7436-1-git-send-email-Anson.Huang@nxp.com> References: <1517818347-7436-1-git-send-email-Anson.Huang@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131622921382217649; (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)(346002)(376002)(39380400002)(396003)(2980300002)(1110001)(1109001)(339900001)(189003)(199004)(50226002)(81166006)(81156014)(48376002)(5660300001)(50466002)(106466001)(54906003)(26826003)(85426001)(110136005)(8936002)(2201001)(2950100002)(8676002)(6666003)(68736007)(72206003)(356003)(105606002)(77096007)(26005)(305945005)(76176011)(4326008)(86362001)(16586007)(53936002)(316002)(47776003)(498600001)(51416003)(104016004)(97736004)(336011)(59450400001)(2906002)(36756003); DIR:OUT; SFP:1101; SCL:1; SRVR:BN3PR03MB1413; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11FD030; 1:9To216iQDG+6pggiGPfLCbxx/WI4oJSWgQW/HZ/gA2ik9YhAYJ4h5KnUJ0z1ewRMOBxw0Qx8lbdrGHvz+/gipFEfYV2H4wfa2xZJnQV5A5Yg1O50aWaCHlPloKbGgWjS MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 0e1e4d30-ffcb-49a8-47b1-08d56c70a3c0 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(5600026)(4604075)(2017052603307); SRVR:BN3PR03MB1413; X-Microsoft-Exchange-Diagnostics: 1; BN3PR03MB1413; 3:UV0LWEuaNO/mlpW4iCStFeZy8ofm978iSXavUg7QhGa5Ae6dUSX8WJWPsPzeIe3EzJRCN1HdcaxdpjF/52a7d41zkPcMuiWzaMwiXS6J+Zp6LGZq4lZm9DXLoqdz7wQHMw2HQfdZC2bBhHRPZjVGL/E7jf3vmNpggMKbLGeaP25Ksfa1WpsIa7QFCVacdeb3z0IxVW+exDtfk2P3ZxX2SxnCIxD7UOgWfgL/VxboYvnPphH19ftKYZmc4aPwN7a89z09ZoTfxTL/rxsa0Qel8Cl/deMHRO4/BRakWqcgKcUSgNlfMl4pZRhpceZ9RQp0FlF3f+4w0voc2UcUbqg7iNtRvZ+iOUKgIuXE+bb+4ew=; 25:3cXiFFI5FMb2iD4pa+YQE9JPfC5Npx4G+3qAaINenexiW6D2EynKgBducH0ulRyAKjCb4nPP+AjVb2GXCNuKIIsO1WK1XBmKWfDxheeEzm/dtRL7ezLPmBKfvrSarjRf98rJFP2przGG8rKqeUoA0SqsO3MK2P5/KpMBTPZT1DcBnP3ABZ8KVluAF1bNo5b4J9ubm7RKEf9S+KVz8uSwcE+FoLTAPJ4o6DXnhTJ10DY4Ebssns0+36ygeO+w/DgtH72H5cC5e7Oba6Ues+MfW/SWMpZxpOU/vKWSFLfzoKv7XOrbxOByWwlBI6Dego7Ys3MY76tve3lYp6WZwmNdaQ== X-MS-TrafficTypeDiagnostic: BN3PR03MB1413: X-Microsoft-Exchange-Diagnostics: 1; BN3PR03MB1413; 31:KGCb2a5Mk431iyMjbLvB6EoaR2tVnAhxNqNGotEshewOVjMloEMz6uIwM//c0Irq4HN3RBD6gpOs8ov0VzGMxTCZG3Y0nI7cstGswMlcNuh+jTxqlvXSrNY/Ul91GgFC1Vgs044/DSI/KG4gII4AxaJbrUeRqzy6zt6e7y9z21gqM6/+9gJJLEmGJ78/gqtVvm3EkbbfgE6AS054OhWLuN+DvUdMbde3DME4Du+pe58=; 4:V/aVmPKbeQsYBTKKIDSA+UyPJmaEm99ENsDx4iJ4VaNU0psp1QMEVI4pQeu6CG6Aq2Rk4dzgVAciExdpKg3ia/DU3/qXbj/qL2cuJlh+1+1iVkv9R3dUphhk3kdRczKf5Y+xOJLBwI4fnsLjsjbtdYp9YZ5o506B2vKWKDGD5Ha9TZQawKmLcM7qBXTM71qiXDMXKASbz5skYCQHnjfyhopaHht5vNrczkrfO3aoBs8CW5YxHhbvl4UmYBXnPVdW9hBwuP/VDnoCCZ28bQmnvVK/2Dl07brN9jG26AW4AKezPNkDwiFW86eVI49ZJjFk 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)(3231101)(2400082)(944501161)(3002001)(6055026)(6096035)(20161123561025)(20161123565025)(20161123563025)(201703131430075)(201703131448075)(201703131433075)(201703151042153)(20161123556025)(20161123559100)(201708071742011); SRVR:BN3PR03MB1413; BCL:0; PCL:0; RULEID:(400006); SRVR:BN3PR03MB1413; X-Forefront-PRVS: 0574D4712B X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN3PR03MB1413; 23:wZgstv8WgVTvuZ7kVaObjHyCsZsbtH5pvsTJmORp2?= =?us-ascii?Q?3fvrDN+xV9gcHs+1X8ls2r7tPqlFqt9TuiQrHV7cJiVFDXWtKeOz3aRKnzPk?= =?us-ascii?Q?r/yFO3kZFhX3GZ+bJWIDe3nGFlYTxaeHIFcvghGyN/92DWBBnc3urWO87ovt?= =?us-ascii?Q?TuyqtZq+ed8a6gcDHfRqJ/OyDIyjR0p4n3Cit1YpC4uqwCVUPHLFXWJg2NOZ?= =?us-ascii?Q?ZJf02UT54MsOaCqW2OTCz9HGuKLSa6usByqwD5NNqDLnm1NMKuMScJ7bFvhP?= =?us-ascii?Q?cswHgjDwB9I2mXLAFrdQL2Ticz9preTI5aucmWwkZlE8HX/uqNklz2Di+OnO?= =?us-ascii?Q?b72YKbLAn3xTl+m866No4qlqM84Usi3KdxkG/Tpd3VRCpwutnzyKwS68zKgi?= =?us-ascii?Q?11EcJvR3HiCepWuPeLQkDgn/b40tk/pGgodaKsdT7wzDpNoQxvx+9Xv3rSBb?= =?us-ascii?Q?s5FaNJo+KyY4Kl1NfNZyF+tBph+gvZf7Ok6CUdBsCyxA9QMdtfg5BZ7zoxBo?= =?us-ascii?Q?7mXHrq2Z/hTOKlu3/0r/X9bIkHTyyN940ikOd66eKKi7rl2Xy7vSDMPkq0LM?= =?us-ascii?Q?nM2TTn+iTNhkv8lr+FtRx8V2iJS0pni9fpNVbOL8Ol20FVbUHKxS7fJnQPgq?= =?us-ascii?Q?9SdUkrYYsh9Gpoh6ExvzC6p86LFmiz/C4QcY65QFY2G6cBJsscF8ijn+nxFF?= =?us-ascii?Q?EG5daogsii+Uo3WP9Lo9KRnKXvN4DHdxu9Z65mGMZqQ7IgMezx/n47P95xIA?= =?us-ascii?Q?KOf5I29+1CA0OM74TqXc4eFfZ/wDCpOQ+JxGqDnOkG/AUY2pjTo5WFjNoD9l?= =?us-ascii?Q?HVkqQC3MkGp4j1dG5YSqASp1q9/LmpyK0ubRjIfldlCW5p20ZGzNBpLhM8pI?= =?us-ascii?Q?58E/p6+AAE/8wryqtShwmvhQH2jDrF5JXVGH/J5zffycL6sTNCWYN7ru+n4C?= =?us-ascii?Q?FwlIzBSgtM++fvN1QBBWPKYVhoQg50yGP1siOiSwvwzVLrj3L7o1V8uzjQuq?= =?us-ascii?Q?B1xwGuCmjxQXv4xG+0cOiWQmTAx8Irha0bSchzyx7aMLadXlfz9LDNIN8B1D?= =?us-ascii?Q?c4YjG6hkd/7i6hwLEXVJEtVjtw3rlKjdZTiicus+cv/Yh/hSuyIr62SjskjQ?= =?us-ascii?Q?oJNH8tR+NC7fULTFpiVkSY2pIkhOXz4?= X-Microsoft-Exchange-Diagnostics: 1; BN3PR03MB1413; 6:VdD5RkWGy6WJmL0K/4mX/YInNV0a8mDk5jAq7nzO6x5ufNkTjLgogevt723OE6+8jH4UYfBe1NWrrPllqyiX/YkeZzzUl1m/0YUwOgFIZ79jVMPq2hv/GSKjQVxzSJOTwD6w6t7vTczoBC/kp4Pq1b7o8/ejnsUhdqnAoKFrHZ2ISP4KoVSSzzvcoJ+XWMFCxWRdi6lszUH9Xog5EPFvVelNg0YG6FyTbFFQgoN8rqF4BGo8R0cRkiMLqcro1Iyj499IepyGsS44dmwo8C/kgCUMVlb3Wzpmv5M5qfjfpvPqy7ayMu6CGORWyJftXQt7ceXlKranw5hbgcp0TKmMMvR+iSeVgrgjjn+A5QcPVUQ=; 5:KZPC/Tqzu98UrzWdPxxvtnNW917oN8Bxft2LUpkPtp1O0/ObCMlr4BS+ThAq5ri0+rcukg1wLRDPFEuTTfRXZpk60pTUnAoI60ex/AMkQ6VN98ZHF9T67w4ci4BdkWbuRYfhUyYsDDZDYiWGYnm2aBn8GC9B+dIjS5eYSuj0sdc=; 24:pIrmB7kED6taxKo5QfmXElAi10poCzvkgFm9T/klUAHKpLnanm3hTn4+akoP5dqaAVpsGHQFduHr6cZhpvW5uhgt2JlP8r4JsKf05Kernus=; 7:z73v8nqnkXAp8MiHxibBspLkanopLz+e9/+sQeVRgbHWGOYnwEnlCnn4XhLfV0i3OCHy7DW9s+CtlFSF8ALxKMAotcQgh5hdk8voSX1fjfKiKgecUX3CI+kuV2dI16MyQB+s0ZkpErocUmTGvQAHy6+sEvV1k8uAxYEoPryT2GjJkuyVjgj/OHySAmR7UKQR4DyUTiw7uJKArKwR3YyTPVHKmIzngk2FqJkCAhWggNKZTMBUeyqIh1u+uW3G14dg SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Feb 2018 08:15:38.0657 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 0e1e4d30-ffcb-49a8-47b1-08d56c70a3c0 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: BN3PR03MB1413 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 Reviewed-by: Rob Herring --- changes since V2: Add bindind doc changes in this patch according to review comments. .../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..79f97bc 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,imx7-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 e7d4ffc..c95fa82 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 { @@ -76,17 +100,114 @@ enum imx_thermal_trip { #define TEMPMON_IMX6Q 1 #define TEMPMON_IMX6SX 2 +#define TEMPMON_IMX7 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_imx7_data = { + .version = TEMPMON_IMX7, + + .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 { @@ -112,30 +233,41 @@ static void imx_set_panic_temp(struct imx_thermal_data *data, int panic_temp) { struct regmap *map = data->tempmon; + const struct thermal_soc_data *soc_data = data->socdata; 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_IMX7) + 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; @@ -143,16 +275,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; } @@ -164,22 +298,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_IMX7) + *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) { @@ -223,21 +363,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; @@ -359,6 +504,15 @@ static int imx_init_calib(struct platform_device *pdev, u32 val) } /* + * On i.MX7, 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_IMX7) { + data->c1 = (val >> 9) & 0x1ff; + return 0; + } + + /* * Sensor data layout: * [31:20] - sensor value @ 25C * Use universal formula now and only need sensor value @ 25C @@ -426,6 +580,7 @@ static void imx_init_temp_grade(struct platform_device *pdev, u32 val) 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; @@ -438,7 +593,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_IMX7) + 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; @@ -447,7 +606,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_IMX7) + 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; @@ -500,6 +663,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,imx7-tempmon", .data = &thermal_imx7_data, }, { /* end */ } }; MODULE_DEVICE_TABLE(of, of_imx_thermal_match); @@ -531,14 +695,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); @@ -565,11 +730,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_IMX7) + 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) { @@ -634,16 +805,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, @@ -669,7 +844,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); @@ -692,8 +868,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); @@ -710,8 +888,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;