From patchwork Wed Apr 28 01:29:20 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: omar ramirez X-Patchwork-Id: 95552 X-Patchwork-Delegate: omar.ramirez@ti.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o3S1OkS7007787 for ; Wed, 28 Apr 2010 01:24:46 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754747Ab0D1BYk (ORCPT ); Tue, 27 Apr 2010 21:24:40 -0400 Received: from comal.ext.ti.com ([198.47.26.152]:45750 "EHLO comal.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750883Ab0D1BYd (ORCPT ); Tue, 27 Apr 2010 21:24:33 -0400 Received: from dlep33.itg.ti.com ([157.170.170.112]) by comal.ext.ti.com (8.13.7/8.13.7) with ESMTP id o3S1OTB2031123 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 27 Apr 2010 20:24:29 -0500 Received: from legion.dal.design.ti.com (localhost [127.0.0.1]) by dlep33.itg.ti.com (8.13.7/8.13.7) with ESMTP id o3S1OSV2025897; Tue, 27 Apr 2010 20:24:28 -0500 (CDT) Received: from Matrix (matrix.am.dhcp.ti.com [128.247.75.166]) by legion.dal.design.ti.com (8.11.7p1+Sun/8.11.7) with ESMTP id o3S1ORZ04438; Tue, 27 Apr 2010 20:24:27 -0500 (CDT) Received: by Matrix (Postfix, from userid 1003) id 6880B1663D6; Tue, 27 Apr 2010 20:29:28 -0500 (CDT) From: Omar Ramirez Luna To: linux-omap Cc: Ameya Palande , Hiroshi Doyu , Felipe Contreras , Nishanth Menon , Omar Ramirez Luna Subject: [PATCH v2] DSPBRIDGE: use omap mcbsp to enable mcbsp clocks Date: Tue, 27 Apr 2010 20:29:20 -0500 Message-Id: <1272418167-12630-13-git-send-email-omar.ramirez@ti.com> X-Mailer: git-send-email 1.5.4.3 In-Reply-To: <1272418167-12630-12-git-send-email-omar.ramirez@ti.com> References: <1272418167-12630-1-git-send-email-omar.ramirez@ti.com> <1272418167-12630-2-git-send-email-omar.ramirez@ti.com> <1272418167-12630-3-git-send-email-omar.ramirez@ti.com> <1272418167-12630-4-git-send-email-omar.ramirez@ti.com> <1272418167-12630-5-git-send-email-omar.ramirez@ti.com> <1272418167-12630-6-git-send-email-omar.ramirez@ti.com> <1272418167-12630-7-git-send-email-omar.ramirez@ti.com> <1272418167-12630-8-git-send-email-omar.ramirez@ti.com> <1272418167-12630-9-git-send-email-omar.ramirez@ti.com> <1272418167-12630-10-git-send-email-omar.ramirez@ti.com> <1272418167-12630-11-git-send-email-omar.ramirez@ti.com> <1272418167-12630-12-git-send-email-omar.ramirez@ti.com> Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Wed, 28 Apr 2010 01:24:46 +0000 (UTC) diff --git a/drivers/dsp/bridge/services/clk.c b/drivers/dsp/bridge/services/clk.c index 37739a9..2e3c64d 100644 --- a/drivers/dsp/bridge/services/clk.c +++ b/drivers/dsp/bridge/services/clk.c @@ -19,6 +19,7 @@ /* ----------------------------------- Host OS */ #include #include +#include /* ----------------------------------- DSP/BIOS Bridge */ #include @@ -48,12 +49,12 @@ #define MCBSP_CLK 3 #define SSI_CLK 4 -/* - * Bridge specific DM Timer macro. - * Bridge GPT id (1 - 4), DM Timer id (5 - 8) - */ +/* Bridge GPT id (1 - 4), DM Timer id (5 - 8) */ #define DMT_ID(id) ((id) + 4) +/* Bridge MCBSP id (6 - 10), OMAP Mcbsp id (1 - 5) */ +#define MCBSP_ID(id) ((id) - 13) + struct dsp_clk_t { struct clk *clk_handle; const char *clk_name; @@ -65,16 +66,6 @@ static struct omap_dm_timer *timer[4]; static struct dsp_clk_t dsp_clks[] = { {NULL, "wdt_fck", 3}, {NULL, "wdt_ick", 3}, - {NULL, "mcbsp_fck", 1}, - {NULL, "mcbsp_ick", 1}, - {NULL, "mcbsp_fck", 2}, - {NULL, "mcbsp_ick", 2}, - {NULL, "mcbsp_fck", 3}, - {NULL, "mcbsp_ick", 3}, - {NULL, "mcbsp_fck", 4}, - {NULL, "mcbsp_ick", 4}, - {NULL, "mcbsp_fck", 5}, - {NULL, "mcbsp_ick", 5}, {NULL, "ssi_ssr_sst_fck", -1}, {NULL, "ssi_ick", -1}, }; @@ -146,6 +137,9 @@ dsp_status dsp_clk_enable(IN enum dsp_clk_id clk_id) timer[clk_id] = omap_dm_timer_request_specific(DMT_ID(clk_id)); break; case MCBSP_CLK: + omap_mcbsp_set_io_type(MCBSP_ID(clk_id), OMAP_MCBSP_POLL_IO); + omap_mcbsp_request(MCBSP_ID(clk_id)); + break; case WDT_CLK: case SSI_CLK: clk_handle = dsp_clks[clk_id].clk_handle; @@ -194,6 +188,8 @@ dsp_status dsp_clk_disable(IN enum dsp_clk_id clk_id) omap_dm_timer_free(timer[clk_id]); break; case MCBSP_CLK: + omap_mcbsp_free(MCBSP_ID(clk_id)); + break; case WDT_CLK: case SSI_CLK: clk_handle = dsp_clks[clk_id].clk_handle;