From 28641dc3b5c7c14f6d8cb8338f01070d2c183bf3 Mon Sep 17 00:00:00 2001 From: Jeffy Chen Date: Wed, 1 Jun 2016 16:43:23 +0800 Subject: [PATCH] CHROMIUM: [media] rockchip-vpu: rename rk3288-vpu sources to rockchip-vpu Change-Id: I66ba2cde8984e56ffa3a27515e4e6380af8544d8 Signed-off-by: Jeffy Chen Signed-off-by: Yakir Yang --- drivers/media/platform/rockchip-vpu/Makefile | 8 ++++---- .../platform/rockchip-vpu/rk3288_vpu_hw_h264d.c | 4 ++-- .../media/platform/rockchip-vpu/rk3288_vpu_hw_vp8d.c | 4 ++-- .../media/platform/rockchip-vpu/rk3288_vpu_hw_vp8e.c | 4 ++-- .../rockchip-vpu/{rk3288_vpu.c => rockchip_vpu.c} | 12 ++++++------ .../{rk3288_vpu_common.h => rockchip_vpu_common.h} | 10 +++++----- .../{rk3288_vpu_dec.c => rockchip_vpu_dec.c} | 8 ++++---- .../{rk3288_vpu_dec.h => rockchip_vpu_dec.h} | 8 ++++---- .../{rk3288_vpu_enc.c => rockchip_vpu_enc.c} | 8 ++++---- .../{rk3288_vpu_enc.h => rockchip_vpu_enc.h} | 8 ++++---- .../{rk3288_vpu_hw.c => rockchip_vpu_hw.c} | 4 ++-- .../{rk3288_vpu_hw.h => rockchip_vpu_hw.h} | 8 ++++---- 12 files changed, 43 insertions(+), 43 deletions(-) rename drivers/media/platform/rockchip-vpu/{rk3288_vpu.c => rockchip_vpu.c} (98%) rename drivers/media/platform/rockchip-vpu/{rk3288_vpu_common.h => rockchip_vpu_common.h} (99%) rename drivers/media/platform/rockchip-vpu/{rk3288_vpu_dec.c => rockchip_vpu_dec.c} (99%) rename drivers/media/platform/rockchip-vpu/{rk3288_vpu_dec.h => rockchip_vpu_dec.h} (89%) rename drivers/media/platform/rockchip-vpu/{rk3288_vpu_enc.c => rockchip_vpu_enc.c} (99%) rename drivers/media/platform/rockchip-vpu/{rk3288_vpu_enc.h => rockchip_vpu_enc.h} (90%) rename drivers/media/platform/rockchip-vpu/{rk3288_vpu_hw.c => rockchip_vpu_hw.c} (99%) rename drivers/media/platform/rockchip-vpu/{rk3288_vpu_hw.h => rockchip_vpu_hw.h} (97%) diff --git a/drivers/media/platform/rockchip-vpu/Makefile b/drivers/media/platform/rockchip-vpu/Makefile index 7fb2433f9f58..5f7eb7433444 100644 --- a/drivers/media/platform/rockchip-vpu/Makefile +++ b/drivers/media/platform/rockchip-vpu/Makefile @@ -1,10 +1,10 @@ obj-$(CONFIG_VIDEO_ROCKCHIP_VPU) += rockchip-vpu.o -rockchip-vpu-y += rk3288_vpu.o \ - rk3288_vpu_dec.o \ - rk3288_vpu_enc.o \ - rk3288_vpu_hw.o \ +rockchip-vpu-y += rockchip_vpu.o \ + rockchip_vpu_dec.o \ + rockchip_vpu_enc.o \ + rockchip_vpu_hw.o \ rk3288_vpu_hw_h264d.o \ rk3288_vpu_hw_vp8d.o \ rk3288_vpu_hw_vp8e.o diff --git a/drivers/media/platform/rockchip-vpu/rk3288_vpu_hw_h264d.c b/drivers/media/platform/rockchip-vpu/rk3288_vpu_hw_h264d.c index 3569d9219f8c..3b4ef9504163 100644 --- a/drivers/media/platform/rockchip-vpu/rk3288_vpu_hw_h264d.c +++ b/drivers/media/platform/rockchip-vpu/rk3288_vpu_hw_h264d.c @@ -18,12 +18,12 @@ * GNU General Public License for more details. */ -#include "rk3288_vpu_common.h" +#include "rockchip_vpu_common.h" #include #include -#include "rk3288_vpu_hw.h" +#include "rockchip_vpu_hw.h" #include "rk3288_vpu_regs.h" /* Max. number of DPB pictures supported by hardware. */ diff --git a/drivers/media/platform/rockchip-vpu/rk3288_vpu_hw_vp8d.c b/drivers/media/platform/rockchip-vpu/rk3288_vpu_hw_vp8d.c index bcb3cadf1861..91cbd86091f1 100644 --- a/drivers/media/platform/rockchip-vpu/rk3288_vpu_hw_vp8d.c +++ b/drivers/media/platform/rockchip-vpu/rk3288_vpu_hw_vp8d.c @@ -17,9 +17,9 @@ * GNU General Public License for more details. */ -#include "rk3288_vpu_hw.h" +#include "rockchip_vpu_hw.h" #include "rk3288_vpu_regs.h" -#include "rk3288_vpu_common.h" +#include "rockchip_vpu_common.h" #define DEC_8190_ALIGN_MASK 0x07U diff --git a/drivers/media/platform/rockchip-vpu/rk3288_vpu_hw_vp8e.c b/drivers/media/platform/rockchip-vpu/rk3288_vpu_hw_vp8e.c index 5ba84204fed3..4a1271fa0526 100644 --- a/drivers/media/platform/rockchip-vpu/rk3288_vpu_hw_vp8e.c +++ b/drivers/media/platform/rockchip-vpu/rk3288_vpu_hw_vp8e.c @@ -18,13 +18,13 @@ * GNU General Public License for more details. */ -#include "rk3288_vpu_common.h" +#include "rockchip_vpu_common.h" #include #include #include "rk3288_vpu_regs.h" -#include "rk3288_vpu_hw.h" +#include "rockchip_vpu_hw.h" /* Various parameters specific to VP8 encoder. */ #define VP8_CABAC_CTX_OFFSET 192 diff --git a/drivers/media/platform/rockchip-vpu/rk3288_vpu.c b/drivers/media/platform/rockchip-vpu/rockchip_vpu.c similarity index 98% rename from drivers/media/platform/rockchip-vpu/rk3288_vpu.c rename to drivers/media/platform/rockchip-vpu/rockchip_vpu.c index 5a4520c46a73..6c67d638cdad 100644 --- a/drivers/media/platform/rockchip-vpu/rk3288_vpu.c +++ b/drivers/media/platform/rockchip-vpu/rockchip_vpu.c @@ -1,5 +1,5 @@ /* - * Rockchip RK3288 VPU codec driver + * Rockchip VPU codec driver * * Copyright (C) 2014 Google, Inc. * Tomasz Figa @@ -18,7 +18,7 @@ * GNU General Public License for more details. */ -#include "rk3288_vpu_common.h" +#include "rockchip_vpu_common.h" #include #include @@ -31,9 +31,9 @@ #include #include -#include "rk3288_vpu_dec.h" -#include "rk3288_vpu_enc.h" -#include "rk3288_vpu_hw.h" +#include "rockchip_vpu_dec.h" +#include "rockchip_vpu_enc.h" +#include "rockchip_vpu_hw.h" int debug; module_param(debug, int, S_IRUGO | S_IWUSR); @@ -821,4 +821,4 @@ module_platform_driver(rk3288_vpu_driver); MODULE_LICENSE("GPL v2"); MODULE_AUTHOR("Alpha Lin "); MODULE_AUTHOR("Tomasz Figa "); -MODULE_DESCRIPTION("Rockchip RK3288 VPU codec driver"); +MODULE_DESCRIPTION("Rockchip VPU codec driver"); diff --git a/drivers/media/platform/rockchip-vpu/rk3288_vpu_common.h b/drivers/media/platform/rockchip-vpu/rockchip_vpu_common.h similarity index 99% rename from drivers/media/platform/rockchip-vpu/rk3288_vpu_common.h rename to drivers/media/platform/rockchip-vpu/rockchip_vpu_common.h index 3ff5c69992b6..a7906efbe03f 100644 --- a/drivers/media/platform/rockchip-vpu/rk3288_vpu_common.h +++ b/drivers/media/platform/rockchip-vpu/rockchip_vpu_common.h @@ -1,5 +1,5 @@ /* - * Rockchip RK3288 VPU codec driver + * Rockchip VPU codec driver * * Copyright (C) 2014 Google, Inc. * Tomasz Figa @@ -18,8 +18,8 @@ * GNU General Public License for more details. */ -#ifndef RK3288_VPU_COMMON_H_ -#define RK3288_VPU_COMMON_H_ +#ifndef ROCKCHIP_VPU_COMMON_H_ +#define ROCKCHIP_VPU_COMMON_H_ /* Enable debugging by default for now. */ #define DEBUG @@ -34,7 +34,7 @@ #include #include -#include "rk3288_vpu_hw.h" +#include "rockchip_vpu_hw.h" #define RK3288_VPU_NAME "rk3288-vpu" #define RK3288_VPU_DEC_NAME "rk3288-vpu-dec" @@ -518,4 +518,4 @@ static inline u32 vdpu_read(struct rk3288_vpu_dev *vpu, u32 reg) return val; } -#endif /* RK3288_VPU_COMMON_H_ */ +#endif /* ROCKCHIP_VPU_COMMON_H_ */ diff --git a/drivers/media/platform/rockchip-vpu/rk3288_vpu_dec.c b/drivers/media/platform/rockchip-vpu/rockchip_vpu_dec.c similarity index 99% rename from drivers/media/platform/rockchip-vpu/rk3288_vpu_dec.c rename to drivers/media/platform/rockchip-vpu/rockchip_vpu_dec.c index 0652ae7a132f..31e4cabbf3b5 100644 --- a/drivers/media/platform/rockchip-vpu/rk3288_vpu_dec.c +++ b/drivers/media/platform/rockchip-vpu/rockchip_vpu_dec.c @@ -1,5 +1,5 @@ /* - * Rockchip RK3288 VPU codec driver + * Rockchip VPU codec driver * * Copyright (C) 2014 Rockchip Electronics Co., Ltd. * Hertz Wong @@ -21,7 +21,7 @@ * GNU General Public License for more details. */ -#include "rk3288_vpu_common.h" +#include "rockchip_vpu_common.h" #include #include @@ -32,8 +32,8 @@ #include #include -#include "rk3288_vpu_dec.h" -#include "rk3288_vpu_hw.h" +#include "rockchip_vpu_dec.h" +#include "rockchip_vpu_hw.h" #define DEF_SRC_FMT_DEC V4L2_PIX_FMT_H264_SLICE #define DEF_DST_FMT_DEC V4L2_PIX_FMT_NV12 diff --git a/drivers/media/platform/rockchip-vpu/rk3288_vpu_dec.h b/drivers/media/platform/rockchip-vpu/rockchip_vpu_dec.h similarity index 89% rename from drivers/media/platform/rockchip-vpu/rk3288_vpu_dec.h rename to drivers/media/platform/rockchip-vpu/rockchip_vpu_dec.h index ac2598751083..5d27a9f23c57 100644 --- a/drivers/media/platform/rockchip-vpu/rk3288_vpu_dec.h +++ b/drivers/media/platform/rockchip-vpu/rockchip_vpu_dec.h @@ -1,5 +1,5 @@ /* - * Rockchip RK3288 VPU codec driver + * Rockchip VPU codec driver * * Copyright (C) 2014 Rockchip Electronics Co., Ltd. * Hertz Wong @@ -21,8 +21,8 @@ * GNU General Public License for more details. */ -#ifndef RK3288_VPU_DEC_H_ -#define RK3288_VPU_DEC_H_ +#ifndef ROCKCHIP_VPU_DEC_H_ +#define ROCKCHIP_VPU_DEC_H_ struct vb2_ops *get_dec_queue_ops(void); const struct v4l2_ioctl_ops *get_dec_v4l2_ioctl_ops(void); @@ -30,4 +30,4 @@ struct rk3288_vpu_fmt *get_dec_def_fmt(bool src); int rk3288_vpu_dec_init(struct rk3288_vpu_ctx *ctx); void rk3288_vpu_dec_exit(struct rk3288_vpu_ctx *ctx); -#endif /* RK3288_VPU_DEC_H_ */ +#endif /* ROCKCHIP_VPU_DEC_H_ */ diff --git a/drivers/media/platform/rockchip-vpu/rk3288_vpu_enc.c b/drivers/media/platform/rockchip-vpu/rockchip_vpu_enc.c similarity index 99% rename from drivers/media/platform/rockchip-vpu/rk3288_vpu_enc.c rename to drivers/media/platform/rockchip-vpu/rockchip_vpu_enc.c index 0c9ce38d7553..01bb4cfc7bfe 100644 --- a/drivers/media/platform/rockchip-vpu/rk3288_vpu_enc.c +++ b/drivers/media/platform/rockchip-vpu/rockchip_vpu_enc.c @@ -1,5 +1,5 @@ /* - * Rockchip RK3288 VPU codec driver + * Rockchip VPU codec driver * * Copyright (C) 2014 Rockchip Electronics Co., Ltd. * Alpha Lin @@ -22,7 +22,7 @@ * GNU General Public License for more details. */ -#include "rk3288_vpu_common.h" +#include "rockchip_vpu_common.h" #include #include @@ -38,8 +38,8 @@ #include #include -#include "rk3288_vpu_enc.h" -#include "rk3288_vpu_hw.h" +#include "rockchip_vpu_enc.h" +#include "rockchip_vpu_hw.h" #define DEF_SRC_FMT_ENC V4L2_PIX_FMT_NV12 #define DEF_DST_FMT_ENC V4L2_PIX_FMT_VP8 diff --git a/drivers/media/platform/rockchip-vpu/rk3288_vpu_enc.h b/drivers/media/platform/rockchip-vpu/rockchip_vpu_enc.h similarity index 90% rename from drivers/media/platform/rockchip-vpu/rk3288_vpu_enc.h rename to drivers/media/platform/rockchip-vpu/rockchip_vpu_enc.h index 4b1979d5d2ef..d8a728f3467c 100644 --- a/drivers/media/platform/rockchip-vpu/rk3288_vpu_enc.h +++ b/drivers/media/platform/rockchip-vpu/rockchip_vpu_enc.h @@ -1,5 +1,5 @@ /* - * Rockchip RK3288 VPU codec driver + * Rockchip VPU codec driver * * Copyright (c) 2014 Rockchip Electronics Co., Ltd. * Alpha Lin @@ -22,8 +22,8 @@ * GNU General Public License for more details. */ -#ifndef RK3288_VPU_ENC_H_ -#define RK3288_VPU_ENC_H_ +#ifndef ROCKCHIP_VPU_ENC_H_ +#define ROCKCHIP_VPU_ENC_H_ struct vb2_ops *get_enc_queue_ops(void); const struct v4l2_ioctl_ops *get_enc_v4l2_ioctl_ops(void); @@ -33,4 +33,4 @@ void rk3288_vpu_enc_exit(struct rk3288_vpu_ctx *ctx); int rk3288_vpu_enc_init_dummy_ctx(struct rk3288_vpu_dev *dev); void rk3288_vpu_enc_free_dummy_ctx(struct rk3288_vpu_dev *dev); -#endif /* RK3288_VPU_ENC_H_ */ +#endif /* ROCKCHIP_VPU_ENC_H_ */ diff --git a/drivers/media/platform/rockchip-vpu/rk3288_vpu_hw.c b/drivers/media/platform/rockchip-vpu/rockchip_vpu_hw.c similarity index 99% rename from drivers/media/platform/rockchip-vpu/rk3288_vpu_hw.c rename to drivers/media/platform/rockchip-vpu/rockchip_vpu_hw.c index 531fc523647d..24aa83d301f0 100644 --- a/drivers/media/platform/rockchip-vpu/rk3288_vpu_hw.c +++ b/drivers/media/platform/rockchip-vpu/rockchip_vpu_hw.c @@ -1,5 +1,5 @@ /* - * Rockchip RK3288 VPU codec driver + * Rockchip VPU codec driver * * Copyright (C) 2014 Google, Inc. * Tomasz Figa @@ -14,7 +14,7 @@ * GNU General Public License for more details. */ -#include "rk3288_vpu_common.h" +#include "rockchip_vpu_common.h" #include #include diff --git a/drivers/media/platform/rockchip-vpu/rk3288_vpu_hw.h b/drivers/media/platform/rockchip-vpu/rockchip_vpu_hw.h similarity index 97% rename from drivers/media/platform/rockchip-vpu/rk3288_vpu_hw.h rename to drivers/media/platform/rockchip-vpu/rockchip_vpu_hw.h index f8325536295b..54e6ef3b78a0 100644 --- a/drivers/media/platform/rockchip-vpu/rk3288_vpu_hw.h +++ b/drivers/media/platform/rockchip-vpu/rockchip_vpu_hw.h @@ -1,5 +1,5 @@ /* - * Rockchip RK3288 VPU codec driver + * Rockchip VPU codec driver * * Copyright (C) 2014 Google, Inc. * Tomasz Figa @@ -14,8 +14,8 @@ * GNU General Public License for more details. */ -#ifndef RK3288_VPU_HW_H_ -#define RK3288_VPU_HW_H_ +#ifndef ROCKCHIP_VPU_HW_H_ +#define ROCKCHIP_VPU_HW_H_ #include @@ -176,4 +176,4 @@ const struct rk3288_vp8e_reg_params *rk3288_vpu_vp8e_get_dummy_params(void); void rk3288_vpu_vp8e_assemble_bitstream(struct rk3288_vpu_ctx *ctx, struct rk3288_vpu_buf *dst_buf); -#endif /* RK3288_VPU_HW_H_ */ +#endif /* ROCKCHIP_VPU_HW_H_ */ -- 2.34.1