From patchwork Sun Sep 30 03:32:26 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Anson Huang X-Patchwork-Id: 10621137 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id EBB21112B for ; Sun, 30 Sep 2018 03:38:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D906D295BA for ; Sun, 30 Sep 2018 03:38:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C691A294BF; Sun, 30 Sep 2018 03:38: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=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE 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 4C8F9294BF for ; Sun, 30 Sep 2018 03:38:09 +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=mmOeC7V9CFVNTLWSNIrQ4g2BnV5vJUI4EcRqJFtywJw=; b=dWkBPu+d8N5UPl uJQ8oTu6uvZcyMK0Q1Xruf43W5Z7NaXgbBOLXd1B8MNGIZ7sIB/g1+Ro/CdyjwM9mbSRXzatGxq4M e9Ipjuxi1x8+588h1veK9VbRmWAKp68aqYdNVSn+zy8UNGyHHqxOeB9WhIeThLnV6Xnl+lH8mMghN jbrgi+3pkKbhwZe9x4TVdHvX8jfRkr0ms8FH4dbApNnFxNBl/FUzVEWcvbbSJT93rGtT5L5I/P3/u j6uEhBiwwqQxEqeXykpI6KE8hHg2fhIT8xadCiwYSqeBNaU7O3GgmAub4rihWUOUwpZ2vdUaDHZi7 ZbVXhogmQX8K2Gwrs4aA==; 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 1g6SYX-0003X3-3V; Sun, 30 Sep 2018 03:38:05 +0000 Received: from mail-he1eur01on0082.outbound.protection.outlook.com ([104.47.0.82] helo=EUR01-HE1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1g6SXs-0003Fb-TQ for linux-arm-kernel@lists.infradead.org; Sun, 30 Sep 2018 03:37:26 +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=2cCRkX2Ud9k3UpCOh8Rd36jOqN9fw+tyfW/YUuw8uRg=; b=K8W3CbLw48OHxK5uPYXs5tdvREh3k6RY/bqBYyBNagGAOCOjFWeGya6VJAiZLRkQgWFQbw4iMf5XlX21kO1pFALRs0cT5SAe6PCj/yCLYHCJfrgWfLwtbOfMp7/EStHBoJcS5BYdll7qupBstS//MbH/MFOm6up/bFgQP0aVvIg= 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 AM6PR0402MB3909.eurprd04.prod.outlook.com (2603:10a6:209:1b::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1164.25; Sun, 30 Sep 2018 03:37:07 +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, ping.bai@nxp.com, Aisheng.dong@nxp.com, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH V3 1/3] ARM: imx: add i.mx6ulz msl support Date: Sun, 30 Sep 2018 11:32:26 +0800 Message-Id: <1538278348-7716-2-git-send-email-Anson.Huang@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1538278348-7716-1-git-send-email-Anson.Huang@nxp.com> References: <1538278348-7716-1-git-send-email-Anson.Huang@nxp.com> MIME-Version: 1.0 X-Originating-IP: [119.31.174.66] X-ClientProxiedBy: HK0PR04CA0023.apcprd04.prod.outlook.com (2603:1096:203:36::35) To AM6PR0402MB3909.eurprd04.prod.outlook.com (2603:10a6:209:1b::32) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d2591ea3-8e2b-42fa-fef8-08d6268601aa 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:AM6PR0402MB3909; X-Microsoft-Exchange-Diagnostics: 1; AM6PR0402MB3909; 3:OoHdk7DZv7SqURRaDsRzEKyOjFmoiNPr18TWGrhFimsiyT48caRDjMMABuNhan1V0q95Q6AddarINIQ5Nrvrk3NhVBaax9v4tmLSOnM+CBUVEpBHQlFCTNoRYVbMj7PO8R/2gJGtTDWytwbcO0jOaIkvZ1JhmVSvBObTaEV7pgeMqCzxGl7p/bDWUZsA68rYyF/hHnz39vQWm1e765KBUjJxy7ClRv8MaxyayM+SLreylgsOxXBOzaFyCxsHrYh0; 25:L7smpHEV2M5F+EizMWMh8M9p4ZW+ttwB57itjv8p4Prt3H/kw4ZpsPLHVhrEJW5iYQnlNepX5KIvtE5uj2IyiIDKuZ3eDR8+3mcZESTdo8giCixog8jMHtK4XtFQ6QY2OWqT/t82Wx9FgxieYpX46vG34UlePyX4ivz9PRr/DRuuXi9GbvwRWf13fRYJ1sIMm7WGPuA18uqU74ns+rR5ayko2KqPRNl4KosSEaXS/A+7Zupd1vXz1RrGKpwj34hG4aVcwDPq+FWj38YN1Z7bYuukzF9JlFACF+91f+lKSO4x2qNfXc1tDTapWgvU4dPfCWEA9CKIos6PkJdQI2bh7Q==; 31:fSJgaFWS31DAKpTk1tkJNnia+Ft/JedsxcvC/cKNK44wBo4kDCAJYDA80q3cKhSj/xWiTyZolDkzUCCN4lUSRkY66+SXDwzJXCE3nRq9krfQ8XIKVd/ac//SNGRCntXwAkDj7irWpa2pT89pvgl38Cd9vnmRwPRJfBnTURJfEtIsC4UPF0fHKwy4E6eLhkfp9uluwCuF2AYMk/PI80kB9G865qmUkS5SLpg+MtFZyQc= X-MS-TrafficTypeDiagnostic: AM6PR0402MB3909: X-Microsoft-Exchange-Diagnostics: 1; AM6PR0402MB3909; 20:DkjK8hY3g7I3yd6PGHnGpnkcsYZ4tYCZtre+7OYY6etH1OWG2CwwV8xDOOn88IfB3xLaJ3bih4dWIfjHeMLC9cvtusJFQHUyf2W9yPssffXHvbhRiVIN+lsBAPmAScrNNArcTOkbkXGLuInN/tgtXg21w8IepctyrB4npBxuBwldZ2slWGbsH1SzIk/kJh6E8LhE+pdot7OlTTP88M0bCb4HqxJGru4knkJVBP4llEK8x+Ihzawnurn/IbXHwk2gSio2r4EhfG3eXd63FjBPTke6R3fBjPJ/nJitD9IcL6FPqVv/kB8UVnH2MiTq/g1y/fiy4Rnkrrk6Y4B2xtpDlbLZo9tKM4WqjAozd9E+qM3rAy/cOHagjJWd0NtpZCI8dT0aXWZmc1dzs8TrbMCCItHTiMOcI8jDg9fNKvZv/omLIq6mXKS5JSUlnI/bDLX0Om6G+TX6veTDD7XahOk+EpMNHrJKYU+T5Pwk2VBppET92cNrmhC0v3DbHDRmts21; 4:9f50/dYOWre7CnSczomhgSr49C3wNUwCXv/WyUkJzwAHUKSA1sKCzAKu7p1Ub8mHz6VwO7i1JB+YyZwNHPbSvsqddKaDIA8og/AYDvQSrQYlZrXf8DVFAdROD12VyVcA1Zk3Y7DJFEIbPeiLwTQO3gVdpFXznhuGUT6z/V5BLN9rgk3hXXFj59yFnVA08g/sokQW36l6NR3Go0RyEkVe9IGwFl4HCOGvE/Ctg78wdihd46gkWnY6Ea5zrXz/yeqkIaa1UnJ/gpQvjJwX+2w2H00qxZCxgPcmct8cpB3eQZgB+TQZ9SIGLEGB8ih/niER 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)(5005006)(8121501046)(3231355)(944501410)(52105095)(3002001)(10201501046)(93006095)(93001095)(6055026)(149066)(150057)(6041310)(20161123560045)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123562045)(201708071742011)(7699051); SRVR:AM6PR0402MB3909; BCL:0; PCL:0; RULEID:; SRVR:AM6PR0402MB3909; X-Forefront-PRVS: 08118EFC2B X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(366004)(376002)(39860400002)(346002)(396003)(136003)(189003)(199004)(86362001)(476003)(11346002)(446003)(186003)(26005)(2616005)(956004)(16526019)(81156014)(81166006)(105586002)(486006)(106356001)(50226002)(34290500001)(23676004)(76176011)(52116002)(25786009)(4326008)(8936002)(478600001)(2906002)(66066001)(8676002)(305945005)(6486002)(47776003)(97736004)(53936002)(2870700001)(68736007)(6116002)(3846002)(6666003)(6506007)(386003)(5660300001)(6512007)(7736002)(316002)(36756003)(50466002)(921003)(1121003); DIR:OUT; SFP:1101; SCL:1; SRVR:AM6PR0402MB3909; H:anson-OptiPlex-790.ap.freescale.net; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?utf-8?q?1=3BAM6PR0402MB3909=3B23=3AZa82B?= =?utf-8?q?S1CPF+ACrXvR3vZ/UCcfI+69W0RDKKeiNXHHHbSOTHXI+UOsvIgXOXCiA5AZWZPDS?= =?utf-8?q?YwLTVOAfLw0gCNiFMwlng1sWlJSMgefGFmyrdNb+FwuFv0Ym1BC5kXMkqhlr8Wete?= =?utf-8?q?5rA/6GAKkioxwWpIb3xHAndaXocjwoZh86xX6B753IlD4yW8EYGe0hAGyqyR8efX/?= =?utf-8?q?XTdHzCXoIZ9xrkwO1wgFvmKYM87+FF7i0UVUXP2LrVFqMJp6Ak8/mat5GjlfAMri2?= =?utf-8?q?mw0EEpKBjBhmxA2KN//u9bIZ2HstzNoxHq0ftRODkhYQFncDmFxV786w4k+840684?= =?utf-8?q?m8zMx3SJ7Y9aUQiwaIWIYLkyla28qEhZrFsTCze4q2UvcixupFQaL1e5aSKXlAEsb?= =?utf-8?q?RSkPNpQIxycHD4qOKRbvUn6QSd7rHvA07tmhk71Jtmf0YZ5Oqzuddqg8lPKleOAxE?= =?utf-8?q?TNZnoDgcpDzM6WT+YdAloAkRguECbZTEvaa/h62DlwngfYRtfjrBy8eKBd0QWt+kK?= =?utf-8?q?0BC4taBBakhO2R9S3ppHCBAr5eQq0+y46q21lJvfEYL8q2W00MQPLUh4YgJGrK9QO?= =?utf-8?q?g8uoVjTE6qFaMdPVs6FHZO8xFN/6KSdswMlsBdUkskCrvIkhIU8Ucdxybk9vtI/iu?= =?utf-8?q?DhRJXOAASuePiMXmlXdxJCR0ywAvtbQCvBgH9X9B5qaSTz1LfgwQyCgXwVRntcV/n?= =?utf-8?q?ALkctCTEEb/HrwbXnPHywS8r3JndNCI+6nV/LwNKznZr//yrqTc1dkq/cT/G6YO9c?= =?utf-8?q?Uyf3kJq+WO0dqlItRU3cWfcVCDKxOa3CYKghz8TmkK76blAdGgPcvGgvuiXT+Salq?= =?utf-8?q?Zl78gryX+dAJzbaXkbGlxeSBE+QNSd3AhOSJFi8UttSczaT2bUDQcPsdXMiEG5uBL?= =?utf-8?q?hsMIiwfGYXrPvhhnmDlZHg/QoRosbUY0BFO7QUc9M6PcsNinFwo4G8nj8uSmGXSqn?= =?utf-8?q?XgHxSYDrGWPiyyliUXTuFfss0kM43x89c86nJYgINobh8VEKAV4w0RN4aDTqwXcQA?= =?utf-8?q?R4bL7IMDzML8XWAYz0VRV2+Mm/tLRCpxrNWwSin/LSXSsHSRBL3GHGxJXp7X07LNP?= =?utf-8?q?HoybXAfWj8UtQqds2iO7UpRl3CdMqCpSAOlWJaMRIvDZduSk/ukt6QobAjnwmbhJp?= =?utf-8?q?u9X6ks97AIhzXQbM7wTY=3D?= X-Microsoft-Antispam-Message-Info: GmDZemkkcIH3F8spWgWR7Pi3l260ZZKkIuiEy/auOw8orQ12pn/7ygequN9gt9k36TzkjxH8wBiQCJes+Wy95zRkkwpPQ8iJ01KGtr9XF7+8uN69v5n2hOuwKe1kZQnlZp7I55TemhpVGB05O+tZVUK+mGUQ1jlGWhyCSag0Ae4RQSHfDIB/XD14003SeXZCwKRFY82LWwEVbIGVQBcTcUvXZwHYn1utBTRJTJrNG6/dUM83N9PYgX1/JrmMU15XE0YjCLEDsooH/TcKwPkfMDs6kKMwQfGqvyTQWOxu9Xxur+0dSwrUQPxwUQi1/vRc298idXKWf/EJQoVYJciAgWqRQl7JK+kgeNRPCXiDJ8U= X-Microsoft-Exchange-Diagnostics: 1; AM6PR0402MB3909; 6:RGdGwze6xOEwRrQCjlYQEc8fMPFWAC+KuWUaJmb3nY/62si4EM0SwpNga4Qa2Hd0qvFf3764Tq5NgCk7DPITjnuD/xt2Cshj48PQeVC+XZPg0HPKT5s24988YE1uBIPdAznFVb/QXsGXJgsjNwuDjqfmVYsx6CnCueIrUqwrmKHVTEOvQZNEYKfjhyiJxVglxkCg7n0UF7O5bY03sryxUEJxZI/76JozWr/TbayaxzPynDraCXzZJ5uRZjiRBsrQsoLdvQ9kMMAGVps1eUtTY+SnaElq8P1tZpyQgBqnw/56rjEBY+QQJYTbe6Wqa+mfxxSKVbcKuJX0o+wtfHrCFaMaKgBzEjhgzkUecYLKpN/YfuOWjbyYW2NH94F+qqhdoHv6rO/NrOTieEsv4fE9rI4eggPzp8xbAdXLsrSnqaigUW0ZcbMAa2B7Xv/N4nlI6mZu1S6NuOzypHax5fOMXw==; 5:9P58LnCZpOXCbDAGUqprsTFEBdq3dljklGah+5Q7OqRKqTQfSQ1ol1a19LgjrWDQWwE2gJqH/e88kQS5CbLWdub45WZyURk0Ydu7aVqJLdCON5v/6jasQA7IN2E0+lJV8iDB3Ka/SAQQMpIIlBR6ao3gYnEFBZQmbij5dxFEW7c=; 7:YQ+AHDGExzXasmibjvnkLU53xDUX7Lj83F2Dsy1y2Jow+VH+0mNkQG+Crl45HRj7ZHlzlE6HywRfhxCDLckB7WZVUABWpTYiaCe3iSfg/r88P2ZIhXu2JrzWbbRsJUAydCBLCB8CvSTOAQdaqBWaYfOnIPBSYaqRUckNU2zjRdWiAle9zKF2XXDK74FxRHLSSGFeSyhoTUIWqZtvntl+t1/THiTp+xvkxg6TrsTQzOMAma/6NSA50Dkn1gmEiPFg SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Sep 2018 03:37:07.7043 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d2591ea3-8e2b-42fa-fef8-08d6268601aa X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR0402MB3909 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180929_203724_951385_6E820804 X-CRM114-Status: GOOD ( 15.22 ) 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-imx@nxp.com 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 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 --- changes since V2: remove "fsl,imx6ulz" on kernel side and add "fsl,imx6ull" into DT machine compatible to save code change on kernel side, as well as clock driver. arch/arm/mach-imx/anatop.c | 20 ++++++++++++++++++++ arch/arm/mach-imx/cpu.c | 3 +++ arch/arm/mach-imx/mxc.h | 7 +++++++ arch/arm/mach-imx/pm-imx6.c | 4 ++-- 4 files changed, 32 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/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;