From patchwork Thu Nov 10 04:54:11 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Zhao X-Patchwork-Id: 5014 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 63EE123E01 for ; Thu, 10 Nov 2011 04:54:58 +0000 (UTC) Received: from mail-fx0-f52.google.com (mail-fx0-f52.google.com [209.85.161.52]) by fiordland.canonical.com (Postfix) with ESMTP id 58F7CA18202 for ; Thu, 10 Nov 2011 04:54:58 +0000 (UTC) Received: by mail-fx0-f52.google.com with SMTP id n26so3473983faa.11 for ; Wed, 09 Nov 2011 20:54:58 -0800 (PST) Received: by 10.152.102.138 with SMTP id fo10mr3508583lab.44.1320900898200; Wed, 09 Nov 2011 20:54:58 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.152.3.196 with SMTP id e4cs8553lae; Wed, 9 Nov 2011 20:54:58 -0800 (PST) Received: by 10.68.14.97 with SMTP id o1mr11406641pbc.0.1320900895825; Wed, 09 Nov 2011 20:54:55 -0800 (PST) Received: from VA3EHSOBE001.bigfish.com (va3ehsobe001.messaging.microsoft.com. [216.32.180.11]) by mx.google.com with ESMTPS id z3si9309897pbz.273.2011.11.09.20.54.54 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 09 Nov 2011 20:54:55 -0800 (PST) Received-SPF: neutral (google.com: 216.32.180.11 is neither permitted nor denied by best guess record for domain of richard.zhao@linaro.org) client-ip=216.32.180.11; Authentication-Results: mx.google.com; spf=neutral (google.com: 216.32.180.11 is neither permitted nor denied by best guess record for domain of richard.zhao@linaro.org) smtp.mail=richard.zhao@linaro.org Received: from mail188-va3-R.bigfish.com (10.7.14.253) by VA3EHSOBE001.bigfish.com (10.7.40.21) with Microsoft SMTP Server id 14.1.225.22; Thu, 10 Nov 2011 04:54:29 +0000 Received: from mail188-va3 (localhost [127.0.0.1]) by mail188-va3-R.bigfish.com (Postfix) with ESMTP id 421531604E0; Thu, 10 Nov 2011 04:54:35 +0000 (UTC) X-SpamScore: 0 X-BigFish: VS0(zzzz1202hzz8275dhz2dh87h2a8h668h839h62h) X-Spam-TCS-SCL: 1:0 X-Forefront-Antispam-Report: CIP:70.37.183.190; KIP:(null); UIP:(null); IPV:NLI; H:mail.freescale.net; RD:none; EFVD:NLI X-FB-DOMAIN-IP-MATCH: fail Received: from mail188-va3 (localhost.localdomain [127.0.0.1]) by mail188-va3 (MessageSwitch) id 1320900874795462_8571; Thu, 10 Nov 2011 04:54:34 +0000 (UTC) Received: from VA3EHSMHS013.bigfish.com (unknown [10.7.14.248]) by mail188-va3.bigfish.com (Postfix) with ESMTP id BA8C93E0046; Thu, 10 Nov 2011 04:54:34 +0000 (UTC) Received: from mail.freescale.net (70.37.183.190) by VA3EHSMHS013.bigfish.com (10.7.99.23) with Microsoft SMTP Server (TLS) id 14.1.225.22; Thu, 10 Nov 2011 04:54:29 +0000 Received: from az33smr01.freescale.net (10.64.34.199) by 039-SN1MMR1-002.039d.mgd.msft.net (10.84.1.15) with Microsoft SMTP Server id 14.1.339.2; Wed, 9 Nov 2011 22:54:52 -0600 Received: from b20223-02.ap.freescale.net (b20223-02.ap.freescale.net [10.192.242.124]) by az33smr01.freescale.net (8.13.1/8.13.0) with ESMTP id pAA4sZAh016053; Wed, 9 Nov 2011 22:54:50 -0600 (CST) From: Richard Zhao To: CC: , , , , , , , Richard Zhao Subject: [PATCH 6/9] ARM: mxc: audmux-v2: convert to clk_prepare/clk_unprepare Date: Thu, 10 Nov 2011 12:54:11 +0800 Message-ID: <1320900854-13031-6-git-send-email-richard.zhao@linaro.org> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1320900854-13031-1-git-send-email-richard.zhao@linaro.org> References: <1320900854-13031-1-git-send-email-richard.zhao@linaro.org> MIME-Version: 1.0 X-OriginatorOrg: sigmatel.com Signed-off-by: Richard Zhao --- arch/arm/plat-mxc/audmux-v2.c | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/arch/arm/plat-mxc/audmux-v2.c b/arch/arm/plat-mxc/audmux-v2.c index 8cced35..865e564 100644 --- a/arch/arm/plat-mxc/audmux-v2.c +++ b/arch/arm/plat-mxc/audmux-v2.c @@ -72,14 +72,18 @@ static ssize_t audmux_read_file(struct file *file, char __user *user_buf, if (!buf) return -ENOMEM; - if (audmux_clk) + if (audmux_clk) { + clk_prepare(audmux_clk); clk_enable(audmux_clk); + } ptcr = readl(audmux_base + MXC_AUDMUX_V2_PTCR(port)); pdcr = readl(audmux_base + MXC_AUDMUX_V2_PDCR(port)); - if (audmux_clk) + if (audmux_clk) { clk_disable(audmux_clk); + clk_unprepare(audmux_clk); + } ret = snprintf(buf, PAGE_SIZE, "PDCR: %08x\nPTCR: %08x\n", pdcr, ptcr); @@ -171,14 +175,18 @@ int mxc_audmux_v2_configure_port(unsigned int port, unsigned int ptcr, if (!audmux_base) return -ENOSYS; - if (audmux_clk) + if (audmux_clk) { + clk_prepare(audmux_clk); clk_enable(audmux_clk); + } writel(ptcr, audmux_base + MXC_AUDMUX_V2_PTCR(port)); writel(pdcr, audmux_base + MXC_AUDMUX_V2_PDCR(port)); - if (audmux_clk) + if (audmux_clk) { clk_disable(audmux_clk); + clk_unprepare(audmux_clk); + } return 0; }