aboutsummaryrefslogtreecommitdiffstats
path: root/arch/mips/au1000
diff options
context:
space:
mode:
authorPete Popov <ppopov@embeddedalley.com>2005-04-03 21:06:19 -0400
committerRalf Baechle <ralf@linux-mips.org>2005-10-29 14:31:01 -0400
commit3b495f2bb749b828499135743b9ddec46e34fda8 (patch)
tree5f787ed9829ef01a457428114ccd3547cf6c88da /arch/mips/au1000
parent172546bf601356f94f8018af7908a9b7c1c4915c (diff)
Au1100 FB driver uplift for 2.6.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org> Acked-by: Antonino Daplas <adaplas@pol.net>
Diffstat (limited to 'arch/mips/au1000')
-rw-r--r--arch/mips/au1000/common/platform.c34
-rw-r--r--arch/mips/au1000/common/setup.c2
2 files changed, 34 insertions, 2 deletions
diff --git a/arch/mips/au1000/common/platform.c b/arch/mips/au1000/common/platform.c
index 0776b2db5641..3ca3cb8a8a73 100644
--- a/arch/mips/au1000/common/platform.c
+++ b/arch/mips/au1000/common/platform.c
@@ -41,8 +41,42 @@ static struct platform_device au1xxx_usb_ohci_device = {
41 .resource = au1xxx_usb_ohci_resources, 41 .resource = au1xxx_usb_ohci_resources,
42}; 42};
43 43
44/*** AU1100 LCD controller ***/
45
46#ifdef CONFIG_FB_AU1100
47static struct resource au1100_lcd_resources[] = {
48 [0] = {
49 .start = LCD_PHYS_ADDR,
50 .end = LCD_PHYS_ADDR + 0x800 - 1,
51 .flags = IORESOURCE_MEM,
52 },
53 [1] = {
54 .start = AU1100_LCD_INT,
55 .end = AU1100_LCD_INT,
56 .flags = IORESOURCE_IRQ,
57 }
58};
59
60static u64 au1100_lcd_dmamask = ~(u32)0;
61
62static struct platform_device au1100_lcd_device = {
63 .name = "au1100-lcd",
64 .id = 0,
65 .dev = {
66 .dma_mask = &au1100_lcd_dmamask,
67 .coherent_dma_mask = 0xffffffff,
68 },
69 .num_resources = ARRAY_SIZE(au1100_lcd_resources),
70 .resource = au1100_lcd_resources,
71};
72#endif
73
74
44static struct platform_device *au1xxx_platform_devices[] __initdata = { 75static struct platform_device *au1xxx_platform_devices[] __initdata = {
45 &au1xxx_usb_ohci_device, 76 &au1xxx_usb_ohci_device,
77#ifdef CONFIG_FB_AU1100
78 &au1100_lcd_device,
79#endif
46}; 80};
47 81
48int au1xxx_platform_init(void) 82int au1xxx_platform_init(void)
diff --git a/arch/mips/au1000/common/setup.c b/arch/mips/au1000/common/setup.c
index c1e7d2dcc190..8d21efdf29b7 100644
--- a/arch/mips/au1000/common/setup.c
+++ b/arch/mips/au1000/common/setup.c
@@ -106,8 +106,6 @@ void __init plat_setup(void)
106 /*strcat(argptr, " video=au1100fb:panel:Sharp_320x240_16");*/ 106 /*strcat(argptr, " video=au1100fb:panel:Sharp_320x240_16");*/
107#ifdef CONFIG_MIPS_HYDROGEN3 107#ifdef CONFIG_MIPS_HYDROGEN3
108 strcat(argptr, " video=au1100fb:panel:Hydrogen_3_NEC_panel_320x240,nohwcursor"); 108 strcat(argptr, " video=au1100fb:panel:Hydrogen_3_NEC_panel_320x240,nohwcursor");
109#else
110 strcat(argptr, " video=au1100fb:panel:s10,nohwcursor");
111#endif 109#endif
112 } 110 }
113#endif 111#endif