summaryrefslogtreecommitdiff
authorapollo.ling <apollo.ling@amlogic.com>2020-05-08 12:37:53 (GMT)
committer Hui Zhang <hui.zhang@amlogic.com>2020-05-18 01:57:35 (GMT)
commit417f149965755602fb178469b0f32a569c1c13fb (patch)
tree52b28e61fe49b5b18832004a5678a445c654864d
parent2ceb44a06c10f3a7569a418f36eb72d203e57318 (diff)
downloadmedia_modules-417f149965755602fb178469b0f32a569c1c13fb.zip
media_modules-417f149965755602fb178469b0f32a569c1c13fb.tar.gz
media_modules-417f149965755602fb178469b0f32a569c1c13fb.tar.bz2
vdec: Kernel 4.9: codec common/mm for GXLX (S905C) bring up [1/2]
PD#SWPL-24837 Problem: Kernel 4.9: codec common/mm for GXLX (S905C) bring up Solution: Kernel 4.9: codec common/mm for GXLX (S905C) bring up Verify: p271 Change-Id: I4c8e6a18b27d7f7e967c5703b575989ee646eb6c Signed-off-by: apollo.ling <apollo.ling@amlogic.com>
Diffstat
-rw-r--r--drivers/common/chips/chips.c1
-rw-r--r--drivers/common/media_clock/clk/clkg12.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/drivers/common/chips/chips.c b/drivers/common/chips/chips.c
index a55d640..9cabb1d 100644
--- a/drivers/common/chips/chips.c
+++ b/drivers/common/chips/chips.c
@@ -71,6 +71,7 @@ static const struct type_name cpu_type_name[] = {
{AM_MESON_CPU_MAJOR_ID_GXM, "gxm"},
{AM_MESON_CPU_MAJOR_ID_TXL, "txl"},
{AM_MESON_CPU_MAJOR_ID_TXLX, "txlx"},
+ {AM_MESON_CPU_MAJOR_ID_GXLX, "gxlx"},
{AM_MESON_CPU_MAJOR_ID_G12A, "g12a"},
{AM_MESON_CPU_MAJOR_ID_G12B, "g12b"},
{AM_MESON_CPU_MAJOR_ID_SM1, "sm1"},
diff --git a/drivers/common/media_clock/clk/clkg12.c b/drivers/common/media_clock/clk/clkg12.c
index 9694959..22d71a6 100644
--- a/drivers/common/media_clock/clk/clkg12.c
+++ b/drivers/common/media_clock/clk/clkg12.c
@@ -1016,6 +1016,7 @@ static int vdec_clock_get(enum vdec_type_e core)
AM_MESON_CPU_MAJOR_ID_GXM,\
AM_MESON_CPU_MAJOR_ID_TXL,\
AM_MESON_CPU_MAJOR_ID_TXLX,\
+ AM_MESON_CPU_MAJOR_ID_GXLX,\
AM_MESON_CPU_MAJOR_ID_G12A,\
AM_MESON_CPU_MAJOR_ID_G12B,\
AM_MESON_CPU_MAJOR_ID_SM1,\