From patchwork Tue Oct 9 12:30:26 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomi Valkeinen X-Patchwork-Id: 1569941 Return-Path: X-Original-To: patchwork-linux-fbdev@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 21B3140135 for ; Tue, 9 Oct 2012 12:30:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753104Ab2JIMat (ORCPT ); Tue, 9 Oct 2012 08:30:49 -0400 Received: from na3sys009aog111.obsmtp.com ([74.125.149.205]:57388 "EHLO na3sys009aog111.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754382Ab2JIMar (ORCPT ); Tue, 9 Oct 2012 08:30:47 -0400 Received: from mail-lb0-f174.google.com ([209.85.217.174]) (using TLSv1) by na3sys009aob111.postini.com ([74.125.148.12]) with SMTP ID DSNKUHQY9jEXJ3q2jMr56vdzLgb3R7GapVK4@postini.com; Tue, 09 Oct 2012 05:30:47 PDT Received: by mail-lb0-f174.google.com with SMTP id n3so3680956lbo.19 for ; Tue, 09 Oct 2012 05:30:44 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=Na7+xHm+i9IgbpJX5Kqa7ALb12yj4cS7lo/ndXm8s/8=; b=OTUnyG1Bl++JndSjQa5ZiEL6PJRqKXgDo6qWf9D2hmOdvT5jst5f3RrjczOnxiLrm7 w1GUAfLw4+4A7W94m0ZUCD/I9xxaogyd6FjWqhF9RLRYckr7Y4Wq3b5sfttfCT/LEo9L XQ1rHYvrpotgvtNmlRqW0xybKBDHvbVGfvxcVo6EgQR6b0n9tSmypwauIp2TDiMfsYZN Y/YcwNuarKOJ5pHq0gDQrLwMkJovw+pQ9AUixHYcW11qVml9Zl64QYd26yiCkaYh+6BY Uoqnnehbl9mQRkIbt6OIpPf6fFOqE22ui0eUAaRYglzedK7DK1V8tpQwj0xEy3USdLQr Xxqw== Received: by 10.112.101.10 with SMTP id fc10mr3073812lbb.82.1349785844722; Tue, 09 Oct 2012 05:30:44 -0700 (PDT) Received: from deskari.tieu.ti.com (a91-156-160-115.elisa-laajakaista.fi. [91.156.160.115]) by mx.google.com with ESMTPS id d7sm6312142lbn.3.2012.10.09.05.30.42 (version=SSLv3 cipher=OTHER); Tue, 09 Oct 2012 05:30:43 -0700 (PDT) From: Tomi Valkeinen To: linux-omap@vger.kernel.org, linux-fbdev@vger.kernel.org, Tony Lindgren Cc: Archit Taneja , Tomi Valkeinen Subject: [PATCHv2 3/3] OMAP: SDRC: remove VRFB code Date: Tue, 9 Oct 2012 15:30:26 +0300 Message-Id: <1349785827-27055-4-git-send-email-tomi.valkeinen@ti.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1349785827-27055-1-git-send-email-tomi.valkeinen@ti.com> References: <1349785827-27055-1-git-send-email-tomi.valkeinen@ti.com> X-Gm-Message-State: ALoCoQmVmlLgkzOrRMJvy4i8tFHIwzKwKp/24vglNH3cvE98brUdIynSnbyEOrZK1owIvQVICFMf Sender: linux-fbdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fbdev@vger.kernel.org Now that VRFB driver handles its registers independently, we can remove the VRFB related code from OMAP's sdrc. Signed-off-by: Tomi Valkeinen Cc: Tony Lindgren --- arch/arm/mach-omap2/sdrc.c | 16 ---------------- arch/arm/plat-omap/include/plat/sdrc.h | 7 ------- 2 files changed, 23 deletions(-) diff --git a/arch/arm/mach-omap2/sdrc.c b/arch/arm/mach-omap2/sdrc.c index e3d345f..4282e6e 100644 --- a/arch/arm/mach-omap2/sdrc.c +++ b/arch/arm/mach-omap2/sdrc.c @@ -160,19 +160,3 @@ void __init omap2_sdrc_init(struct omap_sdrc_params *sdrc_cs0, sdrc_write_reg(l, SDRC_POWER); omap2_sms_save_context(); } - -void omap2_sms_write_rot_control(u32 val, unsigned ctx) -{ - sms_write_reg(val, SMS_ROT_CONTROL(ctx)); -} - -void omap2_sms_write_rot_size(u32 val, unsigned ctx) -{ - sms_write_reg(val, SMS_ROT_SIZE(ctx)); -} - -void omap2_sms_write_rot_physical_ba(u32 val, unsigned ctx) -{ - sms_write_reg(val, SMS_ROT_PHYSICAL_BA(ctx)); -} - diff --git a/arch/arm/plat-omap/include/plat/sdrc.h b/arch/arm/plat-omap/include/plat/sdrc.h index 36d6a76..c68bab2 100644 --- a/arch/arm/plat-omap/include/plat/sdrc.h +++ b/arch/arm/plat-omap/include/plat/sdrc.h @@ -94,9 +94,6 @@ /* SMS register offsets - read/write with sms_{read,write}_reg() */ #define SMS_SYSCONFIG 0x010 -#define SMS_ROT_CONTROL(context) (0x180 + 0x10 * context) -#define SMS_ROT_SIZE(context) (0x184 + 0x10 * context) -#define SMS_ROT_PHYSICAL_BA(context) (0x188 + 0x10 * context) /* REVISIT: fill in other SMS registers here */ @@ -137,10 +134,6 @@ int omap2_sdrc_get_params(unsigned long r, void omap2_sms_save_context(void); void omap2_sms_restore_context(void); -void omap2_sms_write_rot_control(u32 val, unsigned ctx); -void omap2_sms_write_rot_size(u32 val, unsigned ctx); -void omap2_sms_write_rot_physical_ba(u32 val, unsigned ctx); - #ifdef CONFIG_ARCH_OMAP2 struct memory_timings {