From patchwork Mon Dec 5 10:09:07 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 9460751 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 0513260459 for ; Mon, 5 Dec 2016 10:10:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EF3A026242 for ; Mon, 5 Dec 2016 10:10:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E17A226419; Mon, 5 Dec 2016 10:10:08 +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.3 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID 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 6AEA622ADC for ; Mon, 5 Dec 2016 10:10:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752514AbcLEKKF (ORCPT ); Mon, 5 Dec 2016 05:10:05 -0500 Received: from mail-wm0-f53.google.com ([74.125.82.53]:35317 "EHLO mail-wm0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752193AbcLEKJW (ORCPT ); Mon, 5 Dec 2016 05:09:22 -0500 Received: by mail-wm0-f53.google.com with SMTP id a197so89013176wmd.0 for ; Mon, 05 Dec 2016 02:09:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=gNiZq+2DEZXRUb44J+yEPsz8UFnrnr9Fob6YTrs0r8o=; b=br/6cX35fCxDLeuATshsB5s6ikoy3UnWwdfRrK6s/4qP5MTSWsPuO06Msg6PLEIW8l sFvsiwPwKCr/sly9jmwhYm0913amkGQSvIHkjk65grUMwExukKNUk6vow4b/1ZVZ3HZF P2cLfuod7VbTDOfY6JgZJJqpokfTO/Uen/p8Z5o5lv2KpSi3aPtQNyrUNKS0MmX1zLnk xA1tcm/q0EVC7P8s/w0V7mEb2KnOb7O0643ARm9ibKujQ3WuPqV1XPoM1O1HBwII7IpT MatULSqjTY2Dm6XDLMwoaakVDiIXvYoZB7c/2isnSnVb/8XPJWqx2e3jW+AoPVg321kW JSDw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=gNiZq+2DEZXRUb44J+yEPsz8UFnrnr9Fob6YTrs0r8o=; b=Ykuzf6Ywbzu0LEKHpyarPwBm6eKCRb6kp+Xnx4IJx/ZNlYQMcbi7LU0fYvlY9R+M/n dGrvknukuYlYzXH56fuY8w7exO1Arr4QFZae9TUQfSkppa0u7SanEgcCnvue4VRVf0Uc woQFshXmYJyLgUdLSyuX2XTZrtGjKW+YbFdFzwml/4c8Oqv1Wi8PHId3IYC62FlrvzrT MMSNw8KkS7F2SoyamaiIbWLZ03BoHpRD3YUyV1gCNt5F9U4wdxJ+2xA3by0leRoCzmxp tztMEdhXLB3viSamrFEFKb8/ipyxDZAsm8yt9KJcohQkgg479cFMN9pZQXZEjZ0xHjt9 CXhQ== X-Gm-Message-State: AKaTC03nd7nAlV0km6BfTXFVCcdEQRwU8dap1J4+FJQMknbIuC5SwU5U9IdHcwxiXsJQDmlR X-Received: by 10.28.40.67 with SMTP id o64mr7791202wmo.40.1480932555977; Mon, 05 Dec 2016 02:09:15 -0800 (PST) Received: from localhost.localdomain ([90.63.244.31]) by smtp.gmail.com with ESMTPSA id ef10sm19526939wjd.22.2016.12.05.02.09.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 05 Dec 2016 02:09:15 -0800 (PST) From: Bartosz Golaszewski To: Kevin Hilman , Michael Turquette , Sekhar Nori , Peter Ujfalusi , Russell King , Viresh Kumar , Boris Brezillon , "Rafael J. Wysocki" , Richard Weinberger , David Woodhouse , Brian Norris , Marek Vasut , Cyrille Pitchen Cc: LKML , arm-soc , linux-pm@vger.kernel.org, Bartosz Golaszewski Subject: [PATCH v3 1/3] ARM: da850: fix infinite loop in clk_set_rate() Date: Mon, 5 Dec 2016 11:09:07 +0100 Message-Id: <1480932549-30811-2-git-send-email-bgolaszewski@baylibre.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1480932549-30811-1-git-send-email-bgolaszewski@baylibre.com> References: <1480932549-30811-1-git-send-email-bgolaszewski@baylibre.com> Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The aemif clock is added twice to the lookup table in da850.c. This breaks the children list of pll0_sysclk3 as we're using the same list links in struct clk. When calling clk_set_rate(), we get stuck in propagate_rate(). Create a separate clock for nand, inheriting the rate of the aemif clock and retrieve it in the davinci_nand module. Signed-off-by: Bartosz Golaszewski --- arch/arm/mach-davinci/da850.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-davinci/da850.c b/arch/arm/mach-davinci/da850.c index e770c97..c008e5e 100644 --- a/arch/arm/mach-davinci/da850.c +++ b/arch/arm/mach-davinci/da850.c @@ -367,6 +367,11 @@ static struct clk aemif_clk = { .flags = ALWAYS_ENABLED, }; +static struct clk aemif_nand_clk = { + .name = "nand", + .parent = &aemif_clk, +}; + static struct clk usb11_clk = { .name = "usb11", .parent = &pll0_sysclk4, @@ -537,7 +542,7 @@ static struct clk_lookup da850_clks[] = { CLK("da830-mmc.0", NULL, &mmcsd0_clk), CLK("da830-mmc.1", NULL, &mmcsd1_clk), CLK("ti-aemif", NULL, &aemif_clk), - CLK(NULL, "aemif", &aemif_clk), + CLK(NULL, "aemif", &aemif_nand_clk), CLK("ohci-da8xx", "usb11", &usb11_clk), CLK("musb-da8xx", "usb20", &usb20_clk), CLK("spi_davinci.0", NULL, &spi0_clk),