From 875f071dec285baf9d23b60414288d82e1686b75 Mon Sep 17 00:00:00 2001 From: Luan Yuan Date: Sat, 20 Jul 2019 16:59:52 +0800 Subject: [PATCH] Revert "mcdi: keep g12a/g12b/sm1 reg_mcdi_qmeen same as gxlx2 [1/2]" PD#SWPL-11558 This reverts commit ac2f0e913430748686b8f71dada72db40bc6dc4d. Change-Id: I5220862541a20a3526b2d4f9258c52316bdbaf65 --- drivers/amlogic/media/deinterlace/deinterlace_hw.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/drivers/amlogic/media/deinterlace/deinterlace_hw.c b/drivers/amlogic/media/deinterlace/deinterlace_hw.c index f6e0c09ea757..906dbb241ba2 100644 --- a/drivers/amlogic/media/deinterlace/deinterlace_hw.c +++ b/drivers/amlogic/media/deinterlace/deinterlace_hw.c @@ -1356,11 +1356,7 @@ void enable_mc_di_pre_g12(struct DI_MC_MIF_s *mcinford_mif, RDMA_WR_BITS(MCDI_MOTINEN, (mcdi_en?3:0), 0, 2); - if (is_meson_g12a_cpu() || is_meson_g12b_cpu() || - is_meson_sm1_cpu()) - RDMA_WR(MCDI_CTRL_MODE, (mcdi_en ? 0x1bfef7ff : 0)); - else - RDMA_WR(MCDI_CTRL_MODE, (mcdi_en ? 0x1bfff7ff : 0)); + RDMA_WR(MCDI_CTRL_MODE, (mcdi_en ? 0x1bfff7ff : 0)); RDMA_WR_BITS(DI_PRE_CTRL, (mcdi_en?3:0), 16, 2); RDMA_WR_BITS(MCINFRD_SCOPE_X, mcinford_mif->size_x, 16, 13);