Commit 8c060820 authored by Boris Brezillon's avatar Boris Brezillon Committed by Mauro Carvalho Chehab
Browse files

media: rockchip/vpu: Rename rockchip_vpu_common.h into rockchip_vpu_v4l2.h 



We're about to add prototypes for the vb2/v4l2 helpers shared by the
encoder/decoder logic in this file, so let's pick a name that reflects
that (rockchip_vpu_common.h was a bit to generic).

Suggested-by: default avatarEzequiel Garcia <ezequiel@collabora.com>
Signed-off-by: default avatarBoris Brezillon <boris.brezillon@collabora.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent 7d47b45d

drivers/staging/media/rockchip/vpu/rk3288_vpu_hw_jpeg_enc.c

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
#include <media/v4l2-mem2mem.h>

#include "rockchip_vpu_jpeg.h"

#include "rockchip_vpu.h"

#include "rockchip_vpu_common.h"

#include "rockchip_vpu_v4l2.h"

#include "rockchip_vpu_hw.h"

#include "rk3288_vpu_regs.h"

drivers/staging/media/rockchip/vpu/rk3399_vpu_hw_jpeg_enc.c

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
#include <media/v4l2-mem2mem.h>

#include "rockchip_vpu_jpeg.h"

#include "rockchip_vpu.h"

#include "rockchip_vpu_common.h"

#include "rockchip_vpu_v4l2.h"

#include "rockchip_vpu_hw.h"

#include "rk3399_vpu_regs.h"

drivers/staging/media/rockchip/vpu/rockchip_vpu_drv.c

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
#include <media/videobuf2-core.h>

#include <media/videobuf2-vmalloc.h>



#include "rockchip_vpu_common.h"

#include "rockchip_vpu_v4l2.h"

#include "rockchip_vpu.h"

#include "rockchip_vpu_hw.h"

drivers/staging/media/rockchip/vpu/rockchip_vpu_enc.c

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ 


#include "rockchip_vpu.h"

#include "rockchip_vpu_hw.h"

#include "rockchip_vpu_common.h"

#include "rockchip_vpu_v4l2.h"



static const struct rockchip_vpu_fmt *

rockchip_vpu_find_format(struct rockchip_vpu_ctx *ctx, u32 fourcc)

drivers/staging/media/rockchip/vpu/rockchip_vpu_common.h→drivers/staging/media/rockchip/vpu/rockchip_vpu_v4l2.h

+3 −3
Original line number Diff line number Diff line
@@ -13,8 +13,8 @@ 
 * Copyright (C) 2011 Samsung Electronics Co., Ltd.

 */



#ifndef ROCKCHIP_VPU_COMMON_H_

#define ROCKCHIP_VPU_COMMON_H_

#ifndef ROCKCHIP_VPU_V4L2_H_

#define ROCKCHIP_VPU_V4L2_H_



#include "rockchip_vpu.h"
@@ -26,4 +26,4 @@ void rockchip_vpu_enc_reset_src_fmt(struct rockchip_vpu_dev *vpu, 
void rockchip_vpu_enc_reset_dst_fmt(struct rockchip_vpu_dev *vpu,

				    struct rockchip_vpu_ctx *ctx);



#endif /* ROCKCHIP_VPU_COMMON_H_ */
 
#endif /* ROCKCHIP_VPU_V4L2_H_ */

CRA Git | Maintained and supported by SUSTech CRA and CCSE