drivers: video: rockchip: hdmi: add RAYKEN5.46" lcd for discret vr device

Change-Id: Ica15b530c565b3c61fe1b1cb6ef1e8944a7e7607
Signed-off-by: wjh <wjh@rock-chips.com>

diff --git a/drivers/video/rockchip/hdmi/rockchip-hdmi-lcdc.c b/drivers/video/rockchip/hdmi/rockchip-hdmi-lcdc.c
index a636e7578a953f791c189bd721281069824dde71..63246f5bae797fb88af9a54b408a8307dbe72dbd 100644 (file)
--- a/drivers/video/rockchip/hdmi/rockchip-hdmi-lcdc.c
+++ b/drivers/video/rockchip/hdmi/rockchip-hdmi-lcdc.c
@@ -816,12 +816,13 @@ static const struct hdmi_video_timing hdmi_mode[] = {
                .interface = OUT_P888,
        },
        {
+               /* AUO 3.81 */
                .mode = {
-                       .name = "2160x1200@90Hz",
-                       .refresh = 90,
+                       .name = "2160x1200@75Hz",
+                       .refresh = 75,
                        .xres = 2160,
                        .yres = 1200,
-                       .pixclock = 297000000,
+                       .pixclock = 245000000,
                        .left_margin = 100,
                        .right_margin = 420,
                        .upper_margin = 3,
@@ -838,12 +839,13 @@ static const struct hdmi_video_timing hdmi_mode[] = {
                .interface = OUT_P888,
        },
        {
+               /* sharp 2.89 */
                .mode = {
-                       .name = "2880x1440@90Hz",
-                       .refresh = 90,
+                       .name = "2880x1440@75Hz",
+                       .refresh = 75,
                        .xres = 2880,
                        .yres = 1440,
-                       .pixclock = 403000000,
+                       .pixclock = 340000000,
                        .left_margin = 100,
                        .right_margin = 50,
                        .upper_margin = 8,
@@ -859,6 +861,29 @@ static const struct hdmi_video_timing hdmi_mode[] = {
                .pixelrepeat = 1,
                .interface = OUT_P888,
        },
+       {
+               /* RAYKEN 5.46 */
+               .mode = {
+                       .name = "1440x2560@60Hz",
+                       .refresh = 60,
+                       .xres = 1440,
+                       .yres = 2560,
+                       .pixclock = 269390000,
+                       .left_margin = 50,
+                       .right_margin = 200,
+                       .upper_margin = 20,
+                       .lower_margin = 20,
+                       .hsync_len = 20,
+                       .vsync_len = 10,
+                       .sync = 0,
+                       .vmode = 0,
+                       .flag = 0,
+               },
+               .vic = HDMI_VIDEO_DISCRETE_VR | 5,
+               .vic_2nd = 0,
+               .pixelrepeat = 1,
+               .interface = OUT_P888,
+       },
 };
 
 static int hdmi_set_info(struct rk_screen *screen, struct hdmi *hdmi)

diff --git a/drivers/video/rockchip/hdmi/rockchip-hdmiv2/rockchip_hdmiv2_hw.c b/drivers/video/rockchip/hdmi/rockchip-hdmiv2/rockchip_hdmiv2_hw.c
index 14a3a3067cd6edee12230bf30650dfa7022b13d4..860bdb76b5191831bbb444d5427c916823198e56 100644 (file)
--- a/drivers/video/rockchip/hdmi/rockchip-hdmiv2/rockchip_hdmiv2_hw.c
+++ b/drivers/video/rockchip/hdmi/rockchip-hdmiv2/rockchip_hdmiv2_hw.c
@@ -85,6 +85,8 @@ static const struct phy_mpll_config_tab PHY_MPLL_TABLE[] = {
                1,      2,      0,      1,      7,      0,      3},
        {297000000,     594000000,      0,      16,     3,      3,      1,
                1,      3,      1,      0,      0,      0,      3},
+       {340000000,     340000000,      0,      8,      0,      0,      0,
+               1,      0,      0,      0,      0,      0,      3},
        {403000000,     403000000,      0,      8,      0,      3,      1,
                1,      3,      3,      0,      0,      0,      3},
        {594000000,     297000000,      0,      8,      0,      0,      0,