From patchwork Thu Apr 8 23:16:01 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: omar ramirez X-Patchwork-Id: 91541 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 o38Mxo5W010162 for ; Thu, 8 Apr 2010 22:59:59 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933827Ab0DHW7v (ORCPT ); Thu, 8 Apr 2010 18:59:51 -0400 Received: from comal.ext.ti.com ([198.47.26.152]:57286 "EHLO comal.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933810Ab0DHW7c (ORCPT ); Thu, 8 Apr 2010 18:59:32 -0400 Received: from dlep36.itg.ti.com ([157.170.170.91]) by comal.ext.ti.com (8.13.7/8.13.7) with ESMTP id o38MxPqq031212 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 8 Apr 2010 17:59:25 -0500 Received: from legion.dal.design.ti.com (localhost [127.0.0.1]) by dlep36.itg.ti.com (8.13.8/8.13.8) with ESMTP id o38MxOpm029535; Thu, 8 Apr 2010 17:59:24 -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 o38MxOZ16535; Thu, 8 Apr 2010 17:59:24 -0500 (CDT) Received: by Matrix (Postfix, from userid 1003) id 6DCF0410177; Thu, 8 Apr 2010 18:16:09 -0500 (CDT) From: Omar Ramirez Luna To: linux-omap@vger.kernel.org Cc: Paul Walmsley , Hiroshi DOYU , Felipe Contreras , Ameya Palande , Guzman Lugo Fernando , Nishanth Menon , Omar Ramirez Luna Subject: [PATCH 12/19] DSPBRIDGE: use omap mcbsp to enable mcbsp clocks Date: Thu, 8 Apr 2010 18:16:01 -0500 Message-Id: <1270768568-10712-13-git-send-email-omar.ramirez@ti.com> X-Mailer: git-send-email 1.5.4.3 In-Reply-To: <1270768568-10712-12-git-send-email-omar.ramirez@ti.com> References: <1270768568-10712-1-git-send-email-omar.ramirez@ti.com> <1270768568-10712-2-git-send-email-omar.ramirez@ti.com> <1270768568-10712-3-git-send-email-omar.ramirez@ti.com> <1270768568-10712-4-git-send-email-omar.ramirez@ti.com> <1270768568-10712-5-git-send-email-omar.ramirez@ti.com> <1270768568-10712-6-git-send-email-omar.ramirez@ti.com> <1270768568-10712-7-git-send-email-omar.ramirez@ti.com> <1270768568-10712-8-git-send-email-omar.ramirez@ti.com> <1270768568-10712-9-git-send-email-omar.ramirez@ti.com> <1270768568-10712-10-git-send-email-omar.ramirez@ti.com> <1270768568-10712-11-git-send-email-omar.ramirez@ti.com> <1270768568-10712-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]); Thu, 08 Apr 2010 22:59:59 +0000 (UTC) diff --git a/drivers/dsp/bridge/services/clk.c b/drivers/dsp/bridge/services/clk.c index 46b4cab..ae46e47 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 @@ -50,12 +51,12 @@ #define MCBSP_CLK 2 #define SSI_CLK 3 -/* - * Bridge specific DM Timer macro. - * Bridge GPT id (0 - 3), DM Timer id (5 - 8) - */ +/* Bridge GPT id (0 - 3), DM Timer id (5 - 8) */ #define DMT_ID(id) ((id) + 5) +/* Bridge MCBSP id (5 - 9), OMAP Mcbsp id (1 - 5) */ +#define MCBSP_ID(id) ((id) - 12) + struct dsp_clk_t { struct clk *clk_handle; const char *clk_name; @@ -67,16 +68,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}, }; @@ -170,6 +161,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; @@ -215,6 +209,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;