From patchwork Wed Apr 18 12:49:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Agner X-Patchwork-Id: 10348105 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 739126053F for ; Wed, 18 Apr 2018 12:51:34 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 61536286A4 for ; Wed, 18 Apr 2018 12:51:34 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5D4BB28744; Wed, 18 Apr 2018 12:51:34 +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=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 9862F286A4 for ; Wed, 18 Apr 2018 12:50:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Owner; bh=YMq3BPriuU2NpsdNJ/j1rwe9HPHUEdNdkHH5XhnUR28=; b=ZZV lTui/O0xmww452HjeLPT0R+QNyzosnxJjeqSRCiqP+WVpIHUFRTp3/E9Ps4gvOZi7FG8ohy1fUiuF 3rgHLNkMavuPGJex3RQLL4Csje3cBP+yWnidR8G9na79UXAO1oBmLQYaxJ1gfC/GjpVp/LmdD0Ivg o5MUxJoAxUP1LNJ4DR/e8/CNbjItVTktGI9EPHajfShWlviYncyY9O5wXKfp4seh5y+WuDyTCyNT+ MwvIJYUPQteyT0l7sozZep7BU+S8lvwPZXMErtRetPMquaOWRImbnDISFKH9oQdr+DBjhZFr/qrQU XxCxmYek9dqBqWTQV9Ec7waj1PD73Mg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1f8mXh-0002Fe-QU; Wed, 18 Apr 2018 12:50:33 +0000 Received: from merlin.infradead.org ([2001:8b0:10b:1231::1]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1f8mWp-0000qK-82 for linux-arm-kernel@bombadil.infradead.org; Wed, 18 Apr 2018 12:49:39 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=merlin.20170209; h=Message-Id:Date:Subject:Cc:To:From: Sender:Reply-To:MIME-Version:Content-Type:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=OfPIMYE3KFxKQkfuuspZAKH2Zsncts/W2cn9+VxyZC8=; b=nLjzXpN7KGzJEgV/sUxy+lRIp 0Ttr4Np2mVdXQ06DQ50AH14hhyMyeXJT6H6LHjzScJljakLtfrWk46D283fJKe6BsrHUYE2JNiCiD cLVWZnn9ARD90wgqgG1K6a/X3iWlMSALgsP0y7FxfLEF/BZJlNVQPlu+BGEvPfewip6JeUwhL9Xix qq5BR+cN7OPS8Kzl182E3VO81SgjhrHBv2dTFTgoCE0YaltOcR7oNgZ+zkHH/xIlh2civIix5w8av ZmJzlmmbC16Ajw1/89BWPgQkP6/76ROYqC10lE/4uTE/dJl3de6E22V2WyvPww4NPTarMTlWbJxvv zdrM2xitA==; Received: from mail.kmu-office.ch ([2a02:418:6a02::a2]) by merlin.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1f8mWm-0001MY-0t for linux-arm-kernel@lists.infradead.org; Wed, 18 Apr 2018 12:49:37 +0000 Received: from trochilidae.toradex.int (unknown [IPv6:2001:1620:c6e:10::3]) by mail.kmu-office.ch (Postfix) with ESMTPSA id 045AF5C0B22; Wed, 18 Apr 2018 14:49:15 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=agner.ch; s=dkim; t=1524055756; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:content-type:content-transfer-encoding: in-reply-to:references; bh=OfPIMYE3KFxKQkfuuspZAKH2Zsncts/W2cn9+VxyZC8=; b=rL9Zbi2oS+7Yg0xzCSz65BP1hBdNjeEd45ZxTCYhPCKm2QsWaQtT8uLESPSO5huQFM7IKD Ovu70kTuWkNq39xYI2oTjwrf0h7SM/FvMNFuMk1CsiHjz+6+EsJh4FCn17Jt42UJIrc6nu 1Zxs8lusug0Kn5mmOHnsjfpTapcBX6Q= From: Stefan Agner To: shawnguo@kernel.org, kernel@pengutronix.de Subject: [PATCH] clk: imx6ull: use OSC clock during AXI rate change Date: Wed, 18 Apr 2018 14:49:08 +0200 Message-Id: <20180418124908.3079-1-stefan@agner.ch> X-Mailer: git-send-email 2.17.0 X-Spamd-Result: default: False [-2.10 / 15.00]; RCVD_TLS_ALL(0.00)[]; ASN(0.00)[asn:13030, ipnet:2001:1620::/32, country:CH]; RCVD_COUNT_ZERO(0.00)[0]; FROM_HAS_DN(0.00)[]; MID_CONTAINS_FROM(1.00)[]; TO_DN_SOME(0.00)[]; MIME_GOOD(-0.10)[text/plain]; FROM_EQ_ENVFROM(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; BAYES_HAM(-3.00)[100.00%]; ARC_NA(0.00)[]; DKIM_SIGNED(0.00)[]; RCPT_COUNT_SEVEN(0.00)[9] X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180418_084936_182900_562C83EB X-CRM114-Status: GOOD ( 14.90 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: sboyd@kernel.org, mturquette@baylibre.com, linux-kernel@vger.kernel.org, Stefan Agner , fabio.estevam@nxp.com, linux-clk@vger.kernel.org, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 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 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 --- This addresses a regression ssen on v4.17-rc1 where the kernel boots during clock initialization, see also: https://patchwork.kernel.org/patch/10295927/ drivers/clk/imx/clk-imx6ul.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/clk/imx/clk-imx6ul.c b/drivers/clk/imx/clk-imx6ul.c index 114ecbb94ec5..12320118f8de 100644 --- a/drivers/clk/imx/clk-imx6ul.c +++ b/drivers/clk/imx/clk-imx6ul.c @@ -464,7 +464,7 @@ static void __init imx6ul_clocks_init(struct device_node *ccm_node) 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]);