Merge "display/osd,logo: Add a display parameter for 480x320p60hz" into odroidc2-3.14.y

Author: Joy Cho

drivers/amlogic/display/logo/logo.c

@@ -76,6 +76,7 @@ static struct para_pair_s mode_infos[] = {
 	{"2560x1600p60hz", TVMODE_2560x1600p60hz},
 	{"2560x1080p60hz", TVMODE_2560x1080p60hz},
 	{"3440x1440p60hz", TVMODE_3440x1440p60hz},
+	{"480x320p60hz", TVMODE_480x320p60hz},
 	{"480cvbs", VMODE_480CVBS},
 	{"576cvbs", VMODE_576CVBS},
 	{"480i60hz", VMODE_480I},

drivers/amlogic/display/osd/osd_fb.c

@@ -428,6 +428,13 @@ static int osd_set_res_bootargs(int index, enum vmode_e mode)
 		fb_def_var[index].yres_virtual = 2880;
 		fb_def_var[index].bits_per_pixel = 32;
 		break;
+	case TVMODE_480x320p60hz:
+		fb_def_var[index].xres = 480;
+		fb_def_var[index].yres = 320;
+		fb_def_var[index].xres_virtual = 480;
+		fb_def_var[index].yres_virtual = 320;
+		fb_def_var[index].bits_per_pixel = 32;
+		break;
 	case VMODE_480P:
 	case VMODE_480I:
 		fb_def_var[index].xres = 720;