From patchwork Wed Feb 2 06:45:04 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sutharsan X-Patchwork-Id: 526051 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 p126jGvq031416 for ; Wed, 2 Feb 2011 06:45:17 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752701Ab1BBGpP (ORCPT ); Wed, 2 Feb 2011 01:45:15 -0500 Received: from mail-gx0-f174.google.com ([209.85.161.174]:52612 "EHLO mail-gx0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752548Ab1BBGpN (ORCPT ); Wed, 2 Feb 2011 01:45:13 -0500 Received: by gxk9 with SMTP id 9so2842851gxk.19 for ; Tue, 01 Feb 2011 22:45:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:subject:from:to:cc:content-type:date:message-id :mime-version:x-mailer:content-transfer-encoding; bh=zNj897RLBkX44F8rUEvR6lpAP0Lxm5XJancswYriWU0=; b=SHTuwyjPR0BqQQvDDyjVobQjkduykjd9POniK/OKQK/FIerBGBygtBbDZG7hcdOpta lAdZfTk61ffzsh2VzT5A9K7lI/PPADsDHu6QtJV6oQnE01sLx9F4+B1+DByrtx34CgSX B0tkuPRSxjv79R3sSV+4U75bBjap0LxB1ADZU= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=subject:from:to:cc:content-type:date:message-id:mime-version :x-mailer:content-transfer-encoding; b=OSHKtcXAGTi0A2SUywa2zJqLBJ2jxGEiWxo4WrcgzFYDlpGxgqeUCMlNQe+wjQsuhw BMhRikDEGd5q7nM5SxRh45hV6vawHObMCdJF1KCIFQwqqeOdBDHwOfJ6qvxqzw9aY+oz sqZLV+GlBrGphck/1OIwZZ6DKhfNdoYN5Rm74= Received: by 10.236.110.6 with SMTP id t6mr5177176yhg.17.1296629112856; Tue, 01 Feb 2011 22:45:12 -0800 (PST) Received: from [192.168.0.104] (c-24-23-136-37.hsd1.ca.comcast.net [24.23.136.37]) by mx.google.com with ESMTPS id g63sm2030970yhd.15.2011.02.01.22.45.10 (version=SSLv3 cipher=RC4-MD5); Tue, 01 Feb 2011 22:45:11 -0800 (PST) Subject: [PATCH] Staging: Westbridge: added ioremap_nocache instead of phys_to_virt From: Sutharsan To: greg@kroah.com Cc: linux-kernel@vger.kernel.org, linux-omap@vger.kernel.org, linux-usb@vger.kernel.org, david.cross@cypress.com, srmt@cypress.com Date: Tue, 01 Feb 2011 22:45:04 -0800 Message-Id: <1296629104.3592.26.camel@sutharsan-laptop> Mime-Version: 1.0 X-Mailer: Evolution 2.26.1 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.6 (demeter1.kernel.org [140.211.167.41]); Wed, 02 Feb 2011 06:45:17 +0000 (UTC) diff -uprN -X linux-2.6.37_vanilla/Documentation/dontdiff linux-2.6.37_vanilla/drivers/staging/westbridge/astoria/arch/arm/mach-omap2/cyashalomap_kernel.c linux-2.6.37-ptov/drivers/staging/westbridge/astoria/arch/arm/mach-omap2/cyashalomap_kernel.c --- linux-2.6.37_vanilla/drivers/staging/westbridge/astoria/arch/arm/mach-omap2/cyashalomap_kernel.c 2010-11-29 20:42:04.000000000 -0800 +++ linux-2.6.37-ptov/drivers/staging/westbridge/astoria/arch/arm/mach-omap2/cyashalomap_kernel.c 2011-02-01 16:00:31.214861085 -0800 @@ -347,11 +347,8 @@ static int cy_as_hal_gpmc_init(void) u32 tmp32; int err; struct gpmc_timings timings; - /* - * get GPMC i/o registers base(already been i/o mapped - * in kernel, no need for separate i/o remap) - */ - gpmc_base = phys_to_virt(OMAP34XX_GPMC_BASE); + + gpmc_base = (u32)ioremap_nocache(OMAP34XX_GPMC_BASE, BLKSZ_4K); DBGPRN(KERN_INFO "kernel has gpmc_base=%x , val@ the base=%x", gpmc_base, __raw_readl(gpmc_base) );