From patchwork Tue Sep 18 06:19:06 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Anson Huang X-Patchwork-Id: 970964 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=nxp.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="JQNhXf6D"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="wS1RVlJx"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42DtKp71QWz9sCD for ; Tue, 18 Sep 2018 16:26:06 +1000 (AEST) 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=mZUvcSdPd5q7C/oi8KB5vrrnwOwF7HFibJTB9netWic=; b=JQNhXf6DLrxwk7 OkiYrc2reyxQ+9RSBb6MWqeVa1vlTM/8yCfEuwUW8vz0VF8WNlCczwhyU5M8mmrwecJH2DfpBIYDW hAvFUEjhane0l97aut34FXUL3HWM18c/zxJ1HOmEy6Zy4zbnY+wR1cW6LHfZcTgSBXMhOhZ0E2/hx TQVbasFkqYSvZ8/XifU7XQ99yEnWE6Dv03GK/xZs7fwQpI/Bw2cd86xLdqh6wAZNs6oBkrFCbU2Gn PEFWZzxYFN45RxF9/edQNj6QUH933K9mxS1qukV8skg/DrkVfC8WOEl0I4FImyZPWAtNlS91qnGgF PbhD+vtkQagNI2OZF76A==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1g29SO-0000ej-Qp; Tue, 18 Sep 2018 06:25:56 +0000 Received: from mail-eopbgr60052.outbound.protection.outlook.com ([40.107.6.52] helo=EUR04-DB3-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1g29Qt-0007CB-2H for linux-arm-kernel@lists.infradead.org; Tue, 18 Sep 2018 06:24:28 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=nS6zmtPpJX0mAscP8F2uy/cKsZTsc4He2u2hCKTJeDk=; b=wS1RVlJxB2e6Kgrda5sWdCr0WFvRHMgZSSfPWwoNph90HHGxGegN1lfDHVIJ18UQTKjXPC96sSUXuP5YcsvZraNtVbo3/jJTVgK4FTuSL2Zf23USYu4AkXnMHWF/eJ7tcrRKCoN821Ln+rJx5m7Urqrax1t+wUZTLAUozU3k6tE= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=anson.huang@nxp.com; Received: from anson-OptiPlex-790.ap.freescale.net (119.31.174.66) by DB3PR0402MB3915.eurprd04.prod.outlook.com (2603:10a6:8:f::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1143.18; Tue, 18 Sep 2018 06:24:10 +0000 From: Anson Huang To: robh+dt@kernel.org, mark.rutland@arm.com, shawnguo@kernel.org, s.hauer@pengutronix.de, kernel@pengutronix.de, fabio.estevam@nxp.com, linux@armlinux.org.uk, mturquette@baylibre.com, sboyd@kernel.org, ping.bai@nxp.com, Aisheng.dong@nxp.com, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-clk@vger.kernel.org Subject: [PATCH 2/4] ARM: imx: add i.mx6ulz msl support Date: Tue, 18 Sep 2018 14:19:06 +0800 Message-Id: <1537251548-27845-3-git-send-email-Anson.Huang@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1537251548-27845-1-git-send-email-Anson.Huang@nxp.com> References: <1537251548-27845-1-git-send-email-Anson.Huang@nxp.com> MIME-Version: 1.0 X-Originating-IP: [119.31.174.66] X-ClientProxiedBy: HK0PR01CA0039.apcprd01.prod.exchangelabs.com (2603:1096:203:3e::27) To DB3PR0402MB3915.eurprd04.prod.outlook.com (2603:10a6:8:f::30) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4778ba2b-08e6-4235-c832-08d61d2f5bc7 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989299)(4534165)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:DB3PR0402MB3915; X-Microsoft-Exchange-Diagnostics: 1; DB3PR0402MB3915; 3:6ud4VsbtcJP1UzuF85LYOsXTNqieIrmZA7UXPgO4fmB5Un040uh/a0Irm8aurDfNbLc7+EEy3+6pMTl+Z35ZbvGg3BGP2LyUVnV9BWY/GmWDDcPedV18vebIPJXkiT0RhBwYEopA36YJPIiQDBB2cqb9fbRCy6ahW3PvXwC9NQ9ounA9qVfVlxUFOu8tbFtevnwGtZAk4fEv+Mtf3imu/Rn0DvMRq81vsRoE1aN95Ige/rIPPecyM+0uw4WCcGax; 25:o55tD4oQR3lL3/UdKmNGJAlBH2z0H5yB6S4V7LeEWF+1cItomMk7WMWNKNINiKJge2paVbeNKI/OlwohBkIsmdpWjC4RQzEkAjvB45Q1M/dxOfxyY4dCRBfK431Xj6tcLVEsNyAeEoNdH6rXug+xupX2sfUo1YEZ8avAzC6D6KbVDiGtx34KImWXJac+LSjzUMZDwDavMEAkG8O7+Rs6JDHW8LHp/65wnfv3ivR89RRWiBkRfo5C3wMxCYUChpLWDQ1c/AVdOV8QNTmjsevdBnOEjiO8gwcCIbJZ4P5N/kAUZirSAcOoVlkqNH3Y42ewrGfwtwVxYUeFJ3WbNyPsoQ==; 31:lEKIy7orJIUyWfNin+ks6LwufNFR4rTgvAvx3ezN4MxPHUKDY6hWrlwlkyu5xLD/9pDQhjZ+s+UrXmuJBzCvUsCsm6UU+YL4y446ghpoLLV/ZquDfJ8YnWxs/wpy8p2I0+YziuAkTtydIwIvHvPgtWd4lv3VWIf3R7ZaBSIuqLFR/5hkvMnFkgSp3WXaiO5TeostmstKdlFxboK9OOLUDCQGplkfy/USNccYFzq3kzE= X-MS-TrafficTypeDiagnostic: DB3PR0402MB3915: X-Microsoft-Exchange-Diagnostics: 1; DB3PR0402MB3915; 20:mQQSCmo9FiEcEII5ekUiBMhax6waCyAKrcly1XYIu4nwpKimVNiOmHzYpwf2DCZVIOEqSKmjY1eavBo7MOkMIqnmqXe+rZ71xUtQtpWRmjj1NBnnwYhWT0DS88ryGSne3suHQ/WKp8T+wm/nXIqrBIO4bcNaMwV2+Cq0eBDJbbjf6S/aW177nCXK8RuAGb1SPyeJtSejPLqAzBUFjnrSzvobwlEd94RWyIFIrk/53SnDx9Qtih1AB8MBNcOHdoSaiQXVROkmF3Ca5VZ7N7WqrhVYh8EaNdhDF94VsyncFiM5ndEi40RIw1d6eoQCpFGhOwSg3JgN7ypmA04NTB+RKhyz4Me8333FaPjMlR9D/DuWoIIm/lVgFH4oVnvPdNgyFML8gA2JMunS8Je5BLD/W634oGZjK2SxXZ8BO2fT91E6Zko74J2nkFzOkU/NgOSxB0tF2sJ4g8qaNV/386udLa9pslVa74FwpFKyXfJmFus8WfFrmBWx1zT+OYUsWhIS; 4:XcwOFrExlPjpXqVoREa1myce254isRkZjag7pP5R9M8rVJxe0BvGT8Otn1KSzZ5g8nV11WAqLjRbs0xpkHBdyhEghxrIzjoAM3IgUNxQEAF5BkGTNZ8zZTrk2OWqRTPSdAxbZDBSRk+5Ja6g2wPoAK14uaVkEY1MC4gJe06r9uZCIQM2xQv7ZBJwUUFyrLJtxbKa1906tWws5H/oSGIY47RNeyx7YyTkg7AEWcxridL/JeAGkE+0BQjBzUa+zefeaVZICTnnNRDTKZxfBVQy+QS4HE5cxaoOxxutwmmoZVsCwuf3KlqY4g4+nYp/NGqY X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(3002001)(3231355)(944501410)(52105095)(93006095)(93001095)(10201501046)(6055026)(149027)(150027)(6041310)(20161123564045)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123562045)(201708071742011)(7699050); SRVR:DB3PR0402MB3915; BCL:0; PCL:0; RULEID:; SRVR:DB3PR0402MB3915; X-Forefront-PRVS: 0799B1B2D7 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(346002)(366004)(39860400002)(376002)(396003)(136003)(199004)(189003)(186003)(50466002)(50226002)(8936002)(47776003)(105586002)(106356001)(478600001)(68736007)(52116002)(2906002)(76176011)(66066001)(5660300001)(23676004)(97736004)(6666003)(25786009)(305945005)(4326008)(7736002)(26005)(316002)(16526019)(6486002)(3846002)(6116002)(476003)(2616005)(956004)(8676002)(7416002)(6512007)(53936002)(6506007)(386003)(486006)(86362001)(36756003)(81156014)(11346002)(2870700001)(81166006)(446003)(921003)(1121003); DIR:OUT; SFP:1101; SCL:1; SRVR:DB3PR0402MB3915; H:anson-OptiPlex-790.ap.freescale.net; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; Received-SPF: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?utf-8?q?1=3BDB3PR0402MB3915=3B23=3ALb?= =?utf-8?q?TUte+SrdIbcIyzhc2OO3Y/o0JIezzYwX51pR9UVyAxW0ueJuHJOc2iZe?= =?utf-8?q?Yp+s0GVrxjNxysvzxpmwdHB8agmFdLh+ooeg+rJ2GAKc1ru6yUgJVjwk?= =?utf-8?q?eQo0pbDCoi+ae/D6zvmCsxn/lGk+UjDC5QgJYAyWwt9c6Dqilvv8CNEM?= =?utf-8?q?CNXDf/s9oY3i5hzJBXgNcrB2NQ2Ru9LhD7CRlKIxNLbbMPUakL77bXvj?= =?utf-8?q?0kCU9LDQa36spsXgYDSpY1tyK59mP69xh82oTku46tIJhSLBYgrOwdwD?= =?utf-8?q?UdLIWNhYallbFXki6IXztdJpyOqDFUp08XhqoeMsxWbBu884eu/qwClC?= =?utf-8?q?ZbmffdtCd/fzANHT7BfM0iw5ZxkjjzZkhyeT8rGfd57wMM5OkW+clQXE?= =?utf-8?q?Z5Tg7O2FPYjPmQSalgs0On2yE7a986KDRFvU1DPxorO/dMrJlJ8Pv1Xf?= =?utf-8?q?Ld9g8k/RXZ1U+3/8Q/NpfKs1NKmgVJ8TrNo++eRFKSlX4NHcqSC2geTC?= =?utf-8?q?WBKUuckKmy+gzydD3UZnsheGqVURxlX3lVQ1oNXFJDhSE/p0LDJQzzjl?= =?utf-8?q?EJSM2+bkxsbhjeM4LbZW7NXEDXOMm/iAoi7O3gbWzwcPZX5lS0f7LWBE?= =?utf-8?q?D0Ay/ut7ANxOTlSax6EMvN7YdydKD9n97iQ00JkIuWBSnwXSDTBhYHhj?= =?utf-8?q?PpKGvZrRAdb1Qs4MypQGiBr0zOf83eKIpfVE+yiph0CVri+CK3Ov36BC?= =?utf-8?q?Dv/l2e/PW0aLDcCAPmuERcV95JqF+aNdpjtEajKJCob3NpjY751fIwsA?= =?utf-8?q?e0NACDxNXJbeBCrI2Xlc1BG+/KE8mDIgrngmVx2UCWXRbdz9gI5FCHHH?= =?utf-8?q?PtlKElsWBlcRTp4R+Rjz/LKfF2tR544maruZYUiEsQBCvcf9XMOl0Rsh?= =?utf-8?q?YfdANVHn/s60X9FB7MZQIFzfxzI5+9wol4hWsW/kOOIKtoJv+sX2wtU3?= =?utf-8?q?wO4jMniKHp9EA8jtcTLVUm7ect6w9CAqI0KT4b8lCQNXzIM02WMl0Hun?= =?utf-8?q?UHr3DHxJKAmn0/jEDv6lCd5OCzGlsp6nn/ASCKF17sit6fNINOGz4Pix?= =?utf-8?q?J6OqJ5ZxULoJVnGrZhR6Z5/RiolNQtHhqeUmRkYG3oMQS/BuI6pH9Tfd?= =?utf-8?q?a7nRRvWCGFpT0kFZGRm+wGyG/374Fix0CegSTVnmkv6DjvnLuy1DCPAf?= =?utf-8?q?xqQpx9kKovD7MUYbY=3D?= X-Microsoft-Antispam-Message-Info: JGgGwqDW1SlzdWVO2YMGUkyjZz9mubV89q4KQrLYvqy+xQKkLQIc6iHKkULlJZ3/sHmeN70Cj1Yag7y/LXsR9kSRiY8KT6xGyuc68M4uE65yD19iMzGWifOERpPX5MkirOH+Ij01HHxny18IuRaAHn3pcjqyVsJRn0WcMcaxDQMd3dnV4j/29nWIDTMy6V/KGniNOQfGjEt3XfjAvP3bBFBT7o2Jh4NSdnY9PO7bOjFRRhHTczrFRNOUBE98g7WDRTQHBnFGdpcK6gOOE1LDKb5YU8X5N0UEGb4S6as8OPDRr3JafyYlEg3pLbWaKCYlLly/Rs/kUayusSFBooGw3YO69pGQdLFTABSIINFglzI= X-Microsoft-Exchange-Diagnostics: 1; DB3PR0402MB3915; 6:TmhElVSrh/kcQpMqjlgcwaXogmyMHnwPR95BXSquamCyIzGuBqBmgHE+CiPZf3JhUP3xwwdaJS+uwuPtdM12kJlcqW30LCFCHbtND3p8Elt0xDwSxNiPw0XDdmm/avGaxy4pE9EhwGKwCp7TqFXT9XE+G4pIehenCk+BvY5tmg9VTlyHbcGKUgKETzAyiccMXJI3lGYJUEiv1GqJp2/E+2j3oJR5ekmhZZvh9Mk8Ph8Z3/7W4tKtKhpBjTPzws7AP4Kv431+a7YMcQZcJfjqnCZTgptowf+xGoOgcfjoFHow45xppixQstjIp6u2xEmtbAeg5MQ9QC9u0cHQtfdJ0ZO/dRuvNc/W4ZuQosasVZ2p5cU38Q9q3G28K8EE/6RlJStSFsaVIwCp3GJD/FMDWRvxv9Gx4A9bTDSECIwFLSokqwOJ0Mr+5Mq6aDHn2hCCNHXibirO03phxWNmswFZDA==; 5:7zGxmAlBCoGbH2OvcWEr8Yqxgow/VqoNEcB5vW3VsJW9GvYrseDiDsUp46jAL3mSCa4onf4KwKX2nc7kK+F4qs4ohHZJXwdIifBMpYrQqB7IhFnuOsCYk9c8TUiAxrU5HBnIZOPHwfyPbxPRuAOuaKH7KjG0U1kYHbjenXnUG2Y=; 7:JR3v0xsnkaq3ICUqgaWbu0kpIac7ZrNocDQWArYKOSTEiI6MNKh93Rtyy5Y+iTfvMsZR0qJ5TAOzcwfKp8l3Bebih+dZNRuvBEBPTIzEkWhU6d4m8Jzn78pz5+/MYS8jVIarH7QbDf6229tZVdBuM1CoG64/kdWnds2EhMfH2oUTJddZS39PQI7xuOw3Sy+yP2DAxwQiUvTLp6Jgdi69YBhk6oO1IesAL5ACKlKHJ0u6Ten24NVOZ8zqLm1K0m4+ SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Sep 2018 06:24:10.0018 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4778ba2b-08e6-4235-c832-08d61d2f5bc7 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB3PR0402MB3915 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180917_232423_133485_AF95A5C2 X-CRM114-Status: GOOD ( 15.73 ) X-Spam-Score: -0.1 (/) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-0.1 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [40.107.6.52 listed in list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Linux-imx@nxp.com Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org List-Id: linux-imx-kernel.lists.patchwork.ozlabs.org The i.MX 6ULZ processor is a high-performance, ultra cost-efficient consumer Linux processor featuring an advanced implementation of a single Arm® Cortex®-A7 core, which operates at speeds up to 900 MHz. This patch adds basic MSL support for i.MX6ULZ, the i.MX6ULZ has same soc_id as i.MX6ULL, and SRC_SBMR2 bit[6] is to differentiate i.MX6ULZ from i.MX6ULL, 1'b1 means i.MX6ULZ and 1'b0 means i.MX6ULL. Signed-off-by: Anson Huang --- arch/arm/mach-imx/anatop.c | 20 ++++++++++++++++++++ arch/arm/mach-imx/cpu.c | 3 +++ arch/arm/mach-imx/mach-imx6ul.c | 1 + arch/arm/mach-imx/mxc.h | 7 +++++++ arch/arm/mach-imx/pm-imx6.c | 4 ++-- 5 files changed, 33 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-imx/anatop.c b/arch/arm/mach-imx/anatop.c index 61f3d94..45d618a 100644 --- a/arch/arm/mach-imx/anatop.c +++ b/arch/arm/mach-imx/anatop.c @@ -31,6 +31,8 @@ #define ANADIG_DIGPROG_IMX6SL 0x280 #define ANADIG_DIGPROG_IMX7D 0x800 +#define SRC_SBMR2 0x1c + #define BM_ANADIG_REG_2P5_ENABLE_WEAK_LINREG 0x40000 #define BM_ANADIG_REG_2P5_ENABLE_PULLDOWN 0x8 #define BM_ANADIG_REG_CORE_FET_ODRIVE 0x20000000 @@ -148,6 +150,24 @@ void __init imx_init_revision_from_anatop(void) major_part = (digprog >> 8) & 0xf; minor_part = digprog & 0xf; revision = ((major_part + 1) << 4) | minor_part; + + if ((digprog >> 16) == MXC_CPU_IMX6ULL) { + void __iomem *src_base; + u32 sbmr2; + + np = of_find_compatible_node(NULL, NULL, + "fsl,imx6ul-src"); + src_base = of_iomap(np, 0); + WARN_ON(!src_base); + sbmr2 = readl_relaxed(src_base + SRC_SBMR2); + iounmap(src_base); + + /* src_sbmr2 bit 6 is to identify if it is i.MX6ULZ */ + if (sbmr2 & (1 << 6)) { + digprog &= ~(0xff << 16); + digprog |= (MXC_CPU_IMX6ULZ << 16); + } + } } mxc_set_cpu_type(digprog >> 16 & 0xff); diff --git a/arch/arm/mach-imx/cpu.c b/arch/arm/mach-imx/cpu.c index c6b1bf9..c73593e 100644 --- a/arch/arm/mach-imx/cpu.c +++ b/arch/arm/mach-imx/cpu.c @@ -136,6 +136,9 @@ struct device * __init imx_soc_device_init(void) case MXC_CPU_IMX6ULL: soc_id = "i.MX6ULL"; break; + case MXC_CPU_IMX6ULZ: + soc_id = "i.MX6ULZ"; + break; case MXC_CPU_IMX6SLL: soc_id = "i.MX6SLL"; break; diff --git a/arch/arm/mach-imx/mach-imx6ul.c b/arch/arm/mach-imx/mach-imx6ul.c index 6cb8a22..4ffe3c8 100644 --- a/arch/arm/mach-imx/mach-imx6ul.c +++ b/arch/arm/mach-imx/mach-imx6ul.c @@ -90,6 +90,7 @@ static void __init imx6ul_init_late(void) static const char * const imx6ul_dt_compat[] __initconst = { "fsl,imx6ul", "fsl,imx6ull", + "fsl,imx6ulz", NULL, }; diff --git a/arch/arm/mach-imx/mxc.h b/arch/arm/mach-imx/mxc.h index 026e2ca..b130a53 100644 --- a/arch/arm/mach-imx/mxc.h +++ b/arch/arm/mach-imx/mxc.h @@ -40,6 +40,8 @@ #define MXC_CPU_IMX6Q 0x63 #define MXC_CPU_IMX6UL 0x64 #define MXC_CPU_IMX6ULL 0x65 +/* virtual cpu id for i.mx6ulz */ +#define MXC_CPU_IMX6ULZ 0x6b #define MXC_CPU_IMX6SLL 0x67 #define MXC_CPU_IMX7D 0x72 @@ -80,6 +82,11 @@ static inline bool cpu_is_imx6ull(void) return __mxc_cpu_type == MXC_CPU_IMX6ULL; } +static inline bool cpu_is_imx6ulz(void) +{ + return __mxc_cpu_type == MXC_CPU_IMX6ULZ; +} + static inline bool cpu_is_imx6sll(void) { return __mxc_cpu_type == MXC_CPU_IMX6SLL; diff --git a/arch/arm/mach-imx/pm-imx6.c b/arch/arm/mach-imx/pm-imx6.c index 529f4b5..87f45b9 100644 --- a/arch/arm/mach-imx/pm-imx6.c +++ b/arch/arm/mach-imx/pm-imx6.c @@ -313,7 +313,7 @@ int imx6_set_lpm(enum mxc_cpu_pwr_mode mode) if (cpu_is_imx6sl()) val |= BM_CLPCR_BYPASS_PMIC_READY; if (cpu_is_imx6sl() || cpu_is_imx6sx() || cpu_is_imx6ul() || - cpu_is_imx6ull() || cpu_is_imx6sll()) + cpu_is_imx6ull() || cpu_is_imx6sll() || cpu_is_imx6ulz()) val |= BM_CLPCR_BYP_MMDC_CH0_LPM_HS; else val |= BM_CLPCR_BYP_MMDC_CH1_LPM_HS; @@ -331,7 +331,7 @@ int imx6_set_lpm(enum mxc_cpu_pwr_mode mode) if (cpu_is_imx6sl() || cpu_is_imx6sx()) val |= BM_CLPCR_BYPASS_PMIC_READY; if (cpu_is_imx6sl() || cpu_is_imx6sx() || cpu_is_imx6ul() || - cpu_is_imx6ull() || cpu_is_imx6sll()) + cpu_is_imx6ull() || cpu_is_imx6sll() || cpu_is_imx6ulz()) val |= BM_CLPCR_BYP_MMDC_CH0_LPM_HS; else val |= BM_CLPCR_BYP_MMDC_CH1_LPM_HS;