From patchwork Wed Dec 18 01:17:30 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Tobias X-Patchwork-Id: 302605 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Received: from casper.infradead.org (unknown [IPv6:2001:770:15f::2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id B1C972C0089 for ; Wed, 18 Dec 2013 12:19:50 +1100 (EST) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Vt5mT-0004IY-8j; Wed, 18 Dec 2013 01:18:33 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Vt5mI-0000Bw-Kk; Wed, 18 Dec 2013 01:18:22 +0000 Received: from mail-pb0-x232.google.com ([2607:f8b0:400e:c01::232]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Vt5ly-00009g-2h for linux-arm-kernel@lists.infradead.org; Wed, 18 Dec 2013 01:18:02 +0000 Received: by mail-pb0-f50.google.com with SMTP id rr13so7724997pbb.37 for ; Tue, 17 Dec 2013 17:17:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=0cHwjM2+r4+UN3aQx/mnumW4FLwJAat10yWmnFaVzhc=; b=AS0YXMo+S58voi3EOhFqpQMhr0jpUPKPUtmScX0VyUKHYoUwZqbb89sOmZPMPzmv0t 3V6p7Jf85ztUFVH2Tj+Yef7YAv76t18W58qb/8f5ziFuJnvd9MBtMZHVbFeLEsQ40zWy 3xpZjm6BgG0diP7cKEuGQ5FH1xRMOXjUYYYxRAJIHA1q4pKC9gWfVJxwAtGdgj5eOW4d tIq2Fuks39lPNsHoqxG70bJQ95eaPhP+2FhEgWuG9zD/W3I/1Mv03kcqQe0lMvizCVRi b/YMZG6p8B4fy2shjEVJ/p7spUUqtzszlR0j8EMen5HjcQzJ8T5YbB/b9YSbvV0CNDbn Jrtg== X-Received: by 10.68.143.132 with SMTP id se4mr14240120pbb.167.1387329460751; Tue, 17 Dec 2013 17:17:40 -0800 (PST) Received: from localhost.localdomain (morse-p.static.monkeybrains.net. [208.90.214.40]) by mx.google.com with ESMTPSA id rz6sm50095689pab.22.2013.12.17.17.17.39 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 17 Dec 2013 17:17:40 -0800 (PST) From: John Tobias To: linux-arm-kernel@lists.infradead.org, linux-mmc@vger.kernel.org, shawn.guo@linaro.org, festevam@gmail.com, cjb@laptop.org Subject: [PATCH 3/4] Removing imx6q_opp_init Date: Tue, 17 Dec 2013 17:17:30 -0800 Message-Id: <1387329451-17480-3-git-send-email-john.tobias.ph@gmail.com> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1387329451-17480-1-git-send-email-john.tobias.ph@gmail.com> References: <1387329451-17480-1-git-send-email-john.tobias.ph@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20131217_201802_192855_EEC7B197 X-CRM114-Status: GOOD ( 15.04 ) X-Spam-Score: -2.0 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (john.tobias.ph[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Cc: John Tobias X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org List-Id: linux-imx-kernel.lists.patchwork.ozlabs.org Since of_init_opp_table is in imx6q-cpufreq.c, the imx6q_opp_init is no longer needed anymore. The only question right now is the imx6q_opp_check_1p2ghz function. Is the function below are acceptible under imx6q_init_late?. if (!cpu_dev) imx6q_opp_check_1p2ghz(cpu_dev); If not, what is the better way to impelement because the said function is board specific?. Signed-off-by: John Tobias --- arch/arm/mach-imx/mach-imx6q.c | 30 ++++-------------------------- 1 file changed, 4 insertions(+), 26 deletions(-) diff --git a/arch/arm/mach-imx/mach-imx6q.c b/arch/arm/mach-imx/mach-imx6q.c index d0cfb22..f5d9e04 100644 --- a/arch/arm/mach-imx/mach-imx6q.c +++ b/arch/arm/mach-imx/mach-imx6q.c @@ -183,31 +183,6 @@ put_node: of_node_put(np); } -static void __init imx6q_opp_init(void) -{ - struct device_node *np; - struct device *cpu_dev = get_cpu_device(0); - - if (!cpu_dev) { - pr_warn("failed to get cpu0 device\n"); - return; - } - np = of_node_get(cpu_dev->of_node); - if (!np) { - pr_warn("failed to find cpu0 node\n"); - return; - } - - if (of_init_opp_table(cpu_dev)) { - pr_warn("failed to init OPP table\n"); - goto put_node; - } - - imx6q_opp_check_1p2ghz(cpu_dev); - -put_node: - of_node_put(np); -} static struct platform_device imx6q_cpufreq_pdev = { .name = "imx6q-cpufreq", @@ -215,6 +190,7 @@ static struct platform_device imx6q_cpufreq_pdev = { static void __init imx6q_init_late(void) { + struct device *cpu_dev = get_cpu_device(0); /* * WAIT mode is broken on TO 1.0 and 1.1, so there is no point * to run cpuidle on them. @@ -223,8 +199,10 @@ static void __init imx6q_init_late(void) imx6q_cpuidle_init(); if (IS_ENABLED(CONFIG_ARM_IMX6Q_CPUFREQ)) { - imx6q_opp_init(); platform_device_register(&imx6q_cpufreq_pdev); + + if (!cpu_dev) + imx6q_opp_check_1p2ghz(cpu_dev); } }