From cf76d1eb9346d6b8640f02fa99c7ebd6bb3ea00e Mon Sep 17 00:00:00 2001 From: Zongdong Jiao Date: Sat, 29 Sep 2018 18:16:08 +0800 Subject: [PATCH] hdmitx: enable repeater_tx in r321/atom dts [2/3] PD#SWPL-1303 Problem: For TXLX/T962E/R321 cases, there are both HDMI TX and RX. Should consider it as repeater. Solution: Enable repeater_tx in r321/atom dts Also, add a missing ksv_lists[] clear. Verify: r321/atom Change-Id: I7b512c34123481380220f9262466fde56b0ae6e3 Signed-off-by: Zongdong Jiao --- arch/arm/boot/dts/amlogic/txlx_t962e_r321.dts | 2 +- arch/arm64/boot/dts/amlogic/txlx_t962e_r321.dts | 2 +- drivers/amlogic/media/vout/hdmitx/hdmi_tx_20/hw/hdmi_tx_hw.c | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/amlogic/txlx_t962e_r321.dts b/arch/arm/boot/dts/amlogic/txlx_t962e_r321.dts index 8982e23c532e..fecc7640ae8a 100644 --- a/arch/arm/boot/dts/amlogic/txlx_t962e_r321.dts +++ b/arch/arm/boot/dts/amlogic/txlx_t962e_r321.dts @@ -967,7 +967,7 @@ */ ic_type = <6>; //gpio_i2c_en = <0>; - //repeater_tx = <0x1>; + repeater_tx = <0x1>; //#address-cells = <2>; //#size-cells = <2>; //ranges; diff --git a/arch/arm64/boot/dts/amlogic/txlx_t962e_r321.dts b/arch/arm64/boot/dts/amlogic/txlx_t962e_r321.dts index ae680b1c3acf..68b2bcdb7850 100644 --- a/arch/arm64/boot/dts/amlogic/txlx_t962e_r321.dts +++ b/arch/arm64/boot/dts/amlogic/txlx_t962e_r321.dts @@ -966,7 +966,7 @@ */ ic_type = <6>; //gpio_i2c_en = <0>; - //repeater_tx = <0x1>; + repeater_tx = <0x1>; //#address-cells = <2>; //#size-cells = <2>; //ranges; diff --git a/drivers/amlogic/media/vout/hdmitx/hdmi_tx_20/hw/hdmi_tx_hw.c b/drivers/amlogic/media/vout/hdmitx/hdmi_tx_20/hw/hdmi_tx_hw.c index f87a34065d64..121434207d99 100644 --- a/drivers/amlogic/media/vout/hdmitx/hdmi_tx_20/hw/hdmi_tx_hw.c +++ b/drivers/amlogic/media/vout/hdmitx/hdmi_tx_20/hw/hdmi_tx_hw.c @@ -4816,6 +4816,7 @@ static int hdmitx_cntl_ddc(struct hdmitx_dev *hdev, unsigned int cmd, hdev->hdcp_max_exceed_state = 0; hdev->hdcp_max_exceed_cnt = 0; ksv_sha_matched = 0; + memset(&tmp_ksv_lists, 0, sizeof(tmp_ksv_lists)); del_timer(&hdev->hdcp_timer); if (hdev->topo_info) memset(hdev->topo_info, 0, sizeof(*hdev->topo_info));