From patchwork Mon Dec 10 12:28:49 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 1857911 Return-Path: X-Original-To: patchwork-linux-fbdev@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 5D407DFB79 for ; Mon, 10 Dec 2012 12:30:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752597Ab2LJMaG (ORCPT ); Mon, 10 Dec 2012 07:30:06 -0500 Received: from mail-lb0-f174.google.com ([209.85.217.174]:60016 "EHLO mail-lb0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752828Ab2LJMaG (ORCPT ); Mon, 10 Dec 2012 07:30:06 -0500 Received: by mail-lb0-f174.google.com with SMTP id gi11so1927392lbb.19 for ; Mon, 10 Dec 2012 04:30:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=jo0I/4+D/7Iqs/9EB7JMNoCqP0BhJSsRUjIE54jdyqo=; b=oV+/9qBBwekq+n5jPPtLD2LvEUeLO7ajYweefh7sQWES7m4gj8CjAS2CnwT8SWY2bC ZAsnb4IyaT9qydkDyF7J4UT36QBjEJPIRFAeQygPy0UktvKV6b8fNQi+wulQ+39zA+P8 Qs2GunaYCP8mAzDjtbN+ZGL7edald55yZXUBiVN5Heng1/VonqlWJu1mFZ6J4hoYDcU1 hit48kpXH++q2ojCAMGaifBwktSKhIjb7Igk9dWdDCrnA79QqfvpWvggEFGICMwGhrt5 JJD/zIt9wj2keF+p579Wk1hw1hXunw5UYp6SBAq4ZeVv18WXO7iGx1juIjUbK/syFrWv 7Oag== Received: by 10.112.84.102 with SMTP id x6mr6183786lby.35.1355142605144; Mon, 10 Dec 2012 04:30:05 -0800 (PST) Received: from xi.lan (s83-177-171-79.cust.tele2.se. [83.177.171.79]) by mx.google.com with ESMTPS id hu6sm7754026lab.13.2012.12.10.04.30.03 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 10 Dec 2012 04:30:04 -0800 (PST) Received: from johan by xi.lan with local (Exim 4.80.1) (envelope-from ) id 1Ti2Tk-0002ik-9N; Mon, 10 Dec 2012 13:29:00 +0100 From: Johan Hovold To: Florian Tobias Schandinat Cc: Andrew Victor , Nicolas Ferre , Jean-Christophe Plagniol-Villard , linux-arm-kernel@lists.infradead.org, linux-fbdev@vger.kernel.org, Peter Korsgaard , Johan Hovold , Subject: [PATCH 2/3] ARM: at91/neocore926: fix LCD-wiring mode Date: Mon, 10 Dec 2012 13:28:49 +0100 Message-Id: <1355142530-10366-3-git-send-email-jhovold@gmail.com> X-Mailer: git-send-email 1.8.0 In-Reply-To: <1355142530-10366-1-git-send-email-jhovold@gmail.com> References: <1355142530-10366-1-git-send-email-jhovold@gmail.com> Sender: linux-fbdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fbdev@vger.kernel.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: Signed-off-by: Johan Hovold Acked-by: Peter Korsgaard --- 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 997d359..daeb7c6 100644 --- a/arch/arm/mach-at91/board-neocore926.c +++ b/arch/arm/mach-at91/board-neocore926.c @@ -265,7 +265,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 */