diff options
author | Zhou Peng-B04994 <eagle.zhou@nxp.com> | 2017-06-21 16:02:30 +0800 |
---|---|---|
committer | Leonard Crestez <leonard.crestez@nxp.com> | 2018-08-24 12:41:33 +0300 |
commit | 8b9ad988b675f0bc6b1f2cb5ea564e7c3479222d (patch) | |
tree | d58ec87281119892f4d6aa7a3b8494bca3af54a8 /drivers/mxc/hantro | |
parent | b71501666eb9f0c9fb7aff6cea1d03bb44f951c9 (diff) |
MLK-15132-3 : Enable Hantro decoder on i.MX8MQ
Move hantrodec.h to uapi directory
Signed-off-by: Zhou Peng-B04994 <eagle.zhou@nxp.com>
Diffstat (limited to 'drivers/mxc/hantro')
-rwxr-xr-x | drivers/mxc/hantro/hantrodec.c | 2 | ||||
-rwxr-xr-x | drivers/mxc/hantro/hantrodec.h | 93 |
2 files changed, 1 insertions, 94 deletions
diff --git a/drivers/mxc/hantro/hantrodec.c b/drivers/mxc/hantro/hantrodec.c index 2b454b98d88b..8ffbce56c270 100755 --- a/drivers/mxc/hantro/hantrodec.c +++ b/drivers/mxc/hantro/hantrodec.c @@ -21,7 +21,7 @@ * *****************************************************************************/ -#include "hantrodec.h" +#include <linux/hantrodec.h> #include "dwl_defs.h" #include <asm/io.h> diff --git a/drivers/mxc/hantro/hantrodec.h b/drivers/mxc/hantro/hantrodec.h deleted file mode 100755 index fdb55a00aba7..000000000000 --- a/drivers/mxc/hantro/hantrodec.h +++ /dev/null @@ -1,93 +0,0 @@ -/***************************************************************************** -* -* The GPL License (GPL) -* -* Copyright (c) 2015-2017, VeriSilicon Inc. -* Copyright (c) 2011-2014, Google Inc. -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License -* as published by the Free Software Foundation; either version 2 -* of the License, or (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software Foundation, -* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -* -*****************************************************************************/ - -#ifndef _HANTRODEC_H_ -#define _HANTRODEC_H_ -#include <linux/ioctl.h> -#include <linux/types.h> - -#undef PDEBUG -#ifdef HANTRODEC_DEBUG -# ifdef __KERNEL__ -# define PDEBUG(fmt, args...) printk( KERN_INFO "hantrodec: " fmt, ## args) -# else -# define PDEBUG(fmt, args...) fprintf(stderr, fmt, ## args) -# endif -#else -# define PDEBUG(fmt, args...) -#endif - -struct core_desc { - __u32 id; /* id of the Core */ - __u32 *regs; /* pointer to user registers */ - __u32 size; /* size of register space */ -}; - -/* Use 'k' as magic number */ -#define HANTRODEC_IOC_MAGIC 'k' - -/* - * S means "Set" through a ptr, - * T means "Tell" directly with the argument value - * G means "Get": reply by setting through a pointer - * Q means "Query": response is on the return value - * X means "eXchange": G and S atomically - * H means "sHift": T and Q atomically - */ - -#define HANTRODEC_PP_INSTANCE _IO(HANTRODEC_IOC_MAGIC, 1) -#define HANTRODEC_HW_PERFORMANCE _IO(HANTRODEC_IOC_MAGIC, 2) -#define HANTRODEC_IOCGHWOFFSET _IOR(HANTRODEC_IOC_MAGIC, 3, unsigned long *) -#define HANTRODEC_IOCGHWIOSIZE _IOR(HANTRODEC_IOC_MAGIC, 4, unsigned int *) - -#define HANTRODEC_IOC_CLI _IO(HANTRODEC_IOC_MAGIC, 5) -#define HANTRODEC_IOC_STI _IO(HANTRODEC_IOC_MAGIC, 6) -#define HANTRODEC_IOC_MC_OFFSETS _IOR(HANTRODEC_IOC_MAGIC, 7, unsigned long *) -#define HANTRODEC_IOC_MC_CORES _IOR(HANTRODEC_IOC_MAGIC, 8, unsigned int *) - - -#define HANTRODEC_IOCS_DEC_PUSH_REG _IOW(HANTRODEC_IOC_MAGIC, 9, struct core_desc *) -#define HANTRODEC_IOCS_PP_PUSH_REG _IOW(HANTRODEC_IOC_MAGIC, 10, struct core_desc *) - -#define HANTRODEC_IOCH_DEC_RESERVE _IO(HANTRODEC_IOC_MAGIC, 11) -#define HANTRODEC_IOCT_DEC_RELEASE _IO(HANTRODEC_IOC_MAGIC, 12) -#define HANTRODEC_IOCQ_PP_RESERVE _IO(HANTRODEC_IOC_MAGIC, 13) -#define HANTRODEC_IOCT_PP_RELEASE _IO(HANTRODEC_IOC_MAGIC, 14) - -#define HANTRODEC_IOCX_DEC_WAIT _IOWR(HANTRODEC_IOC_MAGIC, 15, struct core_desc *) -#define HANTRODEC_IOCX_PP_WAIT _IOWR(HANTRODEC_IOC_MAGIC, 16, struct core_desc *) - -#define HANTRODEC_IOCS_DEC_PULL_REG _IOWR(HANTRODEC_IOC_MAGIC, 17, struct core_desc *) -#define HANTRODEC_IOCS_PP_PULL_REG _IOWR(HANTRODEC_IOC_MAGIC, 18, struct core_desc *) - -#define HANTRODEC_IOCG_CORE_WAIT _IOR(HANTRODEC_IOC_MAGIC, 19, int *) - -#define HANTRODEC_IOX_ASIC_ID _IOWR(HANTRODEC_IOC_MAGIC, 20, __u32 *) - -#define HANTRODEC_IOCG_CORE_ID _IOR(HANTRODEC_IOC_MAGIC, 21, int *) - -#define HANTRODEC_DEBUG_STATUS _IO(HANTRODEC_IOC_MAGIC, 29) - -#define HANTRODEC_IOC_MAXNR 29 - -#endif /* !_HANTRODEC_H_ */ |