From 6bc17f7c933d30d52a75fe4d66f36a75b94e3147 Mon Sep 17 00:00:00 2001 From: ckkim Date: Mon, 28 Feb 2022 14:30:30 +0900 Subject: [PATCH] ODROID-COMMON:HDMI HPLL clk accuracy Improvements (1680x1050p60hz) Signed-off-by: ckkim Change-Id: I4ecfdebca4bbcf31b71c37eb9e10c029c86470d9 --- .../media/vout/hdmitx/hdmi_common/hdmi_parameters.c | 10 +++++----- .../amlogic/media/vout/hdmitx/hdmi_tx_20/hw/hw_clk.c | 4 ++++ 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/drivers/amlogic/media/vout/hdmitx/hdmi_common/hdmi_parameters.c b/drivers/amlogic/media/vout/hdmitx/hdmi_common/hdmi_parameters.c index 7fa11e44d8ff..397ee351630e 100644 --- a/drivers/amlogic/media/vout/hdmitx/hdmi_common/hdmi_parameters.c +++ b/drivers/amlogic/media/vout/hdmitx/hdmi_common/hdmi_parameters.c @@ -2698,11 +2698,11 @@ static struct hdmi_format_para fmt_para_vesa_1680x1050p60_8x5 = { .progress_mode = 1, .scrambler_en = 0, .tmds_clk_div40 = 0, - .tmds_clk = 146250, + .tmds_clk = 146496, .timing = { - .pixel_freq = 146250, - .h_freq = 65340, - .v_freq = 59954, + .pixel_freq = 146496, + .h_freq = 65400, + .v_freq = 60000, .vsync = 60, .vsync_polarity = 1, .hsync_polarity = 1, @@ -2730,7 +2730,7 @@ static struct hdmi_format_para fmt_para_vesa_1680x1050p60_8x5 = { .aspect_ratio_den = 5, .sync_duration_num = 60, .sync_duration_den = 1, - .video_clk = 146250000, + .video_clk = 146496000, .htotal = 2240, .vtotal = 1089, .fr_adj_type = VOUT_FR_ADJ_HDMI, diff --git a/drivers/amlogic/media/vout/hdmitx/hdmi_tx_20/hw/hw_clk.c b/drivers/amlogic/media/vout/hdmitx/hdmi_tx_20/hw/hw_clk.c index 6b3fa67e8a2c..0c43861b9a74 100644 --- a/drivers/amlogic/media/vout/hdmitx/hdmi_tx_20/hw/hw_clk.c +++ b/drivers/amlogic/media/vout/hdmitx/hdmi_tx_20/hw/hw_clk.c @@ -933,7 +933,11 @@ static struct hw_enc_clk_val_group setting_enc_clk_val_24[] = { 4897000, 2, 1, 1, VID_PLL_DIV_5, 2, 1, 1, -1}, {{HDMIV_1680x1050p60hz, HDMI_VIC_END}, +#if defined(CONFIG_ARCH_MESON64_ODROID_COMMON) + 2929920, 2, 1, 1, VID_PLL_DIV_5, 2, 1, 1, -1}, +#else 5850000, 4, 1, 1, VID_PLL_DIV_5, 2, 1, 1, -1}, +#endif {{HDMIV_1920x1200p60hz, HDMI_VIC_END}, #if defined(CONFIG_ARCH_MESON64_ODROID_COMMON)