The patch titled
Subject: ARM: mmp: add device for display controller
has been removed from the -mm tree. Its filename was
arm-mmp-add-device-for-display-controller.patch
This patch was dropped because an updated version will be merged
------------------------------------------------------
From: Zhou Zhu <zzhu3@xxxxxxxxxxx>
Subject: ARM: mmp: add device for display controller
Add device for display controller and fb support
Signed-off-by: Zhou Zhu <zzhu3@xxxxxxxxxxx>
Cc: Guoqing Li <ligq@xxxxxxxxxxx>
Cc: Lisa Du <cldu@xxxxxxxxxxx>
Acked-by: Haojian Zhuang <haojian.zhuang@xxxxxxxxx>
Cc: Florian Tobias Schandinat <FlorianSchandinat@xxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
arch/arm/mach-mmp/include/mach/pxa910.h | 5 ++++-
arch/arm/mach-mmp/pxa910.c | 3 +++
2 files changed, 7 insertions(+), 1 deletion(-)
diff -puN arch/arm/mach-mmp/include/mach/pxa910.h~arm-mmp-add-device-for-display-controller arch/arm/mach-mmp/include/mach/pxa910.h
--- a/arch/arm/mach-mmp/include/mach/pxa910.h~arm-mmp-add-device-for-display-controller
+++ a/arch/arm/mach-mmp/include/mach/pxa910.h
@@ -8,6 +8,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;
@@ -21,7 +22,9 @@ extern struct pxa_device_desc pxa910_dev
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 -puN arch/arm/mach-mmp/pxa910.c~arm-mmp-add-device-for-display-controller arch/arm/mach-mmp/pxa910.c
--- a/arch/arm/mach-mmp/pxa910.c~arm-mmp-add-device-for-display-controller
+++ a/arch/arm/mach-mmp/pxa910.c
@@ -134,6 +134,9 @@ PXA910_DEVICE(pwm2, "pxa910-pwm", 1, NON
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[] = {
{
_
Patches currently in -mm which might be from zzhu3@xxxxxxxxxxx are
arm-mmp-enable-display-in-ttc_dkb.patch
arm-mmp-add-display-and-fb-support-in-pxa910-defconfig.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
