Merge branch 'master' of git://git.denx.de/u-boot-video

Tom Rini
2 parents f875bbb491 c385ac2830
Showing 4 changed files Side-by-side Diff
common/lcd_simplefb.c
drivers/video/da8xx-fb.c
drivers/video/mx3fb.c
drivers/video/mxc_ipuv3_fb.c
@@ -16,11 +16,14 @@
  
 static int lcd_dt_simplefb_configure_node(void *blob, int off)
 {
-#if LCD_BPP == LCD_COLOR16
 	int vl_col = lcd_get_pixel_width();
 	int vl_row = lcd_get_pixel_height();
+#if LCD_BPP == LCD_COLOR16
 	return fdt_setup_simplefb_node(blob, off, gd->fb_base, vl_col, vl_row,
 				       vl_col * 2, "r5g6b5");
+#elif LCD_BPP == LCD_COLOR32
+	return fdt_setup_simplefb_node(blob, off, gd->fb_base, vl_col, vl_row,
+				       vl_col * 4, "a8r8g8b8");
 #else
 	return -1;
 #endif
@@ -1035,16 +1035,6 @@
 	return NULL;
 }
  
-void video_set_lut(unsigned int index,	/* color number */
-		    unsigned char r,	/* red */
-		    unsigned char g,	/* green */
-		    unsigned char b	/* blue */
-		    )
-{
-
-	return;
-}
-
 void da8xx_video_init(const struct da8xx_panel *panel,
 		      const struct lcd_ctrl_config *lcd_cfg, int bits_pixel)
 {
@@ -904,13 +904,4 @@
  
 	return (void *) &panel;
 }
-
-void video_set_lut(unsigned int index,	/* color number */
-		    unsigned char r,	/* red */
-		    unsigned char g,	/* green */
-		    unsigned char b	/* blue */
-		    )
-{
-	return;
-}
@@ -599,15 +599,6 @@
 	return (void *)&panel;
 }
  
-void video_set_lut(unsigned int index, /* color number */
-			unsigned char r,    /* red */
-			unsigned char g,    /* green */
-			unsigned char b     /* blue */
-			)
-{
-	return;
-}
-
 int ipuv3_fb_init(struct fb_videomode const *mode,
 		  uint8_t disp,
 		  uint32_t pixfmt)
...	...	@@ -16,11 +16,14 @@
16	16
17	17	static int lcd_dt_simplefb_configure_node(void *blob, int off)
18	18	{
19		-#if LCD_BPP == LCD_COLOR16
20	19	int vl_col = lcd_get_pixel_width();
21	20	int vl_row = lcd_get_pixel_height();
	21	+#if LCD_BPP == LCD_COLOR16
22	22	return fdt_setup_simplefb_node(blob, off, gd->fb_base, vl_col, vl_row,
23	23	vl_col * 2, "r5g6b5");
	24	+#elif LCD_BPP == LCD_COLOR32
	25	+ return fdt_setup_simplefb_node(blob, off, gd->fb_base, vl_col, vl_row,
	26	+ vl_col * 4, "a8r8g8b8");
24	27	#else
25	28	return -1;
26	29	#endif
...	...	@@ -1035,16 +1035,6 @@
1035	1035	return NULL;
1036	1036	}
1037	1037
1038		-void video_set_lut(unsigned int index, /* color number */
1039		- unsigned char r, /* red */
1040		- unsigned char g, /* green */
1041		- unsigned char b /* blue */
1042		- )
1043		-{
1044		-
1045		- return;
1046		-}
1047		-
1048	1038	void da8xx_video_init(const struct da8xx_panel *panel,
1049	1039	const struct lcd_ctrl_config *lcd_cfg, int bits_pixel)
1050	1040	{
...	...	@@ -904,13 +904,4 @@
904	904
905	905	return (void *) &panel;
906	906	}
907		-
908		-void video_set_lut(unsigned int index, /* color number */
909		- unsigned char r, /* red */
910		- unsigned char g, /* green */
911		- unsigned char b /* blue */
912		- )
913		-{
914		- return;
915		-}
...	...	@@ -599,15 +599,6 @@
599	599	return (void *)&panel;
600	600	}
601	601
602		-void video_set_lut(unsigned int index, /* color number */
603		- unsigned char r, /* red */
604		- unsigned char g, /* green */
605		- unsigned char b /* blue */
606		- )
607		-{
608		- return;
609		-}
610		-
611	602	int ipuv3_fb_init(struct fb_videomode const *mode,
612	603	uint8_t disp,
613	604	uint32_t pixfmt)