From a43dd77b40184e6418cedf1f1c50dd018929e685 Mon Sep 17 00:00:00 2001 From: "shihong.zheng" Date: Sat, 26 May 2018 15:28:33 +0800 Subject: [PATCH] decoder: g12b bringup PD#165090 add g12b chips code for decoder Change-Id: I63b0d09b2cf411ff26045e9274d6f53266e9b8c1 Signed-off-by: shihong.zheng --- drivers/amlogic/media_modules/common/chips/chips.c | 3 ++- drivers/amlogic/media_modules/common/media_clock/clk/clkg12.c | 1 + .../media_modules/frame_provider/decoder/h264_multi/vmh264.c | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/amlogic/media_modules/common/chips/chips.c b/drivers/amlogic/media_modules/common/chips/chips.c index 5ca9094b8484..a9912f498602 100644 --- a/drivers/amlogic/media_modules/common/chips/chips.c +++ b/drivers/amlogic/media_modules/common/chips/chips.c @@ -70,7 +70,8 @@ static const struct type_name cpu_type_name[] = { {MESON_CPU_MAJOR_ID_GXM, "gxm"}, {MESON_CPU_MAJOR_ID_TXL, "txl"}, {MESON_CPU_MAJOR_ID_TXLX, "txlx"}, - {MESON_CPU_MAJOR_ID_TXLX, "g12a"}, + {MESON_CPU_MAJOR_ID_G12A, "g12a"}, + {MESON_CPU_MAJOR_ID_G12B, "g12b"}, {0, NULL}, }; diff --git a/drivers/amlogic/media_modules/common/media_clock/clk/clkg12.c b/drivers/amlogic/media_modules/common/media_clock/clk/clkg12.c index 08f7be2bca8d..d7111eb63eca 100644 --- a/drivers/amlogic/media_modules/common/media_clock/clk/clkg12.c +++ b/drivers/amlogic/media_modules/common/media_clock/clk/clkg12.c @@ -984,6 +984,7 @@ static int vdec_clock_get(enum vdec_type_e core) MESON_CPU_MAJOR_ID_TXL,\ MESON_CPU_MAJOR_ID_TXLX,\ MESON_CPU_MAJOR_ID_G12A,\ + MESON_CPU_MAJOR_ID_G12B,\ 0} #include "clk.h" diff --git a/drivers/amlogic/media_modules/frame_provider/decoder/h264_multi/vmh264.c b/drivers/amlogic/media_modules/frame_provider/decoder/h264_multi/vmh264.c index 56a055c2c0f5..819be2770bcf 100644 --- a/drivers/amlogic/media_modules/frame_provider/decoder/h264_multi/vmh264.c +++ b/drivers/amlogic/media_modules/frame_provider/decoder/h264_multi/vmh264.c @@ -6676,6 +6676,7 @@ static int ammvdec_h264_probe(struct platform_device *pdev) (get_cpu_type() >= MESON_CPU_MAJOR_ID_TXLX) && (get_cpu_type() != MESON_CPU_MAJOR_ID_GXLX) && (get_cpu_type() != MESON_CPU_MAJOR_ID_G12A) && + (get_cpu_type() != MESON_CPU_MAJOR_ID_G12B) && (pdata->sys_info->height * pdata->sys_info->width > 1920 * 1088)) hw->mmu_enable = 1;