From patchwork Fri May 20 02:59:47 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 9128589 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 EF04160213 for ; Fri, 20 May 2016 03:00:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E32042094F for ; Fri, 20 May 2016 03:00:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D7AED21BED; Fri, 20 May 2016 03:00:15 +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.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, 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 7FF932094F for ; Fri, 20 May 2016 03:00:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932717AbcETDAN (ORCPT ); Thu, 19 May 2016 23:00:13 -0400 Received: from mail-yw0-f194.google.com ([209.85.161.194]:32776 "EHLO mail-yw0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932402AbcETDAK (ORCPT ); Thu, 19 May 2016 23:00:10 -0400 Received: by mail-yw0-f194.google.com with SMTP id y6so13129965ywe.0; Thu, 19 May 2016 20:00:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=Yz8t7tF5ek5COEYwHigSfCpPb5G0wA0jcvKGOXsUp1g=; b=DnPs4TmwMyIbDGXSDRobQqj57kr6BfefnDBms1tjSu2GpJyryLxA7EvTLMzp6sAnIx 0FpG1LYuOYZVf9rnGWKt8wuTODZ3Uuv9K16P0kKiCPYP6BxAebLaOzBkyq22Vgw+N0Pk Fyp8uumaQ5elCHt5bK1zC1PXxKqI7+LGenOgYvoSbIuVIzIcC70MauOjIA7Z0U4eOnZz LlRWhUc28KTRaSG+OcwwAG+qiuQrcdJ2iGHGN0yKBS6aMU7wQ4Ba2XgP+6gZ4l8GEGaw k2EHxxsmJMSec2EMD+1PdBqHWdTOMjw0rul6pUNJFy5/Evay0Y3uXzGjIOQwWz36tOqB Kbog== 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; bh=Yz8t7tF5ek5COEYwHigSfCpPb5G0wA0jcvKGOXsUp1g=; b=Z61vbkZh6MOJKKkcKjetzOM91FPvgbFj8k6i1R9/Yu2rRAGlt6GplKRnqAVYPXhLv8 8edv1GyoPasMarDu+ZgbZ6a/cZ3VERoEkvE45zRRUNR7hNRhJyOuai2JKoppU+YDvv5l J22U2IyfhQR9Le8qw/fQZ3OVUVIJ7m8DhbpAjxIqw/etTvPVIJU5RYfBQ9mMvrhPqcya m6VFGWj9An6MgdiTgENA9Ew7MqF72Te0Cph7FhHrdGfwgiMWbX8fnMj97zhyhmgOVNv9 WL08KKrLbSX44EJ2ZZZihgy0mj1KLdYKO6yXWzEX/7ZCZBsyKvqoxStYxlHMrXqWf/zE wnzg== X-Gm-Message-State: AOPr4FVZMgPRc2oAGR/az2rRX/Ka/xDqxGbjlasStcpjOchzxQa68JqzFMu7+m6qOZgOrw== X-Received: by 10.13.217.20 with SMTP id b20mr360753ywe.307.1463713208890; Thu, 19 May 2016 20:00:08 -0700 (PDT) Received: from localhost.localdomain ([179.159.164.244]) by smtp.gmail.com with ESMTPSA id a199sm10041028ywe.30.2016.05.19.20.00.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 19 May 2016 20:00:08 -0700 (PDT) From: Fabio Estevam To: rafael.j.wysocki@intel.com Cc: viresh.kumar@linaro.org, ping.bai@nxp.com, shawnguo@kernel.org, kernel@pengutronix.de, linux-pm@vger.kernel.org, Fabio Estevam , Subject: [PATCH] cpufreq: imx6: Fix the secondary_sel_clk clock string Date: Thu, 19 May 2016 23:59:47 -0300 Message-Id: <1463713188-6896-1-git-send-email-festevam@gmail.com> X-Mailer: git-send-email 1.9.1 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 From: Fabio Estevam Commit a35fc5a33b62a6 ("cpufreq: imx: update the clock switch flow to support imx6ul") introduced the 'secondary_sel_clk' clock, which is specific for the i.mx6ul case, but used the wrong clock string inside the clk_get() function. Use the correct clock string: "secondary_sel_clk". This fixes a kernel crash after running the 'reboot' command on a mx6ul. Fixes: a35fc5a33b62a6 ("cpufreq: imx: update the clock switch flow to support imx6ul") Cc: # 4.4.x Signed-off-by: Fabio Estevam Acked-by: Viresh Kumar --- drivers/cpufreq/imx6q-cpufreq.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/cpufreq/imx6q-cpufreq.c b/drivers/cpufreq/imx6q-cpufreq.c index ef1fa81..00b481e 100644 --- a/drivers/cpufreq/imx6q-cpufreq.c +++ b/drivers/cpufreq/imx6q-cpufreq.c @@ -212,7 +212,7 @@ static int imx6q_cpufreq_probe(struct platform_device *pdev) if (of_machine_is_compatible("fsl,imx6ul")) { pll2_bus_clk = clk_get(cpu_dev, "pll2_bus"); - secondary_sel_clk = clk_get(cpu_dev, "secondary_sel"); + secondary_sel_clk = clk_get(cpu_dev, "secondary_sel_clk"); if (IS_ERR(pll2_bus_clk) || IS_ERR(secondary_sel_clk)) { dev_err(cpu_dev, "failed to get clocks specific to imx6ul\n"); ret = -ENOENT;