From patchwork Sun Nov 7 21:43:29 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Contreras X-Patchwork-Id: 307382 X-Patchwork-Delegate: paul@pwsan.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oA7LjQ9b030068 for ; Sun, 7 Nov 2010 21:45:26 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753539Ab0KGVpY (ORCPT ); Sun, 7 Nov 2010 16:45:24 -0500 Received: from mail-fx0-f46.google.com ([209.85.161.46]:44122 "EHLO mail-fx0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753218Ab0KGVpX (ORCPT ); Sun, 7 Nov 2010 16:45:23 -0500 Received: by mail-fx0-f46.google.com with SMTP id 16so3600214fxm.19 for ; Sun, 07 Nov 2010 13:45:22 -0800 (PST) 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=NLBF9U+gLckCJiMFdhi6CUkN/jcNiw+6oH4sYA+UZy4=; b=RAPnWXUCCyK9vHovWFHx9Az8ckyx/DugEZQQR4QKroFX3ALkoDsKEZUFyNncokzLdl 796uci2Wkh/EtPar+a1EAE6Da01RbVrNtdvJkVE0x4mby4lK/kS9Dq1ZmdsVTt6q0iNu qzznRMQHiUwUgvR1RnDmvugYw3N9Q5TxV7lGc= 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=EQJ4xYYgq+6dBl6eq87615IfYGpPFPw329q0pdQkL7ix814KPWOJZiaXeSsKiVvfAY wL/EEPBrLZ+L9yUlHPVsKcd0qUdOBpA7Eay6pVfBnifDL4rbYq6ymDO9mMI9V+eaPNYQ 0Megno764nK/d9RJc4U29GCLjClXRr6BgxOZ4= Received: by 10.223.73.207 with SMTP id r15mr3056608faj.141.1289166320982; Sun, 07 Nov 2010 13:45:20 -0800 (PST) Received: from localhost (a91-153-253-80.elisa-laajakaista.fi [91.153.253.80]) by mx.google.com with ESMTPS id l24sm961242fam.31.2010.11.07.13.45.13 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sun, 07 Nov 2010 13:45:20 -0800 (PST) From: Felipe Contreras To: linux-omap , Greg KH Cc: Omar Ramirez Luna , Tony Lindgren , Paul Walmsley , Fernando Guzman Lugo , Felipe Contreras Subject: [PATCH 5/5] staging: tidspbridge: use boot control functions Date: Sun, 7 Nov 2010 23:43:29 +0200 Message-Id: <1289166209-32251-6-git-send-email-felipe.contreras@gmail.com> X-Mailer: git-send-email 1.7.3.2.3.gf8529 In-Reply-To: References: 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 (demeter1.kernel.org [140.211.167.41]); Sun, 07 Nov 2010 21:45:26 +0000 (UTC) diff --git a/drivers/staging/tidspbridge/core/tiomap3430.c b/drivers/staging/tidspbridge/core/tiomap3430.c index cb38743..84de0c2 100644 --- a/drivers/staging/tidspbridge/core/tiomap3430.c +++ b/drivers/staging/tidspbridge/core/tiomap3430.c @@ -23,7 +23,7 @@ #include #include #include -#include +#include /* ----------------------------------- DSP/BIOS Bridge */ #include @@ -412,19 +412,18 @@ static int bridge_brd_start(struct bridge_dev_context *dev_ctxt, /* Assert RST1 i.e only the RST only for DSP megacell */ if (!status) { + u8 bootmode; (*pdata->dsp_prm_rmw_bits)(OMAP3430_RST1_IVA2_MASK, OMAP3430_RST1_IVA2_MASK, OMAP3430_IVA2_MOD, OMAP2_RM_RSTCTRL); /* Mask address with 1K for compatibility */ - __raw_writel(dsp_addr & OMAP3_IVA2_BOOTADDR_MASK, - OMAP343X_CTRL_REGADDR( - OMAP343X_CONTROL_IVA2_BOOTADDR)); + dsp_addr &= OMAP3_IVA2_BOOTADDR_MASK; + (*pdata->set_dsp_bootaddr)(dsp_addr); /* * Set bootmode to self loop if dsp_debug flag is true */ - __raw_writel((dsp_debug) ? OMAP3_IVA2_BOOTMOD_IDLE : 0, - OMAP343X_CTRL_REGADDR( - OMAP343X_CONTROL_IVA2_BOOTMOD)); + bootmode = dsp_debug ? OMAP_DSP_BOOTMODE_IDLE : 0; + (*pdata->set_dsp_bootmode)(bootmode); } } if (!status) {