From patchwork Wed Apr 17 18:43:02 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 237341 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Received: from casper.infradead.org (casper.infradead.org [IPv6:2001:770:15f::2]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 766F62C0171 for ; Thu, 18 Apr 2013 04:43:40 +1000 (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 1USXKH-000544-ST; Wed, 17 Apr 2013 18:43:26 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1USXKE-0003pu-V8; Wed, 17 Apr 2013 18:43:22 +0000 Received: from mail-qe0-f46.google.com ([209.85.128.46]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1USXKC-0003pb-5M for linux-arm-kernel@lists.infradead.org; Wed, 17 Apr 2013 18:43:20 +0000 Received: by mail-qe0-f46.google.com with SMTP id nd7so1100891qeb.33 for ; Wed, 17 Apr 2013 11:43:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer; bh=Ry21QP/dlE8jx+WKHLfsiGvrSFHJYkLZr6ony4uJSCQ=; b=MRta3CYRlFNtEv1RS41FSCSSRJgzpUyS6FJxrDjxKPodoJ2mjCOBA0IpTFWq1W1NoV r0JSZ9BbobpFJSE1uekxoApsD7ZWp1kL64/MXe/PYjAwK3fI8p1vVDzvRCHY5NfnvE4x tldnFtkbHhhy90VlRswVxJNqMZFKerr5cDtMJuHyO6Ply444UZmSPnG66HMaYecRKu82 VKt1DkmNgKUGPkBFX9CXt3Zw2cOpMARPyOQsE6QXJbgVxQEE5PDrbpIwjzYgLhzcszLQ X2ARz6RYq2W9pPheH3/HuYhxyR0uMkPt++TPbBLcNDGvVOkMCV/JOGuiBfIclTC9+ubZ TWgg== X-Received: by 10.229.144.207 with SMTP id a15mr49409qcv.37.1366224198893; Wed, 17 Apr 2013 11:43:18 -0700 (PDT) Received: from localhost.localdomain ([187.64.220.204]) by mx.google.com with ESMTPS id u3sm9609133qab.1.2013.04.17.11.43.16 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 17 Apr 2013 11:43:18 -0700 (PDT) From: Fabio Estevam To: shawn.guo@linaro.org Subject: [PATCH] ARM: mach-imx6q: Remove code for setting up cko clock Date: Wed, 17 Apr 2013 15:43:02 -0300 Message-Id: <1366224182-29285-1-git-send-email-festevam@gmail.com> X-Mailer: git-send-email 1.7.9.5 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130417_144320_258795_9053E613 X-CRM114-Status: GOOD ( 10.90 ) X-Spam-Score: -2.7 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.128.46 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (festevam[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: Fabio Estevam , matt@genesi-usa.com, mfuzzey@gmail.com, linux-arm-kernel@lists.infradead.org, kernel@pengutronix.de 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 From: Fabio Estevam Let the bootloader setup the cko clock that drives the audio codec. This simplifies a lot the code and when a new board needs to add audio support, it will not have to add all this amount of code again. Signed-off-by: Fabio Estevam --- arch/arm/mach-imx/mach-imx6q.c | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/arch/arm/mach-imx/mach-imx6q.c b/arch/arm/mach-imx/mach-imx6q.c index 5536fd8..fe896a8 100644 --- a/arch/arm/mach-imx/mach-imx6q.c +++ b/arch/arm/mach-imx/mach-imx6q.c @@ -113,36 +113,11 @@ static int ksz9021rn_phy_fixup(struct phy_device *phydev) return 0; } -static void __init imx6q_sabrelite_cko1_setup(void) -{ - struct clk *cko1_sel, *ahb, *cko1; - unsigned long rate; - - cko1_sel = clk_get_sys(NULL, "cko1_sel"); - ahb = clk_get_sys(NULL, "ahb"); - cko1 = clk_get_sys(NULL, "cko1"); - if (IS_ERR(cko1_sel) || IS_ERR(ahb) || IS_ERR(cko1)) { - pr_err("cko1 setup failed!\n"); - goto put_clk; - } - clk_set_parent(cko1_sel, ahb); - rate = clk_round_rate(cko1, 16000000); - clk_set_rate(cko1, rate); -put_clk: - if (!IS_ERR(cko1_sel)) - clk_put(cko1_sel); - if (!IS_ERR(ahb)) - clk_put(ahb); - if (!IS_ERR(cko1)) - clk_put(cko1); -} - static void __init imx6q_sabrelite_init(void) { if (IS_BUILTIN(CONFIG_PHYLIB)) phy_register_fixup_for_uid(PHY_ID_KSZ9021, MICREL_PHY_ID_MASK, ksz9021rn_phy_fixup); - imx6q_sabrelite_cko1_setup(); } static void __init imx6q_1588_init(void)