From patchwork Thu Feb 7 15:31:57 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 2111361 Return-Path: X-Original-To: patchwork-linux-fbdev@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id F1F1FE00C6 for ; Thu, 7 Feb 2013 15:33:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758178Ab3BGPdk (ORCPT ); Thu, 7 Feb 2013 10:33:40 -0500 Received: from mail-lb0-f180.google.com ([209.85.217.180]:62692 "EHLO mail-lb0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758247Ab3BGPdi (ORCPT ); Thu, 7 Feb 2013 10:33:38 -0500 Received: by mail-lb0-f180.google.com with SMTP id q12so2188212lbc.39 for ; Thu, 07 Feb 2013 07:33:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=BIkILCQb5Ge/NuVDyRSc7nmIHUlAJx/fk8GgUWIoX5g=; b=aLJG0WUF40oWRYqHeQVZ6qwJ5m3+AUUQK7HmHqldOkx1h4/22prqgcAtDR+2n4QLYe rjqM73LsTxmPGQtm7ebXkx9RIMBJ3qocXJm51BSeGJNk4931trTOXMfYr8oRq+ADbAtd SkAKTlcoaHNHd/vok6kI43DbKn8y84EUZUvePSYn1nJxXtr+w14M6phbvAxgizo/bUml gnOXnV2hBcEQTU09hIVgMnIo5Plh7pFFSFXj7VjIqRVKvZB8J3DNiCSNIINsbxLd3Wc/ 6wX3xdi+FdSj1TMmAQiSkJGzL0AY5Wz5vfAfE1PkXfs2d/I+QxOc8P2iPV1TZtp8JtWw giOA== X-Received: by 10.152.112.36 with SMTP id in4mr1696678lab.35.1360251217361; Thu, 07 Feb 2013 07:33:37 -0800 (PST) Received: from xi.lan (c83-179-13-247.cust.tele2.se. [83.179.13.247]) by mx.google.com with ESMTPS id fm8sm7853351lbb.17.2013.02.07.07.33.32 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 07 Feb 2013 07:33:33 -0800 (PST) Received: from johan by xi.lan with local (Exim 4.80.1) (envelope-from ) id 1U3TSR-0003KV-78; Thu, 07 Feb 2013 16:32:15 +0100 From: Johan Hovold To: Nicolas Ferre Cc: Florian Tobias Schandinat , Jean-Christophe PLAGNIOL-VILLARD , Andrew Victor , Peter Korsgaard , Haavard Skinnemoen , Hans-Christian Egtvedt , linux-arm-kernel@lists.infradead.org, linux-fbdev@vger.kernel.org, Johan Hovold Subject: [PATCH v2 2/3] atmel_lcdfb: move lcdcon2 register access to compute_hozval Date: Thu, 7 Feb 2013 16:31:57 +0100 Message-Id: <1360251118-12715-3-git-send-email-jhovold@gmail.com> X-Mailer: git-send-email 1.8.1 In-Reply-To: <1360251118-12715-1-git-send-email-jhovold@gmail.com> References: <20130205201145.GE30595@game.jcrosoft.org> <1360251118-12715-1-git-send-email-jhovold@gmail.com> Sender: linux-fbdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fbdev@vger.kernel.org Pass atmel_lcd_info structure to compute_hozval and only do the register access on SOCs that actually use it. This will also simplify the removal of the cpu_is macros. Signed-off-by: Johan Hovold --- drivers/video/atmel_lcdfb.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/video/atmel_lcdfb.c b/drivers/video/atmel_lcdfb.c index 86cafae..c707130 100644 --- a/drivers/video/atmel_lcdfb.c +++ b/drivers/video/atmel_lcdfb.c @@ -193,14 +193,17 @@ static struct fb_fix_screeninfo atmel_lcdfb_fix __initdata = { .accel = FB_ACCEL_NONE, }; -static unsigned long compute_hozval(unsigned long xres, unsigned long lcdcon2) +static unsigned long compute_hozval(struct atmel_lcdfb_info *sinfo, + unsigned long xres) { + unsigned long lcdcon2; unsigned long value; if (!(cpu_is_at91sam9261() || cpu_is_at91sam9g10() || cpu_is_at32ap7000())) return xres; + lcdcon2 = lcdc_readl(sinfo, ATMEL_LCDC_LCDCON2); value = xres; if ((lcdcon2 & ATMEL_LCDC_DISTYPE) != ATMEL_LCDC_DISTYPE_TFT) { /* STN display */ @@ -590,8 +593,7 @@ static int atmel_lcdfb_set_par(struct fb_info *info) lcdc_writel(sinfo, ATMEL_LCDC_TIM2, value); /* Horizontal value (aka line size) */ - hozval_linesz = compute_hozval(info->var.xres, - lcdc_readl(sinfo, ATMEL_LCDC_LCDCON2)); + hozval_linesz = compute_hozval(sinfo, info->var.xres); /* Display size */ value = (hozval_linesz - 1) << ATMEL_LCDC_HOZVAL_OFFSET;