From patchwork Wed Jun 8 14:33:39 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aisheng Dong X-Patchwork-Id: 9164895 X-Patchwork-Delegate: sboyd@codeaurora.org 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 9BBB260572 for ; Wed, 8 Jun 2016 14:40:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 886DD27BE5 for ; Wed, 8 Jun 2016 14:40:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7BE082824F; Wed, 8 Jun 2016 14:40:26 +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 D9BED27BE5 for ; Wed, 8 Jun 2016 14:40:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1946008AbcFHOkZ (ORCPT ); Wed, 8 Jun 2016 10:40:25 -0400 Received: from mail-bn1on0082.outbound.protection.outlook.com ([157.56.110.82]:20288 "EHLO na01-bn1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1426249AbcFHOj5 (ORCPT ); Wed, 8 Jun 2016 10:39:57 -0400 Received: from BN3PR0301CA0026.namprd03.prod.outlook.com (10.160.180.164) by SN2PR03MB2383.namprd03.prod.outlook.com (10.166.210.150) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.511.8; Wed, 8 Jun 2016 14:39:55 +0000 Received: from BL2FFO11FD021.protection.gbl (2a01:111:f400:7c09::176) by BN3PR0301CA0026.outlook.office365.com (2a01:111:e400:4000::36) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.506.9 via Frontend Transport; Wed, 8 Jun 2016 14:39:55 +0000 Authentication-Results: spf=fail (sender IP is 192.88.158.2) smtp.mailfrom=nxp.com; nxp.com; dkim=none (message not signed) header.d=none; nxp.com; dmarc=none action=none header.from=nxp.com; nxp.com; dkim=none (message not signed) header.d=none; Received-SPF: Fail (protection.outlook.com: domain of nxp.com does not designate 192.88.158.2 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.158.2; helo=az84smr01.freescale.net; Received: from az84smr01.freescale.net (192.88.158.2) by BL2FFO11FD021.mail.protection.outlook.com (10.173.161.100) with Microsoft SMTP Server (TLS) id 15.1.497.8 via Frontend Transport; Wed, 8 Jun 2016 14:39:54 +0000 Received: from shlinux2.ap.freescale.net (shlinux2.ap.freescale.net [10.192.224.44]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id u58EdPaW005456; Wed, 8 Jun 2016 07:39:52 -0700 From: Dong Aisheng To: CC: , , , , , , Subject: [PATCH 10/11] clk: imx6sl: fix pll clock parents Date: Wed, 8 Jun 2016 22:33:39 +0800 Message-ID: <1465396420-27064-10-git-send-email-aisheng.dong@nxp.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1465396420-27064-1-git-send-email-aisheng.dong@nxp.com> References: <1465396420-27064-1-git-send-email-aisheng.dong@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131098703952378756; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.158.2; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(2980300002)(1109001)(1110001)(339900001)(189002)(199003)(189998001)(8936002)(110136002)(76176999)(97736004)(2906002)(104016004)(92566002)(50986999)(2351001)(8676002)(48376002)(6806005)(19580405001)(47776003)(2950100001)(11100500001)(229853001)(50226002)(81166006)(85426001)(106466001)(81156014)(87936001)(68736007)(77096005)(33646002)(86362001)(50466002)(8666004)(36756003)(19580395003)(69596002)(5008740100001)(105606002)(5003940100001)(4326007)(586003)(7059030)(32563001); DIR:OUT; SFP:1101; SCL:1; SRVR:SN2PR03MB2383; H:az84smr01.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11FD021; 1:PP+vsoBf0qpYncVKomLzJqw8+Glu0U5sOM8VraUkTVtzp/yKebO53ZdSQzZcGTVZ0ZpSrkd00oq1KimLjmMsyY4yDyKnILQ8nlKUI1WEgIwFiMeikjaNRHDgeR/9j6yEGm10Cx3ZAlJdYXCW6mMQdlLVWwvV+c0WmrNhnVI22GOXpHGp2EZ+Io9ZI3FuVPTOZm37wsqvh+rUyFX7e+L69bJ+vV9uPtWylP+EqqBoeXSIB0qKpDGDOPk1mOl9betx/FFTKl3L1RowFdreQsXdYoSAyLgYYbKi5LwWK9BEATiretF9MqIDQV4kU05rac+sk4IF8lHfAIDlwc9ZTFO4A0Fb8bKWDozpx7NJUqhr27V9I6EHNrDiGJ9AaZcTx3vVhT1jJtomxfADtBFSsuQTW7JPpTYRfwn6rKOvZBcfwOhm7tTmovD5uz9l7Iaz0mJ9aZKkexd0maW9+nqJQ+Gs1HCjiX3+i9Ap2dLRKvQzmQCta+v2Gcn0B5hylMMjcAp/i0mE5utouK81mP4kR4LJKdvDu5Xunx0hMI5T8YqzGuiJcqyf6DQdkNyZG0j+MiJuqFxCjk+YJON1nGlm2HIylwMdW7VmoeKG5j6YD3l65pueomHiSZWtuZTGNVFzVgimKv8IvIXjFSQoDtUtTl1Jv6SPx7spfb0t/xDJX8oW/9s9drb/h98FNuLAgl6leeZ0 MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: 01dc0170-23b8-4af5-1a23-08d38faac20d X-Microsoft-Exchange-Diagnostics: 1; SN2PR03MB2383; 2:T0Cui4lC5/Q8jL2kt55A9uvUZDqhZ6KT34dTNy6I7pw5IDPK/TRykDwGynpKC5fIdIz0p53W4Zse+Dun+bMBFiVWavyatSD8VBNXEfDG7hwxZFbu3cMDvGvTPT15NlAX1EnVRiX0lJadg9miHiiJ5yfiiMJhGuEF1Rgn+60qywuBcDVRfQMC04MtyqM/vxXH; 3:g0tXW8n1vS/sIazcmOYqQIiU1BXZstM5CDshL4rNWdF0+4VO+wtlZjRxiK+VDX+bsVuOIidnBXcq4BKIJ3WmjZgRxZf1yRY71jWBatn/MiO9Hz3SUquQ91eUOXT5cgEfbVO8q9pGce5JcpDWrS67MvyUnf+BMY0RZ3soFEYgySrF45snLls8BYFbk9tV6dvLLrD1JD7oOsXdreIp2V4M8stFyGKjQXoOESbI+hY6jQ8= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:SN2PR03MB2383; X-Microsoft-Exchange-Diagnostics: 1; SN2PR03MB2383; 25:gJmcbrgIWPZWhw35NbvQ66zc8SSbCbeYgYnIEc/vUuQ71ZmMNu7L86RQUt0F/Fl1vMfMkSGEXgjcx1ufujKCkw/r2S9R+1u4TB/AWBU+iIwn4JtN4+JLXWBNFi0wJtaAKQQzh/uZ+LUaL37LlA1+YFFQD3fcoqtLrv1mznscopFuIJCKyUNpEbhH1rc4zTkfVkY2voRlnFkv7eFG5oj5vUqm20A+eHXKyt1zyodJo9iAU3DotBt60+T/MVis9dlVyIjVNVs+6dz4jlEe0JcSiqSsnfWFUSt/gW1JkvMP209X7q25GfvzgPgn6qNwLqAOzMZ+pnhx0gz98k33Zj5gds3uBK+SLT+5u537YqQdwkJiskTLTlUMLoHMt0jJwqvXtcct+6cguW3JnOrcEGFW7a2+7WzJPnnUbuh6VOYmkL5eBHVs51cSXJ1FWzelud2vGnKqvAR5hOIMQmuDpvof0C4aM5Qgd+WdJJ2SVcl37T4kBugUU/Ulfm3AhhyQSbnlNzn2RUJ3Q87VgE0KDCkWXy9zEChsnQdHGJrvNQ6RIyG+Z+y87Fl/jPFRGtFzFPZ3OpGPVyqlsgyYkUjru2JOd3f/T4mNaklscyRGuJrfBE2y52xygKiT3Y9/1qKYFO+vpONmz/dxHD/eYHlm6DIww9TEjp7V0ElDl3I8UCB9z19Z2aAPCneaZPuN2tyQz8n8TNQK1MQkiecK36ALRg0NqQ== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(13017025)(13018025)(13023025)(8121501046)(13024025)(13015025)(5005006)(3002001)(10201501046)(6055026); SRVR:SN2PR03MB2383; BCL:0; PCL:0; RULEID:(400006); SRVR:SN2PR03MB2383; X-Microsoft-Exchange-Diagnostics: 1; SN2PR03MB2383; 4:fMFwdkR596KNOp++4yiqxyM1WBwperThHKnTpiK6ciKablIKtLOc1PLN1ziV4+/U0cr1TFEjoU17Azjg6N05YT8qPh99V9LU7ngvKJ3mNltKPrD/A2If0uJlzW4XvHvLkUxqtLn/6ANt+6vOgbzyVzkq9zQIy62Gax7SOxS/pDndOcUlpTaVC5dM3QQzgeg994ol0eYJR//wIQ4NZb14bu/7jSSsMNT8SggfO/b2RghKX9SxFLwOlCm0ugncA+6tySlc0cvDJgXzyPV+j5tYMAre/38fv17ndbz08FlaNEXo6/6bloBSXNv2BMY+2EWHnGygC5EWvjF3G07XTk+YI2kJQ7wskvUNLUcLZ0/6ZnREYprAqNJrablnijWWE7wIBKTY01ir50/JgVjLZiJ4WtyLL9hiQTDSCdhbcvDLgd9/Y/EULPTflI6Xot5FEmu2zpR4oxqb9htFIXXPpJDf7gF+/6aCgUkg2xJQr83hzhUu8tkgLfIYxacmld8eHI3zrHeX0aXSNowogBH7jqabzA== X-Forefront-PRVS: 0967749BC1 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SN2PR03MB2383; 23:MQJ8b1bTkXgaZURKiOFWxih5691ddkWLhUfJ5iN7M?= =?us-ascii?Q?s1jZWAwYNjtk66AvdcpFvRTjd9cJaNzK5gY1G9/bPTBSGnyOjf4xEAktLL3V?= =?us-ascii?Q?2t+cgSaR2/wrTUci5antAKnT03FSdSXczY3DkQA9kzLOE9FGKvOuFryvOnNx?= =?us-ascii?Q?6wYKisbIOO3Xbp3XKv/GmfZFGoW3MJtAqq8v59uyQOSBNx24LGCcR+Q21ttW?= =?us-ascii?Q?4mHbiYqHp0uXaL9ux5/h2ZoEc4kwlE5JpGpj/Q3344CNMQXHFKniw+dtED5+?= =?us-ascii?Q?FoLH1E3F4d4HLbIZctW+Utyry9j+coA6Dd5/Ap8Wr2zwzjzY/IboghRULP4r?= =?us-ascii?Q?BjVE58MR+TpNbiH26zffb8Bin2Xtr5XNx6mPL0L3H1e8zMyDSuwJ2gDgJioJ?= =?us-ascii?Q?2hpT18yzJSurHDnf42wKtZ9orybSUYBLqCtE/3MY+tP/cRQ6fk69Q9LTPuf5?= =?us-ascii?Q?vdCswek3p3wyWx+kPJxEW+azD8vzP7H0dB5BdtkghoRfK9D7hWh5pgS5ZOmc?= =?us-ascii?Q?CJTYyWNMCadJsGmjmmDWtrylF0JNRDkeWyt1mYLL6nBLR/WHhXaNLPuOid3Q?= =?us-ascii?Q?nyJgMlxZuifl12QJlWKwFSiG5XLBqPF+uvPL7jyxvqql0+ADO8RzkqnX1esa?= =?us-ascii?Q?Lv5ylol0y3A7UMeSnFJ3JVmnlcHkuU86LutY7iWkn5SEud0jcXfAAjyIExzZ?= =?us-ascii?Q?xa0eMrcQictDHI/eEMasmoOYpJS4Dv36Ap+UT2X2TgF3WGPWhmbsfldOZkrx?= =?us-ascii?Q?ye3zSwWmiooZob9fQrY1uvxhkoo1Bo30HxiM7Jm86CICLtIH73Rpl8u1zv2H?= =?us-ascii?Q?TJFstITop+RnN1K6zEnhlcwr6Su7d49amr0jtl7PhuPtUAHsDJvaj3QdMYEX?= =?us-ascii?Q?XVgfymMEos8Q+eLj6uLorub350V0AJ3f8bNUQHIMN9g/0viGFNJ8vdfMSRil?= =?us-ascii?Q?dihT1bf06a8MQZ2UnSmYagYrzh7XhSjpK6JglFrs3Fg2/ptBbE6jntcYN1h2?= =?us-ascii?Q?5D6rrGN3TI4pbwzyf+IkNSaElCXLYj2AhHB+w+YtGATjekORR2/DsrWTQJqa?= =?us-ascii?Q?gORDvs/yfvOGa6EXxtFr3RmCiD5f7VdA22pJSfhx6m7utJcaYvCRKdyXtyHh?= =?us-ascii?Q?EI6PTP8lehsyNxpcm897TN6pR8j6yQhsgTNFXfhQ2mNE2pp2LFdEYCUtqA4q?= =?us-ascii?Q?8emSBnlwpTZU5U=3D?= X-Microsoft-Exchange-Diagnostics: 1; SN2PR03MB2383; 5:OF1V9S79Kuhll8hyp5dCCkKPYHN54Xt9wy/C1KvDJMYK4fCm4mBqv0eZ8Z2BXat3t1CdzIbTDWB9SWGUoJuHr2WCfir3qpij+YLg9mZu8LQH2B1NuguFAPcq0qA+wto+piL6xmtv/gPJSXsRtZJ2URKviCQsVsbKWqtezC4WIvo=; 24:32ow3tJwC40lrR7PwPSt+s6V/gngQV03ybT6pgqHXf3RcimfAx5XIlilKmhlkCUfEvmBdPpRkHHNUb9VwCfkVrW4c+Oj4zc1NeHhkxweJEg=; 7:ACVXU026fwdQ/6ZlhEFG270ovWTTtJXflvrwv2u8mqK8cRTZeir+q1luhTY0M789GKTIuiOfoi/ZOVOpNU4pyq06gDWW5MyUFSIuveAn9LOOwQJERoIJIQCqVwsH8Y4YfYKP5av+e8CPq7UdpNUpi0mPknhoIJ0XEgyoA0rLTdQFrwbhzbIOHSWKj78TTi/Y+kyVIOeM06agWqrOPDnsgHbayF39hM/o/0/FYiIk1J4= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Jun 2016 14:39:54.8946 (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.158.2]; Helo=[az84smr01.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN2PR03MB2383 Sender: linux-clk-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-clk@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP pllx_bypass_src mux shouldn't be the parent of pllx clock since it's only valid when when pllx BYPASS bit is set. Thus it is actually one parent of pllx_bypass only. Instead, pllx parent should be fixed to osc according to reference manual. Other plls have the same issue. Signed-off-by: Dong Aisheng --- drivers/clk/imx/clk-imx6sl.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/clk/imx/clk-imx6sl.c b/drivers/clk/imx/clk-imx6sl.c index 1be6230a07af..5fd4ddac1bf1 100644 --- a/drivers/clk/imx/clk-imx6sl.c +++ b/drivers/clk/imx/clk-imx6sl.c @@ -218,13 +218,13 @@ static void __init imx6sl_clocks_init(struct device_node *ccm_node) clks[IMX6SL_PLL7_BYPASS_SRC] = imx_clk_mux("pll7_bypass_src", base + 0x20, 14, 1, pll_bypass_src_sels, ARRAY_SIZE(pll_bypass_src_sels)); /* type name parent_name base div_mask */ - clks[IMX6SL_CLK_PLL1] = imx_clk_pllv3(IMX_PLLV3_SYS, "pll1", "pll1_bypass_src", base + 0x00, 0x7f); - clks[IMX6SL_CLK_PLL2] = imx_clk_pllv3(IMX_PLLV3_GENERIC, "pll2", "pll2_bypass_src", base + 0x30, 0x1); - clks[IMX6SL_CLK_PLL3] = imx_clk_pllv3(IMX_PLLV3_USB, "pll3", "pll3_bypass_src", base + 0x10, 0x3); - clks[IMX6SL_CLK_PLL4] = imx_clk_pllv3(IMX_PLLV3_AV, "pll4", "pll4_bypass_src", base + 0x70, 0x7f); - clks[IMX6SL_CLK_PLL5] = imx_clk_pllv3(IMX_PLLV3_AV, "pll5", "pll5_bypass_src", base + 0xa0, 0x7f); - clks[IMX6SL_CLK_PLL6] = imx_clk_pllv3(IMX_PLLV3_ENET, "pll6", "pll6_bypass_src", base + 0xe0, 0x3); - clks[IMX6SL_CLK_PLL7] = imx_clk_pllv3(IMX_PLLV3_USB, "pll7", "pll7_bypass_src", base + 0x20, 0x3); + clks[IMX6SL_CLK_PLL1] = imx_clk_pllv3(IMX_PLLV3_SYS, "pll1", "osc", base + 0x00, 0x7f); + clks[IMX6SL_CLK_PLL2] = imx_clk_pllv3(IMX_PLLV3_GENERIC, "pll2", "osc", base + 0x30, 0x1); + clks[IMX6SL_CLK_PLL3] = imx_clk_pllv3(IMX_PLLV3_USB, "pll3", "osc", base + 0x10, 0x3); + clks[IMX6SL_CLK_PLL4] = imx_clk_pllv3(IMX_PLLV3_AV, "pll4", "osc", base + 0x70, 0x7f); + clks[IMX6SL_CLK_PLL5] = imx_clk_pllv3(IMX_PLLV3_AV, "pll5", "osc", base + 0xa0, 0x7f); + clks[IMX6SL_CLK_PLL6] = imx_clk_pllv3(IMX_PLLV3_ENET, "pll6", "osc", base + 0xe0, 0x3); + clks[IMX6SL_CLK_PLL7] = imx_clk_pllv3(IMX_PLLV3_USB, "pll7", "osc", base + 0x20, 0x3); clks[IMX6SL_PLL1_BYPASS] = imx_clk_mux_flags("pll1_bypass", base + 0x00, 16, 1, pll1_bypass_sels, ARRAY_SIZE(pll1_bypass_sels), CLK_SET_RATE_PARENT); clks[IMX6SL_PLL2_BYPASS] = imx_clk_mux_flags("pll2_bypass", base + 0x30, 16, 1, pll2_bypass_sels, ARRAY_SIZE(pll2_bypass_sels), CLK_SET_RATE_PARENT);