From patchwork Mon Jun 6 08:50:51 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hubert Feurstein X-Patchwork-Id: 851282 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.3) with ESMTP id p568pVKd031626 for ; Mon, 6 Jun 2011 08:51:32 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752979Ab1FFIvb (ORCPT ); Mon, 6 Jun 2011 04:51:31 -0400 Received: from mail-ww0-f44.google.com ([74.125.82.44]:40332 "EHLO mail-ww0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752043Ab1FFIvb (ORCPT ); Mon, 6 Jun 2011 04:51:31 -0400 Received: by wwa36 with SMTP id 36so3556211wwa.1 for ; Mon, 06 Jun 2011 01:51:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:from:to:cc:subject:date:message-id:x-mailer; bh=fz011T4i56inWHK8p4W8qzRpdYW5M5u1TN6S+1MXq88=; b=Wn7rGDCA6nbJBhdXiZQaAbkOdvgQulEqKqH/lOGeyTt4hCeC8LVvtVvERm2M5T32JT 1OguPuJIccOXicjiw5IsIxslqvubKoDLSTL5M5BMpDEmNhFIkZbPD8W7xIOfti1rSbu3 THPjJ9U88w5DxKZ7UeFyjqnRvEApWEBSQrStI= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=LN1H6ajDPGF+8zMKX13o5rDr19TKnUO9uc4Gkc/rshK4hW6biscxVpZ4upJwG6B2jV balGVk9oEW6aaGHL1bwbF5pCeL7rRl/rP7AaU0ySuspcEUlauvi76v2WbHnxJhl+K5UI uUBWmlkEwyAW+Zsk2sfXEX5eSEpdHCy7ODXtc= Received: by 10.227.100.212 with SMTP id z20mr4566807wbn.27.1307350289855; Mon, 06 Jun 2011 01:51:29 -0700 (PDT) Received: from localhost.localdomain ([213.182.253.145]) by mx.google.com with ESMTPS id en1sm2703667wbb.1.2011.06.06.01.51.28 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 06 Jun 2011 01:51:29 -0700 (PDT) From: Hubert Feurstein To: linux-fbdev@vger.kernel.org Cc: Hubert Feurstein , Nicolas Ferre , Jean-Christophe PLAGNIOL-VILLARD Subject: [PATCH] atmel_lcdfb: fix usage of wrong registers in suspend/resume Date: Mon, 6 Jun 2011 10:50:51 +0200 Message-Id: <1307350251-5767-1-git-send-email-h.feurstein@gmail.com> X-Mailer: git-send-email 1.7.1 Sender: linux-fbdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fbdev@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Mon, 06 Jun 2011 08:51:32 +0000 (UTC) I assume the intention was to set the contrast value to 0 and not the contrast control register (in atmel_lcdfb_suspend). And in atmel_lcdfb_resume the contrast value should be restored. Signed-off-by: Hubert Feurstein Cc: Nicolas Ferre Cc: Jean-Christophe PLAGNIOL-VILLARD --- drivers/video/atmel_lcdfb.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/video/atmel_lcdfb.c b/drivers/video/atmel_lcdfb.c index 4484c72..2ed7ec1 100644 --- a/drivers/video/atmel_lcdfb.c +++ b/drivers/video/atmel_lcdfb.c @@ -1086,7 +1086,7 @@ static int atmel_lcdfb_suspend(struct platform_device *pdev, pm_message_t mesg) lcdc_writel(sinfo, ATMEL_LCDC_IDR, ~0UL); sinfo->saved_lcdcon = lcdc_readl(sinfo, ATMEL_LCDC_CONTRAST_VAL); - lcdc_writel(sinfo, ATMEL_LCDC_CONTRAST_CTR, 0); + lcdc_writel(sinfo, ATMEL_LCDC_CONTRAST_VAL, 0); if (sinfo->atmel_lcdfb_power_control) sinfo->atmel_lcdfb_power_control(0); @@ -1105,7 +1105,7 @@ static int atmel_lcdfb_resume(struct platform_device *pdev) atmel_lcdfb_start(sinfo); if (sinfo->atmel_lcdfb_power_control) sinfo->atmel_lcdfb_power_control(1); - lcdc_writel(sinfo, ATMEL_LCDC_CONTRAST_CTR, sinfo->saved_lcdcon); + lcdc_writel(sinfo, ATMEL_LCDC_CONTRAST_VAL, sinfo->saved_lcdcon); /* Enable FIFO & DMA errors */ lcdc_writel(sinfo, ATMEL_LCDC_IER, ATMEL_LCDC_UFLWI