From f5b15e8f365aff6c81c022a48e0a7c0fb2bf8f7a Mon Sep 17 00:00:00 2001 From: Kevin Kim Date: Thu, 16 May 2019 17:12:26 +0900 Subject: [PATCH] ODROID:Merge BSP 2019.04 (fix build err-hdmitx) Change-Id: I119ba16c916f751483670dc879558f527f9f271e --- drivers/amlogic/media/vout/hdmitx/hdmi_tx_20/hdmi_tx_main.c | 3 +-- drivers/amlogic/media/vout/hdmitx/hdmi_tx_20/hw/hw_g12a.c | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/amlogic/media/vout/hdmitx/hdmi_tx_20/hdmi_tx_main.c b/drivers/amlogic/media/vout/hdmitx/hdmi_tx_20/hdmi_tx_main.c index 49307d9c4220..7d5dd1fbbf7a 100644 --- a/drivers/amlogic/media/vout/hdmitx/hdmi_tx_20/hdmi_tx_main.c +++ b/drivers/amlogic/media/vout/hdmitx/hdmi_tx_20/hdmi_tx_main.c @@ -554,11 +554,10 @@ static int set_disp_mode_auto(void) hdev->HWOp.CntlConfig(hdev, CONF_HDMI_DVI_MODE, DVI_MODE); pr_info(SYS "change to DVI mode\n"); - } else if (hdev->RXCap.IEEEOUI == 0) { + } else if (hdev->RXCap.ieeeoui == 0) { #else if (hdev->RXCap.ieeeoui == 0) { #endif - if (hdev->RXCap.ieeeoui == 0) { /* DVI case judgement. In uboot, directly output HDMI * mode */ diff --git a/drivers/amlogic/media/vout/hdmitx/hdmi_tx_20/hw/hw_g12a.c b/drivers/amlogic/media/vout/hdmitx/hdmi_tx_20/hw/hw_g12a.c index 9bd4e86af390..3f0e4df5d9e5 100644 --- a/drivers/amlogic/media/vout/hdmitx/hdmi_tx_20/hw/hw_g12a.c +++ b/drivers/amlogic/media/vout/hdmitx/hdmi_tx_20/hw/hw_g12a.c @@ -194,6 +194,7 @@ static void set_hpll_hclk_dongle_5940m(void) void set_g12a_hpll_clk_out(unsigned int frac_rate, unsigned int clk) { + unsigned int m, m1, m2; struct hdmitx_dev *hdev = get_hdmitx_device(); switch (clk) {