hdmirx: revert commit 86761 [1/1]

PD#SWPL-14763

Problem:
rx cannot work after suspend

Solution:
rx22 memory issue. revert related commit.

Verify:
TL1

Change-Id: Ia3a092e2fc602470e4ffc54f0d3b25ae0221f69f
Signed-off-by: Lei Yang <lei.yang@amlogic.com>

diff --git a/drivers/amlogic/media/vin/tvin/hdmirx/hdcp_rx_main.c b/drivers/amlogic/media/vin/tvin/hdmirx/hdcp_rx_main.c
index 1a0a3c4..832a59e 100644 (file)
--- a/drivers/amlogic/media/vin/tvin/hdmirx/hdcp_rx_main.c
+++ b/drivers/amlogic/media/vin/tvin/hdmirx/hdcp_rx_main.c
@@ -325,8 +325,7 @@ static long init(struct file *f, void __user *arg)
                rc = alloc_dma_areas(esm, &info);
                if (rc < 0)
                        goto err_free;
-               info.hpi_base =
-               reg_maps[MAP_ADDR_MODULE_HDMIRX_CAPB3].phy_addr;
+
                hpi_mem = request_mem_region(info.hpi_base, 128, "esm-hpi");
                if (!hpi_mem) {
                        rc = -EADDRNOTAVAIL;

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 e6a5d60..f492c77 100644 (file)
--- a/drivers/amlogic/media/vin/tvin/hdmirx/hdmi_rx_drv.h
+++ b/drivers/amlogic/media/vin/tvin/hdmirx/hdmi_rx_drv.h
@@ -47,7 +47,7 @@
  *
  *
  */
-#define RX_VER2 "ver.2019/09/25"
+#define RX_VER2 "ver.2019/09/11"
 
 /*print type*/
 #define        LOG_EN          0x01