Au1100 FB driver uplift for 2.6. (3b495f2b) · Commits · e / devices / android_kernel_fairphone_FP5

arch/mips/au1000/common/platform.c

+34 −0

Original line number	Original line	Diff line number	Diff line
	@@ -41,8 +41,42 @@ static struct platform_device au1xxx_usb_ohci_device = {
	.resource = au1xxx_usb_ohci_resources,		.resource = au1xxx_usb_ohci_resources,
	};		};

			/* AU1100 LCD controller */

			#ifdef CONFIG_FB_AU1100
			static struct resource au1100_lcd_resources[] = {
			[0] = {
			.start = LCD_PHYS_ADDR,
			.end = LCD_PHYS_ADDR + 0x800 - 1,
			.flags = IORESOURCE_MEM,
			},
			[1] = {
			.start = AU1100_LCD_INT,
			.end = AU1100_LCD_INT,
			.flags = IORESOURCE_IRQ,
			}
			};

			static u64 au1100_lcd_dmamask = ~(u32)0;

			static struct platform_device au1100_lcd_device = {
			.name = "au1100-lcd",
			.id = 0,
			.dev = {
			.dma_mask = &au1100_lcd_dmamask,
			.coherent_dma_mask = 0xffffffff,
			},
			.num_resources = ARRAY_SIZE(au1100_lcd_resources),
			.resource = au1100_lcd_resources,
			};
			#endif


	static struct platform_device *au1xxx_platform_devices[] __initdata = {		static struct platform_device *au1xxx_platform_devices[] __initdata = {
	&au1xxx_usb_ohci_device,		&au1xxx_usb_ohci_device,
			#ifdef CONFIG_FB_AU1100
			&au1100_lcd_device,
			#endif
	};		};

	int au1xxx_platform_init(void)		int au1xxx_platform_init(void)

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -106,8 +106,6 @@ void __init plat_setup(void)
	/strcat(argptr, " video=au1100fb:panel:Sharp_320x240_16");/		/strcat(argptr, " video=au1100fb:panel:Sharp_320x240_16");/
	#ifdef CONFIG_MIPS_HYDROGEN3		#ifdef CONFIG_MIPS_HYDROGEN3
	strcat(argptr, " video=au1100fb:panel:Hydrogen_3_NEC_panel_320x240,nohwcursor");		strcat(argptr, " video=au1100fb:panel:Hydrogen_3_NEC_panel_320x240,nohwcursor");
	#else
	strcat(argptr, " video=au1100fb:panel:s10,nohwcursor");
	#endif		#endif
	}		}
	#endif		#endif

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -86,7 +86,7 @@ obj-$(CONFIG_FB_CIRRUS) += cirrusfb.o
	obj-$(CONFIG_FB_ASILIANT) += asiliantfb.o		obj-$(CONFIG_FB_ASILIANT) += asiliantfb.o
	obj-$(CONFIG_FB_PXA) += pxafb.o		obj-$(CONFIG_FB_PXA) += pxafb.o
	obj-$(CONFIG_FB_W100) += w100fb.o		obj-$(CONFIG_FB_W100) += w100fb.o
	obj-$(CONFIG_FB_AU1100) += au1100fb.o fbgen.o		obj-$(CONFIG_FB_AU1100) += au1100fb.o
	obj-$(CONFIG_FB_PMAG_AA) += pmag-aa-fb.o		obj-$(CONFIG_FB_PMAG_AA) += pmag-aa-fb.o
	obj-$(CONFIG_FB_PMAG_BA) += pmag-ba-fb.o		obj-$(CONFIG_FB_PMAG_BA) += pmag-ba-fb.o
	obj-$(CONFIG_FB_PMAGB_B) += pmagb-b-fb.o		obj-$(CONFIG_FB_PMAGB_B) += pmagb-b-fb.o