Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 333893cd09a0b93a75f33ca50a3be174c65c1378

Authored by Zhou Zhu
Committed by Linus Torvalds
1 parent 641b4b1b6a
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

ARM: mmp: added device for display controller 

Add device for display controller and fb support

Signed-off-by: Zhou Zhu <zzhu3@marvell.com>
Acked-by: Haojian Zhuang <haojian.zhuang@gmail.com>
Cc: Lisa Du <cldu@marvell.com>
Cc: Guoqing Li <ligq@marvell.com>
Cc: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 2 changed files with 7 additions and 1 deletions Side-by-side Diff

arch/arm/mach-mmp/include/mach/pxa910.h
Diff comments   View file @ 333893c
... ... @@ -10,6 +10,7 @@
10 10 #include <linux/i2c/pxa-i2c.h>
11 11 #include <mach/devices.h>
12 12 #include <linux/platform_data/mtd-nand-pxa3xx.h>
  13 +#include <video/mmp_disp.h>
13 14  
14 15 extern struct pxa_device_desc pxa910_device_uart1;
15 16 extern struct pxa_device_desc pxa910_device_uart2;
... ... @@ -23,7 +24,9 @@
23 24 extern struct platform_device pxa168_device_u2o;
24 25 extern struct platform_device pxa168_device_u2ootg;
25 26 extern struct platform_device pxa168_device_u2oehci;
26   -
  27 +extern struct pxa_device_desc pxa910_device_disp;
  28 +extern struct pxa_device_desc pxa910_device_fb;
  29 +extern struct pxa_device_desc pxa910_device_panel;
27 30 extern struct platform_device pxa910_device_gpio;
28 31 extern struct platform_device pxa910_device_rtc;
29 32  
arch/arm/mach-mmp/pxa910.c
Diff comments   View file @ 333893c
... ... @@ -138,6 +138,9 @@
138 138 PXA910_DEVICE(pwm3, "pxa910-pwm", 2, NONE, 0xd401a800, 0x10);
139 139 PXA910_DEVICE(pwm4, "pxa910-pwm", 3, NONE, 0xd401ac00, 0x10);
140 140 PXA910_DEVICE(nand, "pxa3xx-nand", -1, NAND, 0xd4283000, 0x80, 97, 99);
  141 +PXA910_DEVICE(disp, "mmp-disp", 0, LCD, 0xd420b000, 0x1ec);
  142 +PXA910_DEVICE(fb, "mmp-fb", -1, NONE, 0, 0);
  143 +PXA910_DEVICE(panel, "tpo-hvga", -1, NONE, 0, 0);
141 144  
142 145 struct resource pxa910_resource_gpio[] = {
143 146 {