From patchwork Wed Jun 8 14:33:37 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aisheng Dong X-Patchwork-Id: 9164917 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 3C10060572 for ; Wed, 8 Jun 2016 14:42:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 283DC27248 for ; Wed, 8 Jun 2016 14:42:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1CEA228047; Wed, 8 Jun 2016 14:42:58 +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, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id BEB6927248 for ; Wed, 8 Jun 2016 14:42:57 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1bAefW-0006Ca-FB; Wed, 08 Jun 2016 14:41:18 +0000 Received: from mail-eopbgr690083.outbound.protection.outlook.com ([40.107.69.83] helo=na01-by2-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1bAeeS-00043a-Nn for linux-arm-kernel@lists.infradead.org; Wed, 08 Jun 2016 14:40:14 +0000 Received: from DM2PR03CA0032.namprd03.prod.outlook.com (10.141.96.31) by SN1PR0301MB1630.namprd03.prod.outlook.com (10.162.130.28) 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:50 +0000 Received: from BN1BFFO11FD054.protection.gbl (2a01:111:f400:7c10::1:119) by DM2PR03CA0032.outlook.office365.com (2a01:111:e400:2428::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.511.8 via Frontend Transport; Wed, 8 Jun 2016 14:39:50 +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 BN1BFFO11FD054.mail.protection.outlook.com (10.58.145.9) with Microsoft SMTP Server (TLS) id 15.1.497.8 via Frontend Transport; Wed, 8 Jun 2016 14:39:49 +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 u58EdPaU005456; Wed, 8 Jun 2016 07:39:46 -0700 From: Dong Aisheng To: Subject: [PATCH 08/11] clk: imx6q: fix pll clock parents Date: Wed, 8 Jun 2016 22:33:37 +0800 Message-ID: <1465396420-27064-8-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: 131098703901676008; (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)(68736007)(19580405001)(69596002)(19580395003)(33646002)(8676002)(2950100001)(48376002)(76176999)(50226002)(81156014)(81166006)(86362001)(2906002)(5003940100001)(92566002)(77096005)(87936001)(50986999)(5008740100001)(229853001)(50466002)(106466001)(105606002)(36756003)(8666004)(2351001)(8936002)(11100500001)(586003)(4326007)(97736004)(104016004)(110136002)(85426001)(189998001)(47776003)(6806005)(7059030)(32563001); DIR:OUT; SFP:1101; SCL:1; SRVR:SN1PR0301MB1630; H:az84smr01.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1BFFO11FD054; 1:5C067RiSYe/i/Wl5yC7uCVGWPoo2IDn4brn8yfPXrJzxmbdoLaqJZixuhY4vCOHFJMyjOO60S8FkADgsHWLvqoX0gX0YtSEeSpA2NLWbTmlvys+6QyW+RzxDzO71sxgiGZF9uR7iIztqn7/90VLTWwhGgkBRc0q3q/bTfUE1TJeI5ZAWCyKBDEJh23tphPBk6SPJXBKzXD+tbspaO4WpuCOHb5zmoHXqQm8rR4e8aMEiLZ4qtB4XVGaChtWz2VAmFs/sO7iP4NM6YjTKtiOOJdyS1FUrqeCTv/W4Qkb7jzwWZtThEqoLZ8uwD8xQkFN9qOqD0XzAVv7T9GQ2O+MtXMxzDb8WL4Vd3TDw1NlDYSF/jXYjC5VbGjk/H9b49Tl4QLCdOKKkMXyJ3i4oTB4NrFIf1/8tyB0bhhT6bZrSiYd36jIp8bvgh+6Wq31y92O5hlJ0NGT4CqXK4Aur2ML9YyaIPOuObgS3lRvlVRdsNQDHPQkIkCT8/+QBUfFuqCVqIu8TjKrhpOSaKqLI1aPe497auKK8+z8layN4uGWqhoR5s5r35nku7Qu7dMEpABI44ATiCcX2dYqzqZD+gjA1jbNw4DnElvlxlb5UMsIm6E2ca2HzVc6So5v+86Oo+8GWc2bHkAGImrf+OjoX+dOV0tu/WKBLAWg+Ccx2x/vgWGmtfhufcbs7cqsp0aX7WQI8 MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: 96a6f671-c578-4d87-0f2e-08d38faabf05 X-Microsoft-Exchange-Diagnostics: 1; SN1PR0301MB1630; 2:/SluESNyKx2EjK/fM4eJ7cCImxg+E17sy60V4uAHIL0Z+34o9XUAQ4QyiQioRhPIgRgPuf1ld0h29V+Rr692QRVMq9Gu2EdQb6A6Y7utGJ1NrY5aSD1jrd1MS99gYXPh94GZdLbSoQUzXUjcVC5MiWHIetiVMReBUSdONS6oPt1Ldk9ZNKjfsukvLL7733to; 3:OsvSo2I3/yrbGGfd4b9Ib/WyZGz5VdtJAIjcl8BrbGG/yJ4hdUqQQ/tO+9uxijtQ0Fh8ywTea5b1W34R75ysZlRKOkJkP+GjjmZ3Hs8ytBmnUuDRS9JfJeFBjNeGKZSnNJ2pA1trBuzqn6ty5+jT7Pu7W3qJJtZ6XH6wLaTBWH5Z5F6o/1QLXS/zU8LyqDJ27AR8/Ly6V6l7CAypfH8HIaGvMLVeC7js/9f8zz3d68o= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:SN1PR0301MB1630; X-Microsoft-Exchange-Diagnostics: 1; SN1PR0301MB1630; 25:darAQJsbWUP2On0bLCX4ENY4QMA31H+bt23IZh5BVNufP7E7mVl6rhXSoE43f0D2TPnJ6xpfvTmA1bYdOrgtWTGJklWKqTe+QL2WNzPvnn1q+e7HDt3F93rSdKT1IN7GDBYo1V2fWDCFoc3lW040vF4dwZL0ObaP2LEn1MdoDfC8x7H8h6gpk3toqmqLLuRpBt14pJfnr4HMsOLZ27U0W/pqb7bTFoiYjQfZYtLQJXP32tSt3bxSXiurL67Wq4bqfQTSfHin8RFRvJ3W44fTZ+1AGWMoUtqFKeIwFissfcxlqEcdGWpVGtcIKA2XhzLNX281QQPnobc0/QZIHxEuBrD1XQtI3ZSKrITnsoTyaGXTD1OcOcpNgc2oN8qFg2Gu/MbFqGRjFWL1XluD+Td9vd1IORDFfnh2u4uTMKVwWj+G7NIoSMFeEj0w4wTg1ZlEuJekgD/L5wlcLT1JFbO7yMaTGsZXdiDIqrDPQswC3FxcAs27UIfQA561/MqLcEduylrvfOkUj7dBpMiEHw8d2DLZrvIIc7tIFS4c5j56mdsSt1DBLLSx+CLhi6LniBkxdYj9SMhm90ZTQ5VG4oBawfoa+pZyX32/QWKMHcqVDJEj+p1r0XDEt6BB8tZNF9PctFYfgN35qHTnNAjoSd/bli8MBt8x77RuaRdGIJ2zE545aYBopEj0Huw4Ong8zDKvVlZr4XFYO2WWn6zKxcCP3A== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(13015025)(8121501046)(13024025)(13017025)(5005006)(13018025)(13023025)(3002001)(10201501046)(6055026); SRVR:SN1PR0301MB1630; BCL:0; PCL:0; RULEID:(400006); SRVR:SN1PR0301MB1630; X-Microsoft-Exchange-Diagnostics: 1; SN1PR0301MB1630; 4:cagKV8RNZow+sfBlUItY95J4wHxvlWCGA92VoUnurX6lCLIm7S5qqZLOWegXOgX/83xdWjHsHNBy4r1yI0iTB5BJpyZacDX3yZkOLLROa+9tzHjT+qyGJTGuZrb2AwEUztjX1Ebyk9asPBKeT6+4ANKI7GUDKxV0FG/+mdZnwmZEv5AgkxkEkIu3K76u/RFKhP+WJjhAZMiuRJ/PT2ItH/P9Bl7Tqba8YOVU5sP4SM8eE/KFAFWIaKJev1evOF/1vn+x4i63TseqEi356+joae2zkLcBXxVulv9C6CyXbanjv/Xj0psDs4fqStIwb46XI/tAd1De4xooy0lMnGTuwrMsQmwK9P3tvEndd3rZcnCsFEaKrb8KzXFRNdO1Juj2dLn2DuZ4vKZ+EfLYzjNnN01Dp+pvH81Q2q4z5DTjUbj9LdTQGLqZKQefVQvJH0RiIPvft3CROAhAtV/v9AQE/LFg2zobZWeVhdwDtQSQQjoiqqTMcqwEUOeiNpS1A8NidGMOI/qG3asnGO3xIjw06w== X-Forefront-PRVS: 0967749BC1 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SN1PR0301MB1630; 23:Q8KRbVTL8hcX4HtmnA4HfxK6a/uqPBH+YkGxTJw?= =?us-ascii?Q?y1MzaqistkbIEHMtGLZZa3JdG+e0JGPhrEoGg4hOO4RIUpqY6N5ZiZusD6nn?= =?us-ascii?Q?KgsNlPymVmI/XXMJ0yCtBXokjgNL9hgGz42xJXx7IUaAPcu83znY0Reez591?= =?us-ascii?Q?X3RqUZD9p2w59l8CNf60yGzSDbjWruakdjBm76blSWI/T1GRXNoaWufmjNk8?= =?us-ascii?Q?iav6l8R1Sn+m5t4nqCmJ3mFPOagsMEKIDwPZNJezj5Vky2XzXBQhm8axpTPm?= =?us-ascii?Q?0G4PvQ0TF2m458A15exi6ZYekdk+E/p1KEjjE3vrvHhdM4ENrllL38Gn9RvG?= =?us-ascii?Q?ui1vGVRhxNwLhk6ZqxSpSWF3NIaij1xUQiT6EH0iLeGuInvS+SxkbrnxL11V?= =?us-ascii?Q?TXrIHj6DwzNLbaPX0aP2Sn0EuvyA2OEIXvZWWxPobY7ZjqbxtdMJdiTla4H6?= =?us-ascii?Q?nF/kcYR4qkFcPI9XqGDmP9wYpwF5/8PxiQ5Ru2ZBrUSqzDU1HBGSFipI/lEG?= =?us-ascii?Q?teGu0BL9assssV5qeWDmbDAgHKSJKaOd7UF2C05BNYHAjxzdQq2nEEeT2+Eh?= =?us-ascii?Q?xDM+x8j8vXLsHrg8vKUoDED79x5z0kuX/zpakLZcyC+r8D5Psbr99vLtYbEA?= =?us-ascii?Q?dT2aAfM0AToEhwsrvgs5VvlacQnInl+/JjYT3o4elRkUoE7UKuzJ/4G4I4Pk?= =?us-ascii?Q?Nns6gFKtGTmekgUgRqP8wMZh5sYpK5LVzY9pUVpMHMYo+2iEbs8ItsraRIGp?= =?us-ascii?Q?NSVdwJvNLnH1OGOiL7Vqk6k7dMZQ08crHANCFjXbEPKQ+WQNIe8gDIRC3sNy?= =?us-ascii?Q?W6dww5KquDXlEiI8DZ+RnNTuMShMfoDO78foX/xHvN7lCVtvpzHMvrr6RCI1?= =?us-ascii?Q?eEPktKImDU+1JU4vieN9r9dlZT+pjmlJSQyYuGte4NxXH8ghn83mCDY4iUgK?= =?us-ascii?Q?o1C2HSHcDCKBQDlLrD/I6INNB02xrlfwG8uAukGgSMXiEU9wEZ/DpvPn/XZP?= =?us-ascii?Q?39t5gM8fUcXNa9y3Uztp+fW9LtFOuu9fcN76T+ItCty/Eli/uQc6/xR0aFrN?= =?us-ascii?Q?l1+pVRVVawZ0U4cQrtAv4jU7nTuhBxH5Vvp9PuDJApwb0yHbWHOOq75fuI6C?= =?us-ascii?Q?wUzs6c8l/O4heg2iTAkbOV9WNI4+gd1cM7dOoRZj1YYt6WQAxSrzlNHaZ+9Y?= =?us-ascii?Q?iHY8i/PsPvvCExhg=3D?= X-Microsoft-Exchange-Diagnostics: 1; SN1PR0301MB1630; 5:cTOyfXM4UOLnSEkXgP/g4eNmTeOuQMRXgq3SfLu+W7FWEpjKLGqhyJko6TGm0xiUeaikbj8PNkhJqKGLZWZ/Y8huiv4oEr+5dyigJx8gpLpyy6NeE2/LYNED76o54HIk6nqro2xuf+/3IHRhr9FDpJIuQAodLL6De9eP6eRTmcs=; 24:5tZ2TioSbM/pHTuoN/FinFBRBcaV+Yc73NArJ2OA+cGudCJzcDXSJzekBMv3j+GQLBc+ozKGRHrPuQF4F+VFe3xSFOsPEZA2wS2m+bcn7cI=; 7:ZgZDt1mNIRslnMqExCDaOnoMZIsBk0Mr0Xsyfq4U3AOYpCrE57TEs68LlbTQuFXr5G2UidCL5N2WDihG61Vsx/adt4RMj/RBXwgBhvd0lSsSzEQFAj87Kya6tygDkarXU3MntNTwwV7iH2jj0ON1/bjebNreAV8mtFjh3B6zRgDKoLNJd2zOghY9716N9UWmh/ERJUep9Zk9Xl2pNmY/g0knk53SUTCXez/HvBamM2A= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Jun 2016 14:39:49.9024 (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: SN1PR0301MB1630 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160608_074013_083828_0D828B79 X-CRM114-Status: UNSURE ( 9.12 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: aisheng.dong@nxp.com, anson.huang@nxp.com, mturquette@baylibre.com, sboyd@codeaurora.org, linux-kernel@vger.kernel.org, shawnguo@kernel.org, linux-arm-kernel@lists.infradead.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 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-imx6q.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/clk/imx/clk-imx6q.c b/drivers/clk/imx/clk-imx6q.c index 02e18182fcb5..89bbfc1be476 100644 --- a/drivers/clk/imx/clk-imx6q.c +++ b/drivers/clk/imx/clk-imx6q.c @@ -192,13 +192,13 @@ static void __init imx6q_clocks_init(struct device_node *ccm_node) clk[IMX6QDL_PLL7_BYPASS_SRC] = imx_clk_mux("pll7_bypass_src", base + 0x20, 14, 2, pll_bypass_src_sels, ARRAY_SIZE(pll_bypass_src_sels)); /* type name parent_name base div_mask */ - clk[IMX6QDL_CLK_PLL1] = imx_clk_pllv3(IMX_PLLV3_SYS, "pll1", "pll1_bypass_src", base + 0x00, 0x7f); - clk[IMX6QDL_CLK_PLL2] = imx_clk_pllv3(IMX_PLLV3_GENERIC, "pll2", "pll2_bypass_src", base + 0x30, 0x1); - clk[IMX6QDL_CLK_PLL3] = imx_clk_pllv3(IMX_PLLV3_USB, "pll3", "pll3_bypass_src", base + 0x10, 0x3); - clk[IMX6QDL_CLK_PLL4] = imx_clk_pllv3(IMX_PLLV3_AV, "pll4", "pll4_bypass_src", base + 0x70, 0x7f); - clk[IMX6QDL_CLK_PLL5] = imx_clk_pllv3(IMX_PLLV3_AV, "pll5", "pll5_bypass_src", base + 0xa0, 0x7f); - clk[IMX6QDL_CLK_PLL6] = imx_clk_pllv3(IMX_PLLV3_ENET, "pll6", "pll6_bypass_src", base + 0xe0, 0x3); - clk[IMX6QDL_CLK_PLL7] = imx_clk_pllv3(IMX_PLLV3_USB, "pll7", "pll7_bypass_src", base + 0x20, 0x3); + clk[IMX6QDL_CLK_PLL1] = imx_clk_pllv3(IMX_PLLV3_SYS, "pll1", "osc", base + 0x00, 0x7f); + clk[IMX6QDL_CLK_PLL2] = imx_clk_pllv3(IMX_PLLV3_GENERIC, "pll2", "osc", base + 0x30, 0x1); + clk[IMX6QDL_CLK_PLL3] = imx_clk_pllv3(IMX_PLLV3_USB, "pll3", "osc", base + 0x10, 0x3); + clk[IMX6QDL_CLK_PLL4] = imx_clk_pllv3(IMX_PLLV3_AV, "pll4", "osc", base + 0x70, 0x7f); + clk[IMX6QDL_CLK_PLL5] = imx_clk_pllv3(IMX_PLLV3_AV, "pll5", "osc", base + 0xa0, 0x7f); + clk[IMX6QDL_CLK_PLL6] = imx_clk_pllv3(IMX_PLLV3_ENET, "pll6", "osc", base + 0xe0, 0x3); + clk[IMX6QDL_CLK_PLL7] = imx_clk_pllv3(IMX_PLLV3_USB, "pll7", "osc", base + 0x20, 0x3); clk[IMX6QDL_PLL1_BYPASS] = imx_clk_mux_flags("pll1_bypass", base + 0x00, 16, 1, pll1_bypass_sels, ARRAY_SIZE(pll1_bypass_sels), CLK_SET_RATE_PARENT); clk[IMX6QDL_PLL2_BYPASS] = imx_clk_mux_flags("pll2_bypass", base + 0x30, 16, 1, pll2_bypass_sels, ARRAY_SIZE(pll2_bypass_sels), CLK_SET_RATE_PARENT);