From patchwork Mon Jun 23 13:07:19 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denis Carikli X-Patchwork-Id: 4401901 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 7FD78BEEAA for ; Mon, 23 Jun 2014 13:10:38 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C5058201F5 for ; Mon, 23 Jun 2014 13:10:36 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E77DB200ED for ; Mon, 23 Jun 2014 13:10:35 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Wz3yi-0005FS-7z; Mon, 23 Jun 2014 13:08:08 +0000 Received: from smtp4-g21.free.fr ([212.27.42.4]) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Wz3yS-000559-9o for linux-arm-kernel@lists.infradead.org; Mon, 23 Jun 2014 13:07:56 +0000 Received: from denis-N73SV.local.eukrea.fr (unknown [88.170.243.169]) by smtp4-g21.free.fr (Postfix) with ESMTP id 51A494C806C; Mon, 23 Jun 2014 15:07:30 +0200 (CEST) From: Denis Carikli To: Shawn Guo Subject: [PATCH v2 2/2] video: imxfb: Fix lcd_ops .set_power and .get_power on/off inversion Date: Mon, 23 Jun 2014 15:07:19 +0200 Message-Id: <1403528839-31901-2-git-send-email-denis@eukrea.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1403528839-31901-1-git-send-email-denis@eukrea.com> References: <1403528839-31901-1-git-send-email-denis@eukrea.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140623_060752_496168_37C47C85 X-CRM114-Status: GOOD ( 12.66 ) X-Spam-Score: 1.0 (+) Cc: linux-arm-kernel@lists.infradead.org, Denis Carikli , Alexander Shiyan , Sascha Hauer , =?UTF-8?q?Eric=20B=C3=A9nard?= X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP .set_power takes the blank level as argument instead of an on/off parameter: fb_blank calls fb_notifier_call_chain with the blank level encoded in its parameters, which is then sent as-is to the set_power callback. imxfb_lcd_set_power was expecting an on/off parameter instead. This resulted in the inversion of the on/off behaviour. .get_power was also fixed in the same way. Signed-off-by: Denis Carikli --- Changelog v1->v2: - get_power which has the same issue, was also fixed as requested. - The commit message was updated to reflect that. --- drivers/video/fbdev/imxfb.c | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/drivers/video/fbdev/imxfb.c b/drivers/video/fbdev/imxfb.c index 121cbd7..f734757 100644 --- a/drivers/video/fbdev/imxfb.c +++ b/drivers/video/fbdev/imxfb.c @@ -758,21 +758,32 @@ static int imxfb_lcd_get_power(struct lcd_device *lcddev) { struct imxfb_info *fbi = dev_get_drvdata(&lcddev->dev); - if (!IS_ERR(fbi->lcd_pwr)) - return regulator_is_enabled(fbi->lcd_pwr); + if (!IS_ERR_OR_NULL(fbi->lcd_pwr)) + if (!regulator_is_enabled(fbi->lcd_pwr)) + return FB_BLANK_NORMAL; - return 1; + return FB_BLANK_UNBLANK; } -static int imxfb_lcd_set_power(struct lcd_device *lcddev, int power) +static int imxfb_lcd_set_power(struct lcd_device *lcddev, int blank) { struct imxfb_info *fbi = dev_get_drvdata(&lcddev->dev); if (!IS_ERR(fbi->lcd_pwr)) { - if (power && !regulator_is_enabled(fbi->lcd_pwr)) - return regulator_enable(fbi->lcd_pwr); - else if (regulator_is_enabled(fbi->lcd_pwr)) - return regulator_disable(fbi->lcd_pwr); + switch (blank) { + case FB_BLANK_VSYNC_SUSPEND: + case FB_BLANK_HSYNC_SUSPEND: + case FB_BLANK_NORMAL: + case FB_BLANK_POWERDOWN: + if (regulator_is_enabled(fbi->lcd_pwr)) + return regulator_disable(fbi->lcd_pwr); + break; + + case FB_BLANK_UNBLANK: + if (!regulator_is_enabled(fbi->lcd_pwr)) + return regulator_enable(fbi->lcd_pwr); + break; + } } return 0;