From patchwork Tue Feb 23 10:01:41 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 62688 Delivered-To: patch@linaro.org Received: by 10.112.43.199 with SMTP id y7csp1742719lbl; Tue, 23 Feb 2016 02:02:47 -0800 (PST) X-Received: by 10.98.16.198 with SMTP id 67mr44998525pfq.21.1456221767293; Tue, 23 Feb 2016 02:02:47 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id vb6si46263413pac.158.2016.02.23.02.02.47; Tue, 23 Feb 2016 02:02:47 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-fbdev-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-fbdev-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-fbdev-owner@vger.kernel.org; dkim=neutral (body hash did not verify) header.i=@linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751236AbcBWKCn (ORCPT + 2 others); Tue, 23 Feb 2016 05:02:43 -0500 Received: from mail-lb0-f177.google.com ([209.85.217.177]:35646 "EHLO mail-lb0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751221AbcBWKCO (ORCPT ); Tue, 23 Feb 2016 05:02:14 -0500 Received: by mail-lb0-f177.google.com with SMTP id bc4so97805955lbc.2 for ; Tue, 23 Feb 2016 02:02:13 -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=9pIO45dN/Gzk9vh8seckpcKPX8WE4gJz/7i33xUBSDc=; b=SA+cnCaX7Uw8IKvfWVOsFf9PNDQwvq4xZC6zMG1N8gIMFhzJfItSD0zx0UQthxT/i6 ArfSbqTc1wPye/Gu1VeO+N8Mx7u+AKBoJ22iiLIZMY7RtYUXQMpiZEswtWoguWlbdqhM Kj/rBjGRmWWJmVlhsJ27e7LsrfVTrGYPmuCVw= 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=9pIO45dN/Gzk9vh8seckpcKPX8WE4gJz/7i33xUBSDc=; b=f5o2kSZvtwKwqGEOpBEW7rpu5w5lZkdZU7u/bDHUDY/TzOn5TnUeR3s79EXH91F9rp dexzxrMeWseX7g2nQWlJc9/GOhcXzCnCyGRsNlO5qY+OwFSJZg0LXL5LI8MT4PdyZPrA 25KFypEZR5Y9cnrWvUqaf+Mx7nvQcXCAPfjTuAIeWuPKxu2aTJOdxezcsJA6Z6l5eTJh SPSYsc3sttPKo4D+ehg3f9ZGP+hT9V4WF099/kn9tzlQKem922lyEXsFOUeJ/fpzyT1Q WucjSVoGaDoL7b9z7pjRPmqyzXSPu+8FqUSdruHkz3TX1p9rYYy1TyAW8ylBD02Nk0HI 4lcQ== X-Gm-Message-State: AG10YOSUrCKUAk5eidS2lQiEbEh6YWvsLxlGzBwUXqAYT9jP/78HjTd6021MGmFn3jH4m+kg X-Received: by 10.112.129.169 with SMTP id nx9mr12145610lbb.96.1456221732529; Tue, 23 Feb 2016 02:02:12 -0800 (PST) Received: from localhost.localdomain ([85.235.10.227]) by smtp.gmail.com with ESMTPSA id k70sm3926525lfg.5.2016.02.23.02.02.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 23 Feb 2016 02:02:11 -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 , Ray Jui , Linus Walleij Subject: [PATCH 4/7 v2] video: ARM CLCD: support pads connected in reverse order Date: Tue, 23 Feb 2016 11:01:41 +0100 Message-Id: <1456221704-5792-5-git-send-email-linus.walleij@linaro.org> X-Mailer: git-send-email 2.4.3 In-Reply-To: <1456221704-5792-1-git-send-email-linus.walleij@linaro.org> References: <1456221704-5792-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 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 --- ChangeLog v1->v2: - No changes. Just reposting. --- drivers/video/fbdev/amba-clcd.c | 8 ++++++++ include/linux/amba/clcd.h | 31 ++++++++++++++++++++++++------- 2 files changed, 32 insertions(+), 7 deletions(-) -- 2.4.3 -- 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/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) {