From patchwork Tue May 30 15:57:18 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leonard Crestez X-Patchwork-Id: 9754823 X-Patchwork-Delegate: rjw@sisk.pl 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 8135B601D2 for ; Tue, 30 May 2017 15:58:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 70C6820223 for ; Tue, 30 May 2017 15:58:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 62E952807B; Tue, 30 May 2017 15:58:19 +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=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DA54220223 for ; Tue, 30 May 2017 15:58:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750929AbdE3P6R (ORCPT ); Tue, 30 May 2017 11:58:17 -0400 Received: from mail-bl2nam02on0086.outbound.protection.outlook.com ([104.47.38.86]:24420 "EHLO NAM02-BL2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1750904AbdE3P6Q (ORCPT ); Tue, 30 May 2017 11:58:16 -0400 Received: from DM2PR03CA0036.namprd03.prod.outlook.com (10.141.96.35) by BN6PR03MB2561.namprd03.prod.outlook.com (10.173.143.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1124.9; Tue, 30 May 2017 15:58:13 +0000 Received: from BN1AFFO11FD017.protection.gbl (2a01:111:f400:7c10::122) by DM2PR03CA0036.outlook.office365.com (2a01:111:e400:2428::35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1124.9 via Frontend Transport; Tue, 30 May 2017 15:58:14 +0000 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=nxp.com; vger.kernel.org; dkim=none (message not signed) header.d=none; vger.kernel.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 BN1AFFO11FD017.mail.protection.outlook.com (10.58.52.77) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.1075.5 via Frontend Transport; Tue, 30 May 2017 15:58:13 +0000 Received: from fsr-ub1664-115.ea.freescale.net (fsr-ub1664-115.ea.freescale.net [10.171.73.164]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id v4UFw87t000966; Tue, 30 May 2017 08:58:09 -0700 From: Leonard Crestez To: Viresh Kumar , "Rafael J. Wysocki" CC: Octavian Purdila , Shawn Guo , Bai Ping , Lucas Stach , Fabio Estevam , , , Subject: [PATCH] cpufreq: imx6q: imx6ull should use the same flow as imx6ul Date: Tue, 30 May 2017 18:57:18 +0300 Message-ID: <30688f5aa17763362275c199b2d61841497c26a4.1496159470.git.leonard.crestez@nxp.com> X-Mailer: git-send-email 2.7.4 X-EOPAttributedMessage: 0 X-Matching-Connectors: 131406334936024289; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.168.50; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(336005)(39410400002)(39850400002)(39400400002)(39860400002)(39450400003)(39380400002)(39840400002)(2980300002)(1109001)(1110001)(339900001)(199003)(189002)(9170700003)(54906002)(118296001)(8676002)(81166006)(305945005)(356003)(50986999)(6666003)(104016004)(47776003)(5660300001)(77096006)(7416002)(50226002)(8936002)(38730400002)(53936002)(4326008)(50466002)(2906002)(105606002)(86362001)(189998001)(106466001)(498600001)(8656002)(33646002)(36756003)(5003940100001)(48376002)(85426001)(32563001); DIR:OUT; SFP:1101; SCL:1; SRVR:BN6PR03MB2561; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; MLV:ovrnspm; A:1; MX:1; PTR:InfoDomainNonexistent; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1AFFO11FD017; 1:tZccWa5tGhK38ztGLXXK242DAmO0PUQtp7pZ6DK+GT51vouLvA5kNK5Veck4XLZLV6nTSpwV27sWXT9f7QDX6/+z6Eux7mY7zI9S1Uu05mU3DcxDBcFf/f4HDx5BrZLrmPLrRXTDa4C5Zi0NlMGcnsv4TqCBME77y23KhAUS7B9IzCzQqbVEcqaHrLlHgqrasjjiLU2KSlxfgAV6Quit0eI6RqVWhi9K1j0mF3TSpBtLAveAckqmjAnOF25xtqkDnVBz2xnvk5AyUUGYYecnm7aBz8DA4KNhH2s/B38+0LG7ivQ9FU1vEtHv6aXOL6WrvWt12iJHAyBypcc/ljn9KaCLBRHUBZk7q12jyduc0tf7KvKHIoNFRcRqEjKQg3qr3x3LRkaLt2T3Xv0WPHnZ89s4+Gr2DH8W88GvnTQi4wmhImuNABrj+fIr2aT+LowcBvZ4YnBgiLADcm72S78dxPgPClFgrO1vW7dERwkgPqhwBVLuYjErRzZaDJNbfpDVmbGjXFNIDiSVutW8R8B/nMXMQyDhO4uLiJ3HL9BCriB5KIDcyq9dv6TS/20oYIXZ MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN6PR03MB2561: X-MS-Office365-Filtering-Correlation-Id: f2c2b203-4ad1-4b62-a381-08d4a774ad8d X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(201703131430075)(201703131517081); SRVR:BN6PR03MB2561; X-Microsoft-Exchange-Diagnostics: 1; BN6PR03MB2561; 3:XnMcylx0/8EuWKE/xAEE/1GGCcma1zTCPc/MAe4Y5a660gk1jxcBS2s7FyKK2SjpMfRpcXk9alXI2yEG4LT0CjDmaUR3upzRDGeLqaM9TTHlDC409BA+bp9nTPV3TD1F1NG6Dxm8rnmYzXlrIphBrTEOnj4zihRm+8BVWh1rrktOlDafCX2pgLioPzmMaoOAdEwiTNCs4JZoP5zu/+zmexGKgLE29yMAIXLNyUWbCFs1dJIuCLuMrxNi7rBXI62xtdksP17MYkosQ7n01O57naV1stwcewJqzh9Crw42/ntJxfSnwRP1jLCrcA9DYkIjW7HdkBEQXN/hJvME/dThX1BRgPb8cjhnU98NQQ0rt8X0dEIhW89oFVvuziA1R6exOfA3XiGWujEECcew0abh21sBcv0HjCYH1TicUscoLPMTthJu0mlzFgv/EpV22mjJ; 25:HEKaFgzVsFH8ttFae0xVocceued+AFgJO24aWD9jBdVQFDuuftcWLoxdlFmiFgH0wmIPMlhN2th5z4VG/83jcbCpDo6dRDo8tcChs950GTT1xLjLZAPGl5UktF0qGI22YUb5aXq/OpJ0cqMlZFDulGnFpB+dXd8ALBCQQejb85KZpThzKCO3Pw6gKVfKYFVTLpQCLGWfcFa5M86gMy39Dk1JgYfzU28WwQLWlGM5jZK8cTLuNKqdHh8t3aD1vQ/EmXTN779499tGbeNibZJ+TrUrYCnFX0Dg3uHVwzFqfjkkf3MBaUp2eUcDfRNFHRvEtkAI7sXUumjr+M/GCUhXTkwlvhTRPINW+LYmDFkLWNkMqCx7ZhKQxc0nptDdZ8jCaf0s8VDdmofPssl4bnr7rldVh9/dqv+LwjTjbRlmm45ubzFNa5KRE/v8MU1wUebehGMdLgzlNDIW+ggRG0znfMurlf2YgKs1eQni+l a4qss= X-Microsoft-Exchange-Diagnostics: 1; BN6PR03MB2561; 31:omaWccVn2mhxc1hCrZpbnTxLntRghgY/woAu52RK8YrF7/O2MLDRwvj44xD56Nvbf/WTRuAFdGGh89Gs2P469kxou1E02TOkE1j+wLjA1FgceiUjByfcdaRd62uX7xR+NEBbSZZpxrx/AHG2q93I5hhT4KtNzA76Y9RiqScZIY/8PICbMLYtNlr8sIyJ8Wx4HOx8aXfLxyfoUDkB9Zr8r6AqCn2VCDC01+gPZnaRmXJy1PGCb6m0nZT+81AM8ZwglHmEqz25V78UABo0pff3+w== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6095135)(601004)(2401047)(13018025)(13016025)(5005006)(8121501046)(10201501046)(3002001)(93006095)(93001095)(6055026)(6096035)(201703131430075)(201703131433075)(201703131441075)(201703131448075)(201703161259150)(20161123559100)(20161123556025)(20161123565025)(20161123561025)(20161123563025); SRVR:BN6PR03MB2561; BCL:0; PCL:0; RULEID:(400006); SRVR:BN6PR03MB2561; X-Microsoft-Exchange-Diagnostics: 1; BN6PR03MB2561; 4:tK54TQaoCeArz95CFLv16NWiaz9x25uhvIZnAEG4eH2/jUzNbhbJ8dZ572mZYgafZaFaBd2BGKvX9QraEnvnRjkUQyDiAcEVUM4wflEqGoclzSfOwsTcQX6lywfymMGpN+mPcd2CaUFvrSnoJq8B8rFfY7Uu/xkXtO5cKaMupBIoYGBT72RPKplSXe5EjP7IJxdnz3/AwFvG6yX944UxLJDNoFHau07p43tHaIB7Gnz6x3WZ4DaKnUIkTsACtaplifAoC2tI6f1m/+m2TPTJzEZwwbEM+V+TGrtVAzp6k7qX2hBCO9+nLXRexfiV837T3ko7DPXLbrCOyVE2fWt9Xplik3w822u7VGtfcom0Bkpwe3E94AFsClhGeanqIZ+SiRyxjVBJpPQ41oAXhZGmq6AuTUHFFh/9R2IhcgSmsXGvIo8WSGva5eAWgIxRVOyed6kQhjD0kkNO0FFFOJ3vWdFzzGpsd2MmsQPUX4lGYE8REiNd9VZH/FbXy/XjMLFF8e1UFKrQJFSWLKWeA2xNN8NvOvnu0QHRe9iA0hmaudQnJ1MJnsYD2YewDiwH2LqdPEiwkr1F1I9ws51p3gZZSIzejw+ajYII20XVPUoQ002U6oQdMVZRJinVDb9uSJUl7ONuNl/hhAWCvfX74Zt8ps9gv3Wn5TXnmgYqOKwqrrjExKrH55Bq2sPksjGLrfODP1tQd5SBbgN3o/qC3eoZf2wFFyBsh5s0Bmu23AsHNUuBlbdjnuKZolLJK4/iCaiv3V6KMDHGAHex3Xxca6cxBAFvR6B1Bgsj6Yrz5Eng+apAXuLeunaukHrsbz7gjGSYwsPkIb4dRTGnNunZ6aJjl6qiiK/D/QjerjTK2OpNFOZtcnUpZ/wBMwRVzjVNppVy+ggniHv3XIemGrl0oG1B/A== X-Forefront-PRVS: 032334F434 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN6PR03MB2561; 23:iYwtuSpjWMbAUn92/0nJKLeBsNQRtWOKrRLbKXqB0?= =?us-ascii?Q?BTUJ+t1JIiwcdU3WC4Sso+8fljhwpgWUQpxv4NBt/EP78Elv5nQ+Lq+xpff9?= =?us-ascii?Q?WStaacxH4wwFq5trMIw+4eeISeW5VToShLkWO2QajUg0rUf7Tn4yL71erOAh?= =?us-ascii?Q?25yqoc01FXCu7JGQFo2UoU56j2ALu7iKn7Wy4qL1MGW1f7K2hsun4CmZOG55?= =?us-ascii?Q?VYp52GyVLu1qMyjQF0rWW/YdIvQWa/8mzUf7YfVGKci1PTVoBSmI6y3zkqYR?= =?us-ascii?Q?bDtiIQKwM5UlJr0SNCQRRX4wt0F6ny8FjYRQapZr9W4ARTnF35b4az4mkxmT?= =?us-ascii?Q?7ybP/T2GhN6je+Tbfyr60cjwr1NJ9HRHfEYetw+MJOLFXHEvHtt6e4tzVBBW?= =?us-ascii?Q?CgbVoxeWcRqDCh2lIimtixOIgRmP8Zc7miq/P4ok63LNPwXCAZV0bXXgqeXF?= =?us-ascii?Q?mzQb5Pr9lUqTVqIP1sQ2aICfkFAPiU9Gm76D7WkMeF29AEm38Q1jW9BFpmlV?= =?us-ascii?Q?3duJVtNqOm9NYq1IAqCVgZ5YfSYqrOhv4azDp0uGjesG8quk1O8mgqrYeyZX?= =?us-ascii?Q?paxmhFh4qx7jan8D7R/El2POp4tRhU5YM96vfcVWiX+pjsfriBuEC4a3VwoF?= =?us-ascii?Q?pgkBVvosqMUEEksUH6j3i/q0Dl6mVXt1e/IFSWPOejE8rz5NxG3zMxZ61O9s?= =?us-ascii?Q?wbYZD5KSMSOaEN+mPxePRlh6IxYMlZSat9DuaXveJfXzpPTCmlHSavCy4t0N?= =?us-ascii?Q?Xr7j2iCu9SmUF//GM18CNz8zI48t/Z5Uv1W8n+gU1OtaZOcrZQGRlndI9Cwf?= =?us-ascii?Q?2pPjDeCQGU/1eC/Dt/QoCTR1Vfulsrb3h94FczLGvm0+WIFzRYOwlEqiJSZI?= =?us-ascii?Q?uPynQQseUnlOc/58ov3zIvle05UmIFwL362Q7m5AqSqfxQzh3Y0ZRa6mFiKf?= =?us-ascii?Q?+InuuAKrtlqihckg2DoZ5y+fvmDy1Mi4Ylt0Su49RW0DLJD9LK3xe/Ju3nY7?= =?us-ascii?Q?u4+oxhGLA7q2l56Xf9PjqxHargqiHxxPBTbJjvJEKGvJhmRpRexAAxWRBzTO?= =?us-ascii?Q?60CdpxNZCdKrNkynaUCPD5Pzj9HEcs0l6IStU1gWAVGbeO0uXqjqnyY6XizW?= =?us-ascii?Q?+oU3OyhhIn/QPWS38pvbZwLPFyCLPLu3Eieab7Ml1X9rQI6BAAErZWbDxYwb?= =?us-ascii?Q?V6Lhoh8FCXgj01gw1/lUPhqYJCBru3aLkqe?= X-Microsoft-Exchange-Diagnostics: 1; BN6PR03MB2561; 6:9/MMWtKgqyCnqRViQr6lv8obuI/5FPyWGobkt5ivLTLhheKXRvZijFniqAJ37jnKH6csfh4NlILj135XbkFHbAfFbLB1PQ5QOgiyWFkP+OoJ/MEGYWwDIdqedTmYaiK7k1YKpjmm2bKGr+ZzrpvgBjA8bzwFXWRNrYUgTu7OK3G2wzq1WTGnGnB6zJn+7VyDX5aFTECXpfhSudEWGKK3dRUDBiAjKnZAVoVxQy9OpbNpMcnigOoxtQQZTwTP8LEvSserjQsM4TeNbW8mWu8yZO0rQ4yE+mLZV27DbxvGd+ChrD968eV+im/3K6hdYfPRLlbglVfKazTgv9s2172i7yz1rInFylP2VN9btu6lUYjCV2fAXR7DbvxRVNIlVds/0jLGHZ5Qyxf7FHJhK/DYvGrWRlzhj9HrmotKUd9yCt4ISqFKcGcTxN13x5q/KUS42Bd18x+q9a6UvuyprZDXdlbd294hScEopL/fc0MfWCWRFoujbbRvzzWd2oOdDGVoxvTTcbC0ffi1J/DJAotqUw==; 5:9XoFnLCs+y7dSF4NEBouViPTs1Ji3Tp6GKlytmVU+EMbTLJi2/k5DDFv9ZFgnJdHzgKiydzpPMFwZReRImQYI+FsL1O1WM+S4T/TVi4yZdUFIX9MPfR6whTE1etYKKFOWFgYAUzxn8i3tVvA8IzGXaf5i7vlHIeW6rfxv7idVqlnU73UnxnmJt9km5Fypx0p; 24:ejM0/3JOfjWZpqYi8G1wDqmSnqM+wjbeW5ShNGeHRMDTDdI7QKng48ivBxdSsm0ejUZbafyKEFsF5m+Ob/7KcEDn5cIg9op6eJ7VMj00feo= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BN6PR03MB2561; 7:gUWgd98ZY/iyfssiMjUqARvW0ZV22gBlJ3rLGSn/nag2vC2KCf03KjBR9X1b31zIQ3CZO9sL7HyE1cWCjkgCQodFtYM4m+btIOsVBTEhu72kKOEMl/lwviZ4SZsHwyj2UeXKBz5VFvnwcMA01QmMld/GRivY0uozGSqQ1eCQ20CySSHEt5v6CezepiTjIE6eFD7IDmp01ICi3Vl8yUo1s6V+caskwWl03k3v5N0CWjK5qpVCcjIHwmG79whRYOOLhyat7PjUo9IpprwjqAkM3nfSVDD3dLCetBaIcM3je6mhzcxrcAsbnJRyLS8MlHJtKEeo3KRcdYnBN12pQzG/OQ== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 May 2017 15:58:13.4152 (UTC) 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: BN6PR03MB2561 Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Octavian Purdila This fixes an issue with imx6ull where setting the frequency to 528Mhz would actually set the ARM clock to 324Mhz. Signed-off-by: Octavian Purdila Signed-off-by: Leonard Crestez Acked-by: Viresh Kumar Reviewed-by: Fabio Estevam --- drivers/cpufreq/imx6q-cpufreq.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/cpufreq/imx6q-cpufreq.c b/drivers/cpufreq/imx6q-cpufreq.c index 9c13f09..b6edd3c 100644 --- a/drivers/cpufreq/imx6q-cpufreq.c +++ b/drivers/cpufreq/imx6q-cpufreq.c @@ -101,7 +101,8 @@ static int imx6q_set_target(struct cpufreq_policy *policy, unsigned int index) * - Reprogram pll1_sys_clk and reparent pll1_sw_clk back to it * - Disable pll2_pfd2_396m_clk */ - if (of_machine_is_compatible("fsl,imx6ul")) { + if (of_machine_is_compatible("fsl,imx6ul") || + of_machine_is_compatible("fsl,imx6ull")) { /* * When changing pll1_sw_clk's parent to pll1_sys_clk, * CPU may run at higher than 528MHz, this will lead to @@ -215,7 +216,8 @@ static int imx6q_cpufreq_probe(struct platform_device *pdev) goto put_clk; } - if (of_machine_is_compatible("fsl,imx6ul")) { + if (of_machine_is_compatible("fsl,imx6ul") || + of_machine_is_compatible("fsl,imx6ull")) { pll2_bus_clk = clk_get(cpu_dev, "pll2_bus"); secondary_sel_clk = clk_get(cpu_dev, "secondary_sel"); if (IS_ERR(pll2_bus_clk) || IS_ERR(secondary_sel_clk)) {