From patchwork Sun May 16 15:45:02 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Contreras X-Patchwork-Id: 99964 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 o4GFjOdD024887 for ; Sun, 16 May 2010 15:45:24 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752806Ab0EPPpX (ORCPT ); Sun, 16 May 2010 11:45:23 -0400 Received: from fg-out-1718.google.com ([72.14.220.154]:38885 "EHLO fg-out-1718.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752724Ab0EPPpV (ORCPT ); Sun, 16 May 2010 11:45:21 -0400 Received: by fg-out-1718.google.com with SMTP id 22so178289fge.1 for ; Sun, 16 May 2010 08:45:20 -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=5+4o92o0Q6h4/Q7RiaLY7weraRyi+CEFGe/MTI76iqU=; b=tHyRs3B75fzg1f+THW1mnQH0jKLmibljNY0lnSC40kwXv7y3VT+dOAmhz47su4jeVN FtEHsf/dpb7OwrmNmj7UrVuBlugMJBg7pTFX6vDU+PPd3DSvBiaNSKDxBMofE5K0gDIV 8h23cCrGgg7Nrrbh49taXVNfPE/IRs4RnlcMM= 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=wNMXRWw2dETuwnj/HBaWRaq7mBTePjGGluNGV4m/lEnM6zPo4bqLcG7EX3hKyD4tGj 9gQlavIuHAwgozmz7fuRyMHRKUeCeUc76vIv9P+9TxGDPmDE2NWgIL0/uUwf3KahFGbc 8fFp6YNxRgFJT6g48xkxbcqLsdO/o2mc7gEJs= Received: by 10.87.15.35 with SMTP id s35mr6755199fgi.12.1274024720498; Sun, 16 May 2010 08:45:20 -0700 (PDT) Received: from localhost (a91-153-253-80.elisa-laajakaista.fi [91.153.253.80]) by mx.google.com with ESMTPS id d4sm11597482fga.15.2010.05.16.08.45.19 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sun, 16 May 2010 08:45:20 -0700 (PDT) From: Felipe Contreras To: linux-omap Cc: Omar Ramirez Luna , Felipe Contreras Subject: [PATCH 4/4] dspbridge: remove _tiomap_util.h Date: Sun, 16 May 2010 18:45:02 +0300 Message-Id: <1274024702-20961-5-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:25 +0000 (UTC) diff --git a/drivers/dsp/bridge/core/_tiomap_util.h b/drivers/dsp/bridge/core/_tiomap_util.h deleted file mode 100644 index ccdd678..0000000 --- a/drivers/dsp/bridge/core/_tiomap_util.h +++ /dev/null @@ -1,43 +0,0 @@ -/* - * _tiomap_util.h - * - * DSP-BIOS Bridge driver support functions for TI OMAP processors. - * - * Definitions and types for the utility routines. - * - * Copyright (C) 2005-2006 Texas Instruments, Inc. - * - * This package is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * - * THIS PACKAGE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED - * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. - */ - -#ifndef _TIOMAP_UTIL_ -#define _TIOMAP_UTIL_ - -/* Time out Values in uSeconds */ -#define TIHELEN_ACKTIMEOUT 10000 - -/* - * Time out for power state transition (in msecs), due to system - * latencies and HZ resolution this timer can vary. - */ -#define PWRSTST_TIMEOUT 200 - -/* Time delay for HOM->SAM transition. */ -#define WAIT_SAM 1000000 /* in usec (1000 millisec) */ - -/* - * ======== wait_for_start ======== - * Wait for the singal from DSP that it has started, or time out. - * The argument dw_sync_addr is set to 1 before releasing the DSP. - * If the DSP starts running, it will clear this location. - */ -extern bool wait_for_start(struct bridge_dev_context *dev_context, - u32 dw_sync_addr); - -#endif /* _TIOMAP_UTIL_ */ diff --git a/drivers/dsp/bridge/core/tiomap3430.c b/drivers/dsp/bridge/core/tiomap3430.c index 3b571aa..ca61797 100644 --- a/drivers/dsp/bridge/core/tiomap3430.c +++ b/drivers/dsp/bridge/core/tiomap3430.c @@ -57,7 +57,6 @@ /* ----------------------------------- Local */ #include "_tiomap.h" #include "_tiomap_pwr.h" -#include "_tiomap_util.h" #include "tiomap_io.h" /* Offset in shared mem to write to in order to synchronize start with DSP */ @@ -65,6 +64,8 @@ #define BUFFERSIZE 1024 +#define TIHELEN_ACKTIMEOUT 10000 + #define MMU_SECTION_ADDR_MASK 0xFFF00000 #define MMU_SSECTION_ADDR_MASK 0xFF000000 #define MMU_LARGE_PAGE_MASK 0xFFFF0000 @@ -121,6 +122,8 @@ static dsp_status mem_map_vmalloc(struct bridge_dev_context *hDevContext, u32 ul_num_bytes, struct hw_mmu_map_attrs_t *hw_attrs); +bool wait_for_start(struct bridge_dev_context *dev_context, u32 dw_sync_addr); + /* ----------------------------------- Globals */ /* Attributes of L2 page tables for DSP MMU */ diff --git a/drivers/dsp/bridge/core/tiomap3430_pwr.c b/drivers/dsp/bridge/core/tiomap3430_pwr.c index 1897c50..97fcaaa 100644 --- a/drivers/dsp/bridge/core/tiomap3430_pwr.c +++ b/drivers/dsp/bridge/core/tiomap3430_pwr.c @@ -41,10 +41,11 @@ /* ----------------------------------- specific to this file */ #include "_tiomap.h" #include "_tiomap_pwr.h" -#include "_tiomap_util.h" #include #include +#define PWRSTST_TIMEOUT 200 + /* * ======== handle_constraints_set ======== * Sets new DSP constraint