From 611171e3fcbe7639b2de6940a3a7800366f565cc Mon Sep 17 00:00:00 2001 From: yicheng shen Date: Mon, 29 Apr 2019 05:15:01 -0400 Subject: [PATCH] hdmirx: enable hdcp2.2 for tm2 [1/2] PD#SWPL-7865 Problem: TM2 hdcp2.2 can not work,esm bootup fail Solution: Enable Enable axi_clk. Verify: TM2 Change-Id: I44af6f2b5bfbe72cfdb93e1b42c47cda9c56d3a2 Signed-off-by: yicheng shen --- drivers/amlogic/media/vin/tvin/hdmirx/hdmi_rx_drv.h | 2 +- drivers/amlogic/media/vin/tvin/hdmirx/hdmi_rx_hw.c | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/drivers/amlogic/media/vin/tvin/hdmirx/hdmi_rx_drv.h b/drivers/amlogic/media/vin/tvin/hdmirx/hdmi_rx_drv.h index 96b90c7004f6..d924077c3b7a 100644 --- a/drivers/amlogic/media/vin/tvin/hdmirx/hdmi_rx_drv.h +++ b/drivers/amlogic/media/vin/tvin/hdmirx/hdmi_rx_drv.h @@ -41,7 +41,7 @@ * * */ -#define RX_VER1 "ver.2019/04/22" +#define RX_VER1 "ver.2019/04/29" /* * * diff --git a/drivers/amlogic/media/vin/tvin/hdmirx/hdmi_rx_hw.c b/drivers/amlogic/media/vin/tvin/hdmirx/hdmi_rx_hw.c index 9e9aff755eeb..082b31d0dd00 100644 --- a/drivers/amlogic/media/vin/tvin/hdmirx/hdmi_rx_hw.c +++ b/drivers/amlogic/media/vin/tvin/hdmirx/hdmi_rx_hw.c @@ -1733,6 +1733,13 @@ void hdcp22_clk_en(bool en) else /* TL1:esm related clk bit3-5 */ hdmirx_wr_bits_top(TOP_CLK_CNTL, MSK(3, 3), 0x7); + + if (rx.chip_id >= CHIP_ID_TM2) + /* Enable axi_clk,for tm2 */ + /* AXI arbiter is moved outside of hdmitx. */ + /* There is an AXI arbiter in the chip’s EE domain */ + /* for arbitrating AXI requests from HDMI TX and RX.*/ + hdmirx_wr_bits_top(TOP_CLK_CNTL, MSK(1, 12), 0x1); } else { hdmirx_wr_bits_top(TOP_CLK_CNTL, MSK(3, 3), 0x0); wr_reg_hhi(HHI_HDCP22_CLK_CNTL, 0);