From patchwork Thu Feb 25 19:34:06 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 62910 Delivered-To: patch@linaro.org Received: by 10.112.199.169 with SMTP id jl9csp336303lbc; Thu, 25 Feb 2016 11:34:18 -0800 (PST) X-Received: by 10.66.55.73 with SMTP id q9mr65298452pap.50.1456428857725; Thu, 25 Feb 2016 11:34:17 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id q62si14220936pfi.239.2016.02.25.11.34.17; Thu, 25 Feb 2016 11:34:17 -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 S933608AbcBYTeQ (ORCPT + 2 others); Thu, 25 Feb 2016 14:34:16 -0500 Received: from mail-lf0-f43.google.com ([209.85.215.43]:35370 "EHLO mail-lf0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933377AbcBYTeP (ORCPT ); Thu, 25 Feb 2016 14:34:15 -0500 Received: by mail-lf0-f43.google.com with SMTP id l143so39918984lfe.2 for ; Thu, 25 Feb 2016 11:34:14 -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; bh=9pIO45dN/Gzk9vh8seckpcKPX8WE4gJz/7i33xUBSDc=; b=IvO4U3OGXCqOOuZWkybEW3Ey7LBmWMQm5/5oDgKHIQGMjsUaKaEtMWyhoJENcGEPqW p8nYiU1jDGQofAsd01qkzjCBHnSP4NMWBdEw13FriInH+8rM3P4pryXsQe2dtlgB4Zr1 Tw3NtExVzDz2vdtrvP1wBTNh4sI9jN1uzSFaY= 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; bh=9pIO45dN/Gzk9vh8seckpcKPX8WE4gJz/7i33xUBSDc=; b=gB+p1YPk54g+WHad7thUYpOjDlKNwJd9vplCA9ZnF5nhGmzbQhnGAdgJiIBHqep3lc i9xE/8P3bccNnuGnz/DhbMrRqZ/zwunyKxwCGA+NGYI2UiNi87OTRLkVseOY9026Dt1z 7LKp4ZqwvvExfXPPLmBH+hWEU6k8JhjG7Pj46NlumCWG+DjUZZ2I2UkVSQm3hoyNHzf5 ahT9o9FONGdcgz6xG9+WJNDlHLiPn3hAun2/IkuX8HCzcb23G0gOkK9ssdBVx2pv8eGN 2MHns1GmmUgXuEAIQAnoMrs/Z3zyamipbl1xuVk52cwFNLedZzoc7iaIQryx9+7UHoN4 eH2A== X-Gm-Message-State: AG10YORk3DzZ+vyhYVQmGqxFPLWwTGk76A6KssZV9vZaZ+hnUpEP51wzCvNb0bfFoii3TFEC X-Received: by 10.25.43.148 with SMTP id r142mr17560104lfr.103.1456428853685; Thu, 25 Feb 2016 11:34:13 -0800 (PST) Received: from localhost.localdomain.localdomain (c-3d95db54.01-192-6c756e10.cust.bredbandsbolaget.se. [84.219.149.61]) by smtp.gmail.com with ESMTPSA id k3sm1390157lbp.9.2016.02.25.11.34.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 25 Feb 2016 11:34:12 -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: Thu, 25 Feb 2016 20:34:06 +0100 Message-Id: <1456428846-6250-1-git-send-email-linus.walleij@linaro.org> X-Mailer: git-send-email 2.4.3 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) {