Received: by 2002:ac0:a5b6:0:0:0:0:0 with SMTP id m51-v6csp3690470imm; Mon, 18 Jun 2018 02:21:46 -0700 (PDT) X-Google-Smtp-Source: ADUXVKIFa+EWV3/8DgnSMW5AZ7ezFCERsUjg3Srcn70lQzqkk3CoUuwbfy3GY7f9wiaXHmoKYDEQ X-Received: by 2002:a17:902:8685:: with SMTP id g5-v6mr13158105plo.180.1529313706795; Mon, 18 Jun 2018 02:21:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529313706; cv=none; d=google.com; s=arc-20160816; b=lb+We0jDlybu4DttzOMP4CtIBVDfDAuHwspDChtaPd1z4TXHLl+404sxjFoq9V7uFi +1j2WeWCH5GY8s3hBfNbmd6+J/4nilLnesMmXhqtNRWXfKsoll/KSWUoHq9obJ8OIrDR pqua0HzkOt5lr6E0x/2w3WqIL7MWDH37SWq46xu2c1RCs+uvfc0DcsZmqHtwoCRcRh9d 5oG017R3FniMIVzLB2W41IpLsDKAe9lQOMP+McluKF/igA09ODvLfal5ywDQ9t26OifF KgNA1aCSYlfIsie2ueC0k9gtEfc00pjqt5sglfd1iv9gM/HYyfnmydytCE6/5ZxjOuka +qYw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent:references :in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=yZeRo2o4Gl8Iur7AWP2PEz3FHuZ2BIYMBQKN42v4f2A=; b=UA3Owjsi7QfTF8tZKenlWIDGZXLQXd9KaMRuTt5wF2DlGzmp/agKs/1s8l0yPgR23A HgFFJsaF2hG0YVZJBRvj3/oWxx6buMnpk445UFG9oEzSOpuCiPq7kEqKknroSQ/J+xzZ hRYTMAP2schBZ5HfWmgux3HbrdhHNotKpg2YZ/DCV2sCbAzug5Mt5QorZc/vHC9N1vhW f/S6tWclXp79lpXv1NtPQj21sSsRPjFbLXYHEIBAqzO2O05MFP05zeeFAfpBO+V/8YJB iQ89qsHF7xmlZ8R5b+tU3iSyYso+FEneZRQewQ0aK6hpqjlkBNNVM/GVNpGcd/V+mtjI oTjg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id v72-v6si14155723pfa.103.2018.06.18.02.21.26; Mon, 18 Jun 2018 02:21:46 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S966538AbeFRI1y (ORCPT + 99 others); Mon, 18 Jun 2018 04:27:54 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:58390 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S966524AbeFRI1w (ORCPT ); Mon, 18 Jun 2018 04:27:52 -0400 Received: from localhost (LFbn-1-12247-202.w90-92.abo.wanadoo.fr [90.92.61.202]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id 60733C5C; Mon, 18 Jun 2018 08:27:51 +0000 (UTC) From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Stefan Agner , Stephen Boyd , Sasha Levin Subject: [PATCH 4.16 266/279] clk: imx6ull: use OSC clock during AXI rate change Date: Mon, 18 Jun 2018 10:14:11 +0200 Message-Id: <20180618080619.702417546@linuxfoundation.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180618080608.851973560@linuxfoundation.org> References: <20180618080608.851973560@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.16-stable review patch. If anyone has any objections, please let me know. ------------------ From: Stefan Agner [ Upstream commit 2e5be528ab0182ad4b42b9feea3b80f85f37179b ] On i.MX6 ULL using PLL3 seems to cause a freeze when setting the parent to IMX6UL_CLK_PLL3_USB_OTG. This only seems to appear since commit 6f9575e55632 ("clk: imx: Add CLK_IS_CRITICAL flag for busy divider and busy mux"), probably because the clock is now forced to be on. Fixes: 6f9575e55632("clk: imx: Add CLK_IS_CRITICAL flag for busy divider and busy mux") Signed-off-by: Stefan Agner Signed-off-by: Stephen Boyd Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- drivers/clk/imx/clk-imx6ul.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/clk/imx/clk-imx6ul.c +++ b/drivers/clk/imx/clk-imx6ul.c @@ -461,7 +461,7 @@ static void __init imx6ul_clocks_init(st clk_set_rate(clks[IMX6UL_CLK_AHB], 99000000); /* Change periph_pre clock to pll2_bus to adjust AXI rate to 264MHz */ - clk_set_parent(clks[IMX6UL_CLK_PERIPH_CLK2_SEL], clks[IMX6UL_CLK_PLL3_USB_OTG]); + clk_set_parent(clks[IMX6UL_CLK_PERIPH_CLK2_SEL], clks[IMX6UL_CLK_OSC]); clk_set_parent(clks[IMX6UL_CLK_PERIPH], clks[IMX6UL_CLK_PERIPH_CLK2]); clk_set_parent(clks[IMX6UL_CLK_PERIPH_PRE], clks[IMX6UL_CLK_PLL2_BUS]); clk_set_parent(clks[IMX6UL_CLK_PERIPH], clks[IMX6UL_CLK_PERIPH_PRE]);