From patchwork Tue Feb 5 13:35:12 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 2097831 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id BEACD3FC23 for ; Tue, 5 Feb 2013 13:40:10 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1U2iiq-0000jC-CM; Tue, 05 Feb 2013 13:38:04 +0000 Received: from mail-la0-x234.google.com ([2a00:1450:4010:c03::234]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1U2iiA-0000Nc-7N for linux-arm-kernel@lists.infradead.org; Tue, 05 Feb 2013 13:37:23 +0000 Received: by mail-la0-f52.google.com with SMTP id fs12so147406lab.25 for ; Tue, 05 Feb 2013 05:37:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=tztRau17S/OajPFhaxHUJYQqcRd3AMrvW2ksOmR49rM=; b=hK83zzt3UbG/R6yXhmTE/QvpKIb70oWhLu/L1OPGY307rSw7+PPUKUEpGPCNChisdO V45WOZzEbSOcq3gC0jA4uzNg1HKX0pVmAGG5Hs/c8FbQVVmCkZLf6GJdfyNAuHZ6AdmZ JczAXVAITKvbHnmp0SgEbSWvelSrH0H0voHKDz+iLn7iJNpsJv3cdnwP0cc0uQteo9U+ XwOCoe15msV3fe/uWd5LghcVsYVqveDT3tiksE3EQOxT07EbMN+Wsh21h/NEn49iW12Y zSaiigKoezClq8r+pkDTU0ZFUQ0fKlLTXwgKfJoJflFpI4a0L36JFYzs/wArulVBN30y m2Tg== X-Received: by 10.112.29.225 with SMTP id n1mr9653571lbh.58.1360071429268; Tue, 05 Feb 2013 05:37:09 -0800 (PST) Received: from xi.lan (c83-179-13-247.cust.tele2.se. [83.179.13.247]) by mx.google.com with ESMTPS id gu8sm10970122lab.6.2013.02.05.05.37.06 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 05 Feb 2013 05:37:08 -0800 (PST) Received: from johan by xi.lan with local (Exim 4.80.1) (envelope-from ) id 1U2ige-00014A-IB; Tue, 05 Feb 2013 14:35:48 +0100 From: Johan Hovold To: Nicolas Ferre Subject: [PATCH 2/5] ARM: at91/neocore926: fix LCD-wiring mode Date: Tue, 5 Feb 2013 14:35:12 +0100 Message-Id: <1360071315-4032-3-git-send-email-jhovold@gmail.com> X-Mailer: git-send-email 1.8.1 In-Reply-To: <1360071315-4032-1-git-send-email-jhovold@gmail.com> References: <20130129135435.GN7360@game.jcrosoft.org> <1360071315-4032-1-git-send-email-jhovold@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130205_083722_461697_75C430EA X-CRM114-Status: GOOD ( 13.34 ) X-Spam-Score: 1.0 (+) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (1.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- 3.0 KHOP_BIG_TO_CC Sent to 10+ recipients instaed of Bcc or a list 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (jhovold[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Cc: linux-fbdev@vger.kernel.org, Florian Tobias Schandinat , Johan Hovold , stable@vger.kernel.org, Peter Korsgaard , Haavard Skinnemoen , Jean-Christophe PLAGNIOL-VILLARD , Andrew Victor , linux-arm-kernel@lists.infradead.org, Hans-Christian Egtvedt X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org Fix regression introduced by commit 787f9fd23283 ("atmel_lcdfb: support 16bit BGR:565 mode, remove unsupported 15bit modes") which broke 16-bpp modes for older SOCs which use IBGR:555 (msb is intensity) rather than BGR:565. The above commit also removed the RGB:555-wiring hack without fixing the neocore926 board which used it. Fix by specifying RGB-wiring and let the driver handle the final SOC-dependant layout. Remove the no longer used ATMEL_LCDC_WIRING_RGB555 define. Compile-only tested. Cc: Acked-by: Peter Korsgaard Signed-off-by: Johan Hovold --- arch/arm/mach-at91/board-neocore926.c | 2 +- include/video/atmel_lcdc.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/arch/arm/mach-at91/board-neocore926.c b/arch/arm/mach-at91/board-neocore926.c index bc7a1c4..4726297 100644 --- a/arch/arm/mach-at91/board-neocore926.c +++ b/arch/arm/mach-at91/board-neocore926.c @@ -266,7 +266,7 @@ static struct atmel_lcdfb_info __initdata neocore926_lcdc_data = { .default_monspecs = &at91fb_default_monspecs, .atmel_lcdfb_power_control = at91_lcdc_power_control, .guard_time = 1, - .lcd_wiring_mode = ATMEL_LCDC_WIRING_RGB555, + .lcd_wiring_mode = ATMEL_LCDC_WIRING_RGB, }; #else diff --git a/include/video/atmel_lcdc.h b/include/video/atmel_lcdc.h index 5f0e234..8deb226 100644 --- a/include/video/atmel_lcdc.h +++ b/include/video/atmel_lcdc.h @@ -30,7 +30,6 @@ */ #define ATMEL_LCDC_WIRING_BGR 0 #define ATMEL_LCDC_WIRING_RGB 1 -#define ATMEL_LCDC_WIRING_RGB555 2 /* LCD Controller info data structure, stored in device platform_data */