From patchwork Thu Jan 17 08:24:27 2013
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Zhou Zhu <zzhu3@marvell.com>
X-Patchwork-Id: 1995461
Return-Path: <linux-fbdev-owner@vger.kernel.org>
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 C2558DF2E1
	for <patchwork-linux-fbdev@patchwork.kernel.org>;
	Thu, 17 Jan 2013 08:32:29 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1759392Ab3AQIc3 (ORCPT
	<rfc822;patchwork-linux-fbdev@patchwork.kernel.org>);
	Thu, 17 Jan 2013 03:32:29 -0500
Received: from na3sys009aog124.obsmtp.com ([74.125.149.151]:44440 "EHLO
	na3sys009aog124.obsmtp.com" rhost-flags-OK-OK-OK-OK)
	by vger.kernel.org with ESMTP id S1759214Ab3AQIc2 (ORCPT
	<rfc822;linux-fbdev@vger.kernel.org>);
	Thu, 17 Jan 2013 03:32:28 -0500
Received: from MSI-MTA.marvell.com ([65.219.4.132]) (using TLSv1) by
	na3sys009aob124.postini.com ([74.125.148.12]) with SMTP
	ID DSNKUPe3GN9K6UJWgs29646WlOm9yZc0j9dF@postini.com;
	Thu, 17 Jan 2013 00:32:28 PST
Received: from maili.marvell.com ([10.68.76.210]) by MSI-MTA.marvell.com
	with Microsoft SMTPSVC(6.0.3790.4675);
	Thu, 17 Jan 2013 00:24:29 -0800
Received: from localhost (unknown [10.38.36.52])
	by maili.marvell.com (Postfix) with ESMTP id 166AB4E510;
	Thu, 17 Jan 2013 00:24:30 -0800 (PST)
From: Zhou Zhu <zzhu3@marvell.com>
To: <linux-fbdev@vger.kernel.org>, <haojian.zhuang@gmail.com>,
	Andrew Morton <akpm@linux-foundation.org>, <FlorianSchandinat@gmx.de>
Cc: <zzhu84@gmail.com>, Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	Zhou Zhu <zzhu3@marvell.com>
Subject: [PATCH v5 6/8] ARM: mmp: added device for display controller
Date: Thu, 17 Jan 2013 16:24:27 +0800
Message-Id: <1358411067-2775-1-git-send-email-zzhu3@marvell.com>
X-Mailer: git-send-email 1.7.9.5
X-OriginalArrivalTime: 17 Jan 2013 08:24:29.0747 (UTC)
	FILETIME=[11F4D830:01CDF48C]
Sender: linux-fbdev-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-fbdev.vger.kernel.org>
X-Mailing-List: linux-fbdev@vger.kernel.org

added device for display controller and fb support

Signed-off-by: Zhou Zhu <zzhu3@marvell.com>
---
 arch/arm/mach-mmp/include/mach/pxa910.h |    5 ++++-
 arch/arm/mach-mmp/pxa910.c              |    3 +++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/arch/arm/mach-mmp/include/mach/pxa910.h b/arch/arm/mach-mmp/include/mach/pxa910.h
index 3b58a3b..b4c94d8 100644
--- a/arch/arm/mach-mmp/include/mach/pxa910.h
+++ b/arch/arm/mach-mmp/include/mach/pxa910.h
@@ -10,6 +10,7 @@ extern void __init pxa910_init_irq(void);
 #include <linux/i2c/pxa-i2c.h>
 #include <mach/devices.h>
 #include <linux/platform_data/mtd-nand-pxa3xx.h>
+#include <video/mmp_disp.h>
 
 extern struct pxa_device_desc pxa910_device_uart1;
 extern struct pxa_device_desc pxa910_device_uart2;
@@ -23,7 +24,9 @@ extern struct pxa_device_desc pxa910_device_nand;
 extern struct platform_device pxa168_device_u2o;
 extern struct platform_device pxa168_device_u2ootg;
 extern struct platform_device pxa168_device_u2oehci;
-
+extern struct pxa_device_desc pxa910_device_disp;
+extern struct pxa_device_desc pxa910_device_fb;
+extern struct pxa_device_desc pxa910_device_panel;
 extern struct platform_device pxa910_device_gpio;
 extern struct platform_device pxa910_device_rtc;
 
diff --git a/arch/arm/mach-mmp/pxa910.c b/arch/arm/mach-mmp/pxa910.c
index 8b1e16f..e49cdd9 100644
--- a/arch/arm/mach-mmp/pxa910.c
+++ b/arch/arm/mach-mmp/pxa910.c
@@ -138,6 +138,9 @@ PXA910_DEVICE(pwm2, "pxa910-pwm", 1, NONE, 0xd401a400, 0x10);
 PXA910_DEVICE(pwm3, "pxa910-pwm", 2, NONE, 0xd401a800, 0x10);
 PXA910_DEVICE(pwm4, "pxa910-pwm", 3, NONE, 0xd401ac00, 0x10);
 PXA910_DEVICE(nand, "pxa3xx-nand", -1, NAND, 0xd4283000, 0x80, 97, 99);
+PXA910_DEVICE(disp, "mmp-disp", 0, LCD, 0xd420b000, 0x1ec);
+PXA910_DEVICE(fb, "mmp-fb", -1, NONE, 0, 0);
+PXA910_DEVICE(panel, "tpo-hvga", -1, NONE, 0, 0);
 
 struct resource pxa910_resource_gpio[] = {
 	{