From 28954be0a91c3785a096db738807645a799fe46a Mon Sep 17 00:00:00 2001 From: Nanxin Qin Date: Wed, 28 Feb 2018 21:15:01 +0800 Subject: [PATCH] media: drop g12a register defintion change PD#156734: media: drop g12a register defintion change Change-Id: Ieadb57750228755a18357567028fa5ef642dc397 Signed-off-by: Nanxin Qin Signed-off-by: Yixun Lan --- include/linux/amlogic/media/registers/regs/hevc_regs.h | 6 ------ 1 file changed, 6 deletions(-) diff --git a/include/linux/amlogic/media/registers/regs/hevc_regs.h b/include/linux/amlogic/media/registers/regs/hevc_regs.h index 1ff7d54c06fa..6b6eb989419e 100644 --- a/include/linux/amlogic/media/registers/regs/hevc_regs.h +++ b/include/linux/amlogic/media/registers/regs/hevc_regs.h @@ -304,14 +304,8 @@ #define HEVC_DBLK_CFG9 0x3509 #define HEVC_DBLK_CFGA 0x350a #define HEVC_DBLK_CFGE 0x350e -#if 1 -/* G12A changed */ -#define HEVC_DBLK_STS0 0x350f -#define HEVC_DBLK_STS1 0x3510 -#else #define HEVC_DBLK_STS0 0x350b #define HEVC_DBLK_STS1 0x350c -#endif #define HEVC_SAO_VERSION 0x3600 #define HEVC_SAO_CTRL0 0x3601 #define HEVC_SAO_CTRL1 0x3602