summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 09b1fd8)
raw | patch | inline | side by side (parent: 09b1fd8)
author | Mriganka Chakravarty <m-chakravarty@ti.com> | |
Mon, 4 Jul 2022 08:19:44 +0000 (13:49 +0530) | ||
committer | Mriganka Chakravarty <m-chakravarty@ti.com> | |
Tue, 5 Jul 2022 04:00:52 +0000 (09:30 +0530) |
- Added SOC_J721S2 flags for m2m specific codes.
Signed-off-by: Mriganka Chakravarty <m-chakravarty@ti.com>
Signed-off-by: Mriganka Chakravarty <m-chakravarty@ti.com>
index 4e55860b96c51afa822cfe74b25d2447680ffa0d..07ae2e9854ab3d4ada1274b22c5ff5549ca74290 100755 (executable)
/*
- * Copyright (c) Texas Instruments Incorporated 2018
+ * Copyright (c) Texas Instruments Incorporated 2018 - 2022
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
#include <ti/drv/dss/soc/dss_soc.h>
#include <ti/drv/dss/include/dss_disp.h>
#include <ti/drv/dss/include/dss_dctrl.h>
-#if defined (SOC_J721E)
+#if defined (SOC_J721E) || defined (SOC_J721S2)
#include <ti/drv/dss/include/dss_m2m.h>
#endif
/** \brief Display controller driver ID used at the time of FVID2 create. */
#define DSS_DCTRL_DRV_ID (FVID2_DSS_DRV_BASE + 0x01U)
-#if defined (SOC_J721E)
+#if defined (SOC_J721E) || defined (SOC_J721S2)
/** \brief Display M2M driver ID used at the time of FVID2 create. */
#define DSS_M2M_DRV_ID (FVID2_DSS_DRV_BASE + 0x02U)
#endif
/** \brief IOCTL base address for the SOC specific display controller driver
* IOCTLs. */
#define DSS_DCTRL_SOC_IOCTL_BASE (DSS_DCTRL_IOCTL_BASE + 0x40U)
-#if defined (SOC_J721E)
+#if defined (SOC_J721E) || defined (SOC_J721S2)
/** \brief IOCTL base address for the Display M2M Driver IOCTLs. */
#define DSS_M2M_IOCTL_BASE (FVID2_DSS_DRV_IOCTL_BASE + 0x200U)
#endif
index f96a5bd139c983768d0dc158f573b04dd0228d05..fcc7bda776b7ce393dca28f9e92d0f0d07dda321 100755 (executable)
drvdss_j721e_CORELIST = mcu2_0
drvdss_j721s2_CORELIST = mcu2_0
drvdss_j784s4_CORELIST = mcu2_0
-drvdssm2m_SOCLIST = j721e
-drvdssm2m_BOARDLIST = j721e_evm
+drvdssm2m_SOCLIST = j721e j721s2
+drvdssm2m_BOARDLIST = j721e_evm j721s2_evm
drvdssm2m_j721e_CORELIST = mcu2_0
+drvdssm2m_j721s2_CORELIST = mcu2_0
drvdss_RTOS_LIST = $(DEFAULT_RTOS_LIST)
define DRV_DSS_RTOS_BOARDLIST_RULE
diff --git a/packages/ti/drv/dss/src/drv/common/dss_init.c b/packages/ti/drv/dss/src/drv/common/dss_init.c
index 32f6576bdca9bf39edb6e543bdf02f8eee59f8da..5bdc8698bc01f3954faac4da8908742b35fab0b3 100755 (executable)
#include <ti/drv/dss/src/drv/common/dss_evtMgr.h>
#include <ti/drv/dss/src/drv/dctrl/dss_dctrlDrv.h>
#include <ti/drv/dss/src/drv/disp/dss_dispDrv.h>
-#if defined (SOC_J721E)
+#if defined (SOC_J721E) || defined (SOC_J721S2)
#include <ti/drv/dss/src/drv/m2m/dss_m2mDrv.h>
#endif
}
retVal += Dss_dispDrvInit(numInst, dispInitParams);
}
-#if defined (SOC_J721E)
+#if defined (SOC_J721E) || defined (SOC_J721S2)
if(FVID2_SOK == retVal)
{
/* Initialize display M2M driver */
{
int32_t retVal = FVID2_SOK;
-#if defined (SOC_J721E)
+#if defined (SOC_J721E) || defined (SOC_J721S2)
retVal += Dss_m2mDrvDeInit();
#endif
retVal += Dss_dispDrvDeInit();
diff --git a/packages/ti/drv/dss/src/drv/m2m/dss_m2mDisp.c b/packages/ti/drv/dss/src/drv/m2m/dss_m2mDisp.c
index 12c40130286f6d785d4f94648bc3ca125880378f..1432e7d68f1e55003462d949eb867d178f27a094 100755 (executable)
CSL_dssVidPipeSetAlphaConfig(instObj->pipeRegs[context->pipeId[pipeIdx]],
(const CSL_DssVidPipeAlphaCfg *)(&instCfg->cfgParams.alphaCfg));
-#if defined (SOC_J721E)
+#if defined (SOC_J721E) || defined (SOC_J721S2)
CSL_dssVidPipeSetCropConfig(instObj->pipeRegs[context->pipeId[pipeIdx]],
(const Fvid2_EdgeCropConfig *)(&instCfg->cfgParams.cropParams.cropCfg),
instCfg->cfgParams.cropParams.cropEnable);
diff --git a/packages/ti/drv/dss/src/drv/src_files_drv.mk b/packages/ti/drv/dss/src/drv/src_files_drv.mk
index 5844dcd51806fa0e7fde67a2448413a806ae4671..4b5126787f0e8cae9655906dc80d09ed5a2b4922 100755 (executable)
include src/drv/dctrl/src_files_dctrl.mk
include src/drv/disp/src_files_disp.mk
-ifeq ($(SOC),$(filter $(SOC), j721e))
+ifeq ($(SOC),$(filter $(SOC), j721e j721s2))
SRCDIR += src/drv/m2m
PACKAGE_SRCS_COMMON += src/drv/m2m
include src/drv/m2m/src_files_m2m.mk
index d264a9a69b7d44ad19b9b7accea562331d446cfa..cf673a6d0b5d557e87fbdac21a5a67552e263ad1 100755 (executable)
PACKAGE_SRCS_COMMON = soc/V2
CFLAGS_LOCAL_COMMON = -DREF_CLK_19_2MHz -DHAVE_CMN_PLL1
endif
+ifeq ($(SOC),$(filter $(SOC), j721s2))
+ PACKAGE_SRCS_COMMON += include/dss_m2m.h
+endif
# List all the external components/interfaces, whose interface header files
# need to be included for this component