From patchwork Mon Jun 6 13:24:09 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Hubert Feurstein X-Patchwork-Id: 851752 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 p56DOB1F029840 for ; Mon, 6 Jun 2011 13:24:11 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752801Ab1FFNYK (ORCPT ); Mon, 6 Jun 2011 09:24:10 -0400 Received: from mail-vw0-f46.google.com ([209.85.212.46]:61736 "EHLO mail-vw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756839Ab1FFNYK convert rfc822-to-8bit (ORCPT ); Mon, 6 Jun 2011 09:24:10 -0400 Received: by vws1 with SMTP id 1so2723551vws.19 for ; Mon, 06 Jun 2011 06:24:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:in-reply-to:references:date :message-id:subject:from:to:cc:content-type :content-transfer-encoding; bh=T3sQ5OwGv56QNmPEeERBr0LWm0j8NL0/7+mRTWXgmjE=; b=lxI60P2msDDjYhkyeMTQAgitcLpjm09+Q1bUS+K7Jma2VCDasjejVdqEtjwxJFzszE zi0pmiHYcSxhR5UhE8lr8+fjl3QxFrvejouBBkeLknRjakL/TgFM/W6MhW3LvF6wZRsQ teAHgutsAmhQfYfvjX4VQqxkevM4saef9DMe0= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type:content-transfer-encoding; b=n5fkR8NvQNhHW1LZHiRJQP1H6FjwEeYuOCHqPiNAXx0zjSHZ1STavCHYjfcxzrG7Oi VeLwddyFPFeBEOT/Rbmc8h4SV7MglbcAUqXxKOnN5jB1QJiV7ZH5SyK+t4EswSs6g/cJ 1iVBlQuM6Bi8BGKKtWBZVZnWr+MdTn1LHrquc= MIME-Version: 1.0 Received: by 10.52.178.99 with SMTP id cx3mr7460vdc.191.1307366649173; Mon, 06 Jun 2011 06:24:09 -0700 (PDT) Received: by 10.52.160.170 with HTTP; Mon, 6 Jun 2011 06:24:09 -0700 (PDT) In-Reply-To: <1307350251-5767-1-git-send-email-h.feurstein@gmail.com> References: <1307350251-5767-1-git-send-email-h.feurstein@gmail.com> Date: Mon, 6 Jun 2011 15:24:09 +0200 Message-ID: Subject: Re: [PATCH] atmel_lcdfb: fix usage of wrong registers in suspend/resume From: Hubert Feurstein To: linux-fbdev@vger.kernel.org Cc: Hubert Feurstein , Nicolas Ferre , Jean-Christophe PLAGNIOL-VILLARD 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 13:24:11 +0000 (UTC) Or it must be this way: --- sinfo->atmel_lcdfb_power_control(0); -- So which solution was originally intended? Best regards Hubert 2011/6/6 Hubert Feurstein : > 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 > -- > 1.7.1 > > -- To unsubscribe from this list: send the line "unsubscribe linux-fbdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/video/atmel_lcdfb.c b/drivers/video/atmel_lcdfb.c index 4484c72..c2ceae4 100644 --- a/drivers/video/atmel_lcdfb.c +++ b/drivers/video/atmel_lcdfb.c @@ -1085,7 +1085,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); + sinfo->saved_lcdcon = lcdc_readl(sinfo, ATMEL_LCDC_CONTRAST_CTR); lcdc_writel(sinfo, ATMEL_LCDC_CONTRAST_CTR, 0); if (sinfo->atmel_lcdfb_power_control)