From patchwork Thu Feb 4 14:04:12 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 8222051 Return-Path: X-Original-To: patchwork-linux-fbdev@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id DA58EBEEE5 for ; Thu, 4 Feb 2016 14:05:07 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id DD2B4200F2 for ; Thu, 4 Feb 2016 14:05:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A187F200ED for ; Thu, 4 Feb 2016 14:05:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757327AbcBDOFF (ORCPT ); Thu, 4 Feb 2016 09:05:05 -0500 Received: from mail-lb0-f181.google.com ([209.85.217.181]:33979 "EHLO mail-lb0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757225AbcBDOFE (ORCPT ); Thu, 4 Feb 2016 09:05:04 -0500 Received: by mail-lb0-f181.google.com with SMTP id cw1so31664012lbb.1 for ; Thu, 04 Feb 2016 06:05:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=e/nAiHgDeMqrSsGCEbv9ztcCeBSUPgfoIcqKiGc0oOg=; b=Tw6ELhHafkmsonEwGb9fwUK9ECvmHXQsPlgz9VsIU+dJR2/i4nwe0GqNxZPjfwqfTm /26+Lmu2O2IkFg7Mv6jLlZCUjHrLuw6h7cfVB4Ihgtx9shl8Hx0yfwhnNESU4/q2MLgX 50Ju9zsZf1vu6B/259zRJbUcjujWE8orBTdHI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=e/nAiHgDeMqrSsGCEbv9ztcCeBSUPgfoIcqKiGc0oOg=; b=QddMMI/DYDIVcMYfnfCRm8aSeYMFT516HziAZImYABEvhX+QFYzGuFzquTswSVlG6D NyuBxV8xKUKHhWCgT/5qQ166cJQyqphn79FGA591io99lEyFzUWlyHZKCBp4tP2/GOy2 EsuPR4UCrHd96CVqp6VyCVOH0p1qNbAL7WqKFEZetBAvbU/+z1ZVvKNclKpL/ERvRBwV 1EceuxHGMP/OI2j698gf7+O0vx7KxokTRFRTyS/7Ljtfzz966EMsgh+kQBoHGaiOp+/f toqvzI57S/Mq99seieMMDdHypbP9K4bwSUWAxTORUY5BpIL4KKBMky1UPsTr04lY6tUe MvEA== X-Gm-Message-State: AG10YOR7bCxjXtZcX66nR1CEwtLn5NbfSjLbsDtGkwvA4ilsi5VSujhvZXPSSS55o1jlfIt1 X-Received: by 10.112.164.205 with SMTP id ys13mr3100566lbb.71.1454594702486; Thu, 04 Feb 2016 06:05:02 -0800 (PST) Received: from localhost.localdomain ([85.235.10.227]) by smtp.gmail.com with ESMTPSA id m21sm1576066lfe.29.2016.02.04.06.05.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 04 Feb 2016 06:05:01 -0800 (PST) From: Linus Walleij To: linux-fbdev@vger.kernel.org, Tomi Valkeinen , Jean-Christophe Plagniol-Villard , Pawel Moll , Rob Herring , Russell King Cc: linux-arm-kernel@lists.infradead.org, Arnd Bergmann , Linus Walleij Subject: [PATCH 03/11] video: ARM CLCD: support pads connected in reverse order Date: Thu, 4 Feb 2016 15:04:12 +0100 Message-Id: <1454594660-7532-4-git-send-email-linus.walleij@linaro.org> X-Mailer: git-send-email 2.4.3 In-Reply-To: <1454594660-7532-1-git-send-email-linus.walleij@linaro.org> References: <1454594660-7532-1-git-send-email-linus.walleij@linaro.org> Sender: linux-fbdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fbdev@vger.kernel.org X-Spam-Status: No, score=-7.2 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,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 There are CLCDs connected with the pads in BGR rather than RGB order. It really doesn't matter since the CLCD has a flag and a bit to switch the position of the RGB and BGR components. This is needed to put something logical into the arm,pl11x,tft-r0g0b0-pads property of the device tree on the Nomadik which will then be <16 8 0>. Cc: Pawel Moll Cc: Rob Herring Cc: Russell King Signed-off-by: Linus Walleij --- drivers/video/fbdev/amba-clcd.c | 8 ++++++++ include/linux/amba/clcd.h | 31 ++++++++++++++++++++++++------- 2 files changed, 32 insertions(+), 7 deletions(-) diff --git a/drivers/video/fbdev/amba-clcd.c b/drivers/video/fbdev/amba-clcd.c index 8903a42c4122..9a631a8e2c04 100644 --- a/drivers/video/fbdev/amba-clcd.c +++ b/drivers/video/fbdev/amba-clcd.c @@ -681,6 +681,7 @@ static int clcdfb_of_init_tft_panel(struct clcd_fb *fb, u32 r0, u32 g0, u32 b0) } panels[] = { { 0x110, 1, 7, 13, CLCD_CAP_5551 }, { 0x110, 0, 8, 16, CLCD_CAP_888 }, + { 0x110, 16, 8, 0, CLCD_CAP_888 }, { 0x111, 4, 14, 20, CLCD_CAP_444 }, { 0x111, 3, 11, 19, CLCD_CAP_444 | CLCD_CAP_5551 }, { 0x111, 3, 10, 19, CLCD_CAP_444 | CLCD_CAP_5551 | @@ -708,6 +709,13 @@ static int clcdfb_of_init_tft_panel(struct clcd_fb *fb, u32 r0, u32 g0, u32 b0) fb->panel->caps = panels[i].caps; } + /* + * If we actually physically connected the R lines to B and + * vice versa + */ + if (r0 != 0 && b0 == 0) + fb->panel->bgr_connection = true; + return fb->panel->caps ? 0 : -EINVAL; } diff --git a/include/linux/amba/clcd.h b/include/linux/amba/clcd.h index e64c1ccebb76..c60f32e23a83 100644 --- a/include/linux/amba/clcd.h +++ b/include/linux/amba/clcd.h @@ -108,6 +108,12 @@ struct clcd_panel { grayscale:1; unsigned int connector; struct backlight_device *backlight; + /* + * If the B/R lines are switched between the CLCD + * and the panel we need to know this and not try to + * compensate with the BGR bit in the control register. + */ + bool bgr_connection; }; struct clcd_regs { @@ -234,16 +240,27 @@ static inline void clcdfb_decode(struct clcd_fb *fb, struct clcd_regs *regs) if (var->grayscale) val |= CNTL_LCDBW; - if (fb->panel->caps && fb->board->caps && - var->bits_per_pixel >= 16) { + if (fb->panel->caps && fb->board->caps && var->bits_per_pixel >= 16) { /* * if board and panel supply capabilities, we can support - * changing BGR/RGB depending on supplied parameters + * changing BGR/RGB depending on supplied parameters. Here + * we switch to what the framebuffer is providing if need + * be, so if the framebuffer is BGR but the display connection + * is RGB (first case) we switch it around. Vice versa mutatis + * mutandis if the framebuffer is RGB but the display connection + * is BGR, we flip it around. */ - if (var->red.offset == 0) - val &= ~CNTL_BGR; - else - val |= CNTL_BGR; + if (!fb->panel->bgr_connection) { + if (var->red.offset == 0) + val &= ~CNTL_BGR; + else + val |= CNTL_BGR; + } else { + if (var->blue.offset == 0) + val &= ~CNTL_BGR; + else + val |= CNTL_BGR; + } } switch (var->bits_per_pixel) {