From patchwork Sun May 16 15:44:59 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Contreras X-Patchwork-Id: 99961 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 o4GFjDNI024820 for ; Sun, 16 May 2010 15:45:13 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752668Ab0EPPpM (ORCPT ); Sun, 16 May 2010 11:45:12 -0400 Received: from fg-out-1718.google.com ([72.14.220.153]:23494 "EHLO fg-out-1718.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752335Ab0EPPpL (ORCPT ); Sun, 16 May 2010 11:45:11 -0400 Received: by fg-out-1718.google.com with SMTP id d23so2359664fga.1 for ; Sun, 16 May 2010 08:45:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer:in-reply-to:references; bh=wszTfD48cvCW8OxQY8M52ie8sSqpxJHFxEfKjWaE4Zk=; b=W/N4OWkt6uNcX9gpIxA8ozca72SjFg3tfPt/3XwgNlYALcYmJgpkaJZuvrI+xnZkcw dwWVjru/IWU6zzk3ekH578kmXlBAP3ZQhUd4tTZxIBzNXrItwbgtbwXRvwFKZca6N/40 4jU1H6o7jRiu0yd/HFvikus741CvsrRGjtDlI= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=Lo8E/qXC5X3BczX5t8gcHLRxGq82RB0E10PioFhTD2jjsW3ObX+btwl0EFrBDhjJF+ ZcGep5BySCHhCoKgvLdWOx59VcGIeDvTHBkY2u+RrlgZ5RpcVy5OLw3fNBlS1d56WW72 I8c+Ir3HYQkkAq8tbOxq0kCdUddhVMyJN2D9o= Received: by 10.87.71.21 with SMTP id y21mr6691432fgk.69.1274024709391; Sun, 16 May 2010 08:45:09 -0700 (PDT) Received: from localhost (a91-153-253-80.elisa-laajakaista.fi [91.153.253.80]) by mx.google.com with ESMTPS id e20sm3754422fga.16.2010.05.16.08.45.08 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sun, 16 May 2010 08:45:08 -0700 (PDT) From: Felipe Contreras To: linux-omap Cc: Omar Ramirez Luna , Felipe Contreras Subject: [PATCH 1/4] dspbridge: fix build when OMAP_MCBSP=n Date: Sun, 16 May 2010 18:44:59 +0300 Message-Id: <1274024702-20961-2-git-send-email-felipe.contreras@gmail.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1274024702-20961-1-git-send-email-felipe.contreras@gmail.com> References: <1274024702-20961-1-git-send-email-felipe.contreras@gmail.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]); Sun, 16 May 2010 15:45:13 +0000 (UTC) diff --git a/drivers/dsp/bridge/core/dsp-clock.c b/drivers/dsp/bridge/core/dsp-clock.c index 3683dc3..7df100a 100644 --- a/drivers/dsp/bridge/core/dsp-clock.c +++ b/drivers/dsp/bridge/core/dsp-clock.c @@ -147,6 +147,7 @@ void dsp_clk_init(void) ssi.sst_fck, ssi.ssr_fck, ssi.ick); } +#ifdef CONFIG_OMAP_MCBSP static void mcbsp_clk_prepare(bool flag, u8 id) { struct cfg_hostres *resources; @@ -192,6 +193,7 @@ static void mcbsp_clk_prepare(bool flag, u8 id) } } } +#endif /* * ======== dsp_clk_enable ======== @@ -215,11 +217,13 @@ dsp_status dsp_clk_enable(IN enum dsp_clk_id clk_id) case GPT_CLK: timer[clk_id] = omap_dm_timer_request_specific(DMT_ID(clk_id)); break; +#ifdef CONFIG_OMAP_MCBSP case MCBSP_CLK: mcbsp_clk_prepare(true, clk_id); omap_mcbsp_set_io_type(MCBSP_ID(clk_id), OMAP_MCBSP_POLL_IO); omap_mcbsp_request(MCBSP_ID(clk_id)); break; +#endif case WDT_CLK: dev_err(bridge, "ERROR: DSP requested to enable WDT3 clk\n"); break; @@ -290,10 +294,12 @@ dsp_status dsp_clk_disable(IN enum dsp_clk_id clk_id) case GPT_CLK: omap_dm_timer_free(timer[clk_id]); break; +#ifdef CONFIG_OMAP_MCBSP case MCBSP_CLK: mcbsp_clk_prepare(false, clk_id); omap_mcbsp_free(MCBSP_ID(clk_id)); break; +#endif case WDT_CLK: dev_err(bridge, "ERROR: DSP requested to disable WDT3 clk\n"); break;