From patchwork Wed Jun 8 14:33:38 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aisheng Dong X-Patchwork-Id: 9164919 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 332B860572 for ; Wed, 8 Jun 2016 14:43:04 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1F2ED27248 for ; Wed, 8 Jun 2016 14:43:04 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 13A9628047; Wed, 8 Jun 2016 14:43:04 +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=unavailable 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 C089027248 for ; Wed, 8 Jun 2016 14:43:03 +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 1bAefh-0006P2-Df; Wed, 08 Jun 2016 14:41:29 +0000 Received: from mail-bn1bon0059.outbound.protection.outlook.com ([157.56.111.59] helo=na01-bn1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1bAeeX-00044g-P4 for linux-arm-kernel@lists.infradead.org; Wed, 08 Jun 2016 14:40:22 +0000 Received: from BY2PR03CA074.namprd03.prod.outlook.com (10.141.249.47) by BY2PR0301MB1622.namprd03.prod.outlook.com (10.163.28.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:54 +0000 Received: from BL2FFO11FD010.protection.gbl (2a01:111:f400:7c09::134) by BY2PR03CA074.outlook.office365.com (2a01:111:e400:2c5d::47) 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:54 +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 BL2FFO11FD010.mail.protection.outlook.com (10.173.161.16) with Microsoft SMTP Server (TLS) id 15.1.497.8 via Frontend Transport; Wed, 8 Jun 2016 14:39:53 +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 u58EdPaV005456; Wed, 8 Jun 2016 07:39:49 -0700 From: Dong Aisheng To: Subject: [PATCH 09/11] clk: imx6sx: fix pll clock parents Date: Wed, 8 Jun 2016 22:33:38 +0800 Message-ID: <1465396420-27064-9-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: 131098703941642439; (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)(105606002)(76176999)(86362001)(97736004)(8666004)(92566002)(50986999)(6806005)(81156014)(81166006)(8936002)(2351001)(8676002)(11100500001)(229853001)(47776003)(106466001)(33646002)(36756003)(5008740100001)(110136002)(50466002)(77096005)(189998001)(48376002)(2950100001)(5003940100001)(19580395003)(69596002)(19580405001)(50226002)(104016004)(87936001)(85426001)(586003)(2906002)(4326007)(7059030)(32563001); DIR:OUT; SFP:1101; SCL:1; SRVR:BY2PR0301MB1622; H:az84smr01.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11FD010; 1:g0K8EiIpCBoEon6liDogattmOiZFnLO57GWJtdIaw7i0epYZuEJ2iXtnvfv7rjm967YF8D+NYE+Z2loGTm+2E0ek6ARuZzGJG4BNajDa217aEIUwECpNqIX/82JHJU/2/67zJhjw7QizKnnoU9W8T5OVXIJu8QuIYxf0VIq45XAm7PNshHoV1gEBXpxPdGR49SebZRNTfpISuRylrt6bwRAvEuEiH5Zz+4tCM58Lv76g5DIfQgoZei55HU7z1f3a1aRhcbv7yHe7tAdBmyB5cgtGQeewrib63/Lf1iNYdlQNX8kqTAkNfbb88Vo8Y6jlgTFbY1X60JaeIMOdgRVhOXCqHIx3rPL/7JF/bmlDpfMfCnUXUhQHokOtny0W7XF8ZQFHasxHvsMol86r2SY1W9GQ1YVIg1vI/TRSx/9/jxmjVFUI+i124YfAHNaXyqHNztuTXwN3nEFdTsrOXLp6RKJ+6egUIaIOrAun9cSSIqxKXdoBgMvrAL2EZzvWeXjwOyzR3JSJNvdf7Wk+MzmXq2xLI3j18Kb4MF7l04UqpQFJh1ndwUYTn8+FyC40qwa5B3o7H09DtACkcwYGvJcFAtJ6MtHBHAtztNqqOM12upJDzPCu1MQOgCstOlGk5ex6N6zcwHPE3DtAEHwDyyQ6spC8FfB9jkVZikH+flFex/d8LtyHkLyIVpaI/uGbGmum MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: a5fbae3b-2850-42d3-4768-08d38faac169 X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB1622; 2:Wzfd+SVO74O36MQ66SA032x7k5l9j5b4LgqtoYd/B7iIcYmoIU/iNkMGrxt01ui3P8p1r/b4Gy2MGoURx4fSJj4rIWYyd00mMNLf7Tdyi+U5pfv0agAyw2BV4sN7ERBxi8vUg/zm67bi764vbPr5zChVLySwRJPCNaVhHHQt9quWKSOW6Qy5MED4elGlyUfu; 3:G9Mg1N+CPVLuf9iH9zvNBucn9qjryHTVWQcvBrZ3EPekwKN0GKEhDMkQTUeqXP9MFvyXOoILDRRKDYrKpTiEDH5eK0dS09F0kCEEpMkMaboXk9tB6U/3scYKrpM9khlE8gQp8yxFu3cRbHqrtG3u92dxTKQRXBZUTXmNdElrUGTbUgP6vUFXMb6rgpRVZrgr2GngWpzZ0S89z9tzCOAXWwXhQfzRggzEb2TJnEl+nbc=; 25:O2YfohRMcAvzHlpvcTZ+jy43JhBKSEk2Bt71zg5d1nvUqAerSDrYr6ed/uF7kyEYmg0n9bMGGJDeS3HmkX0Dp9x7TjAnv3sS/9+h4dskY+crXZxPKEx+2EqMKLKQTjsRGCX7W8UkFQjXt6zqodKFp1rVy2pG6L7mNbcxHOi9zbz9Ijp7xiA24kKP9rMbQXXAfbrcmdNc0TRQ2/8zwlNIWwQtzAQER+3ZvAIpzFfC7E7ZJ1ARoTm1CHW+D8i1/VkTks4it+bJgP18W0iXV36jM5sKe3GJ18F4WviuahL6UjULqrFRvGscBnExVjK0GtJlvWEMVw9CvXSn6KesuZZeTtSo4FnhNohChZThMze0aVz9lklhGnV0AMRjbRVdUebOypCNgrlDAtmgSDvRJDzwzZ9+gOHBbS8GDzlzfsm+Vvw= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BY2PR0301MB1622; 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)(13018025)(13023025)(13024025)(8121501046)(5005006)(13017025)(10201501046)(3002001)(6055026); SRVR:BY2PR0301MB1622; BCL:0; PCL:0; RULEID:(400006); SRVR:BY2PR0301MB1622; X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB1622; 4:F5iNvdn2DNyco+sMI4tA++muyCBxNb7BFMzvZjjc+G5Od/XSSgoRG6wMzlvZqwXumo2QPZFaZYaw1+sQIm+Ewh+7jcGC9qyqcuVgiEUDaDGxp0TPhqAGvznjXtDnnBg4JIn9daI79tILBUPrVb9UMFMd9bddR1gcm8iv/E6soZk4CngTf8l2RnGiMs4JyAXcOu49/QcTFKuZY0XStMeAswBLxRa/HcoM/cbUS4m+fs5Mjowlz9WHA1HzF+4yGhxD/TUWZUd0Cmnl812bptsAvEpgtQjGfbwUNwKB14jSdI6RX5qGgOmZCKk3Xrch8n6fYUecc1LNcdvR7zLpcNcnLYIgSlKKsq+ztzg+wCxsFYFDDC635LG+9m3SXxCo/8DknHrbw9LGdJyMAOtqK0ePYHBe0aod66guUjqbhtbKbWoMNbT74Vb7xFI7MwCfz60wBLmkvlBY6ZLym9yhT/TX5VNMNaWfvX23Ik7HV1s/xVPxlxSLc0QJOmf+kZaWJdFeFhWpyK8vtPqYhngNJVGP9g== X-Forefront-PRVS: 0967749BC1 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BY2PR0301MB1622; 23:hxuI4rYPKhKpTM8bbHvfq4QymGpIWuYAH32VFs0?= =?us-ascii?Q?e9UoEAa0Q/+pY4b6UW3KqDAQPLKxbk8YQPJguIiS421xfZsl4X6Bzl8Js6PB?= =?us-ascii?Q?6LbLqG4g68gMjxj9dKDVrbcsl9bb9MlrR/LlouYEJHQx8pN/PmINU333IeHc?= =?us-ascii?Q?/4tVufASd9PbFgsAoK2xNrep8rpCcRPvXdbB72zNxeQirjBR6WHfEXQHL85G?= =?us-ascii?Q?jGp2/oygBpdEWo5Xj6UfPb1RlhSOsWo1xBacEeCqQ0cZCWowjU5kAIaegZ7b?= =?us-ascii?Q?dmREul/F8eoWWZrK9QtzIG1wo2UE8efKK/EjufH9WcxXTtfYIYBfNFafHxRF?= =?us-ascii?Q?f7/Gf/Q/v+CAKo1RrMBtDqEZwZYap1524xv7M27V3/NlEKwbsr8IUXPYofWn?= =?us-ascii?Q?SMsAGREJmFTn4v9GSCvKiVBLdt0wAprZnGckfYX9QxYge+VC/aINE5Xi8fQF?= =?us-ascii?Q?rySSMk9AYBitCXs5be9Pvs7uBZHQYEV3yLGM1dzdUY+qq12BUhS4mkowQXPd?= =?us-ascii?Q?IQ0lU5Vk0M57OVkEr6W9ZlhI45JbJhPXYcXDJKDiIFKFTszj3rzfo89YUn7y?= =?us-ascii?Q?Vtgtwj2HlFNtbJb4BGGHiKewm8uyFtMvnRXIBcy6nE4M4fo6hSnv2UiOczgO?= =?us-ascii?Q?JkersybHdIAW9KxkPB2/JMRPgeDnlvxfXn0x4P8miqhHOvABvdPTh8IOvnw7?= =?us-ascii?Q?K7OTTWPr3UVBK4xmuweZCwHB0QKTo1kkTQKzL8Nxgg88/EHn5UtP+AxqL8OX?= =?us-ascii?Q?ujdmpQ1DG04CJuNFY5WxOu0wsB1rn3wavmEnGUsBWYGi+39wMLz0nrLuwcbV?= =?us-ascii?Q?WbrNW8FjadSrfQ7UoFnVSn26AXQDo/BXD/TyBM2sVOFfpXdf0NNJSB7gOTx9?= =?us-ascii?Q?A/PnVqqhmM84Q26VhF305qOopgFCrKfJmug8VqI9QMvX4CsJRLa2SB0sag7O?= =?us-ascii?Q?S0KJtezxye7u+aaSt1FrwoEWsJ7+JCIhdNKhOHgBEltqWc7v8d33g/uwHJ9B?= =?us-ascii?Q?9OgnztEiOA5g/yTuYY8HsGHTriaa/TrJdEDA9yAFlOpYqFHUJVNRaYaGox2H?= =?us-ascii?Q?2RhfpdYNvYFkUCg6VZ5O5Obz6ZaK3GzOxThyCYMOOSUZZyWnwGlZ1jbXZVZL?= =?us-ascii?Q?7YzJs4cENxmY2jor73ObnwLc8hMBiErPWF7+nPuUhqujTjJeL+TW4PjRvpYY?= =?us-ascii?Q?bj1k9ke2zWqIhcdU=3D?= X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB1622; 5:PKMxFmwZ+/lY+UeZfTHch4WRwuHhNNi+FLFVUz0zX6CjPQfQ92bPK5knaCOLNEnItnTiXh68s6ECpXnxOE1cdmOlVAnt9JWneLvx5j56NXE5jg3Se61YTZjQpM+o4gYqhUI1twq3IyIXaKL+rF60mqvS232L3jSUEsjSUoMVS9A=; 24:mJkWh4XDcffsxkOOaqqqXgsZLvP4X6LhbUOdz3PYvlZgexXz/dTLt057ucalQtK6lOLYKMqgq9w+4MDJMrnBgM3cSTig0jl2PAyh/Hn1eUo=; 7:8XAfu0rgtei8wQuZV7oHgfizGEY2f0LHXVRTrMEDbZu5yW48qv/w5ZtrOToI1IDIZK6TBJlU+bmbwm6mteK27gbLjRIjZ4U5Hyiuv7+u//7qs4sCNAS2Y6Cwf/lHVmk9cyUSmCMkJKFgeQQmZg24oWYu7ju6tZCI9Q9838FAduzrh7rpCL7bOuvSD3wZGz7MwgrzFIomKgblAUzJdOkqX+xl8PQkXZNy3tmNuf+MTes= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Jun 2016 14:39:53.6494 (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: BY2PR0301MB1622 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160608_074021_321241_DC57A226 X-CRM114-Status: UNSURE ( 8.49 ) 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-imx6sx.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/clk/imx/clk-imx6sx.c b/drivers/clk/imx/clk-imx6sx.c index 97e742a8be17..b5c96de41ccf 100644 --- a/drivers/clk/imx/clk-imx6sx.c +++ b/drivers/clk/imx/clk-imx6sx.c @@ -174,13 +174,13 @@ static void __init imx6sx_clocks_init(struct device_node *ccm_node) clks[IMX6SX_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[IMX6SX_CLK_PLL1] = imx_clk_pllv3(IMX_PLLV3_SYS, "pll1", "pll1_bypass_src", base + 0x00, 0x7f); - clks[IMX6SX_CLK_PLL2] = imx_clk_pllv3(IMX_PLLV3_GENERIC, "pll2", "pll2_bypass_src", base + 0x30, 0x1); - clks[IMX6SX_CLK_PLL3] = imx_clk_pllv3(IMX_PLLV3_USB, "pll3", "pll3_bypass_src", base + 0x10, 0x3); - clks[IMX6SX_CLK_PLL4] = imx_clk_pllv3(IMX_PLLV3_AV, "pll4", "pll4_bypass_src", base + 0x70, 0x7f); - clks[IMX6SX_CLK_PLL5] = imx_clk_pllv3(IMX_PLLV3_AV, "pll5", "pll5_bypass_src", base + 0xa0, 0x7f); - clks[IMX6SX_CLK_PLL6] = imx_clk_pllv3(IMX_PLLV3_ENET, "pll6", "pll6_bypass_src", base + 0xe0, 0x3); - clks[IMX6SX_CLK_PLL7] = imx_clk_pllv3(IMX_PLLV3_USB, "pll7", "pll7_bypass_src", base + 0x20, 0x3); + clks[IMX6SX_CLK_PLL1] = imx_clk_pllv3(IMX_PLLV3_SYS, "pll1", "osc", base + 0x00, 0x7f); + clks[IMX6SX_CLK_PLL2] = imx_clk_pllv3(IMX_PLLV3_GENERIC, "pll2", "osc", base + 0x30, 0x1); + clks[IMX6SX_CLK_PLL3] = imx_clk_pllv3(IMX_PLLV3_USB, "pll3", "osc", base + 0x10, 0x3); + clks[IMX6SX_CLK_PLL4] = imx_clk_pllv3(IMX_PLLV3_AV, "pll4", "osc", base + 0x70, 0x7f); + clks[IMX6SX_CLK_PLL5] = imx_clk_pllv3(IMX_PLLV3_AV, "pll5", "osc", base + 0xa0, 0x7f); + clks[IMX6SX_CLK_PLL6] = imx_clk_pllv3(IMX_PLLV3_ENET, "pll6", "osc", base + 0xe0, 0x3); + clks[IMX6SX_CLK_PLL7] = imx_clk_pllv3(IMX_PLLV3_USB, "pll7", "osc", base + 0x20, 0x3); clks[IMX6SX_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[IMX6SX_PLL2_BYPASS] = imx_clk_mux_flags("pll2_bypass", base + 0x30, 16, 1, pll2_bypass_sels, ARRAY_SIZE(pll2_bypass_sels), CLK_SET_RATE_PARENT);