github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-06 13:37:36 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

media: rockchip: rename isp and ispp uapi head

Browse Source 
Change-Id: I768baae0c406efc0bdc9b13dc2ac745f1365cf45
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
This commit is contained in:
Cai YiWei 2023-03-24 14:45:30 +08:00 committed by Tao Huang
parent fd32f0f8d6
commit 17e4013e9e
39 changed files with 58 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/media/platform/rockchip/cif/cif-luma.h
View File

@ -4,7 +4,7 @@
#ifndef _RKCIF_LUMA_H
#define _RKCIF_LUMA_H
#include <linux/rkisp1-config.h>
#include <linux/rk-isp1-config.h>
#include <linux/interrupt.h>
#include <linux/kfifo.h>
#include "dev.h"

2
drivers/media/platform/rockchip/isp/bridge.h
View File

@ -5,7 +5,7 @@
#define _RKISP_BRIDGE_H
#include "linux/platform_device.h"
#include <linux/rkisp1-config.h>
#include <linux/rk-isp1-config.h>
#include "isp_ispp.h"
#define BRIDGE_DEV_NAME DRIVER_NAME "-bridge-ispp"

4
drivers/media/platform/rockchip/isp/isp_ispp.h
View File

@ -7,8 +7,8 @@
#include <linux/platform_device.h>
#include <media/v4l2-subdev.h>
#include <media/videobuf2-v4l2.h>
#include <linux/rkisp1-config.h>
#include <linux/rkispp-config.h>
#include <linux/rk-isp1-config.h>
#include <linux/rk-ispp-config.h>
#define RKISP_BUF_MAX 2
#define RKISPP_BUF_MAX 2

2
drivers/media/platform/rockchip/isp/isp_mipi_luma.h
View File

@ -4,7 +4,7 @@
#ifndef _RKISP_ISP_LUMA_H
#define _RKISP_ISP_LUMA_H
#include <linux/rkisp1-config.h>
#include <linux/rk-isp1-config.h>
#include <linux/interrupt.h>
#include <linux/kfifo.h>
#include "common.h"

8
drivers/media/platform/rockchip/isp/isp_params.h
View File

@ -4,10 +4,10 @@
#ifndef _RKISP_ISP_PARAM_H
#define _RKISP_ISP_PARAM_H
#include <linux/rkisp1-config.h>
#include <linux/rkisp2-config.h>
#include <linux/rkisp3-config.h>
#include <linux/rkisp32-config.h>
#include <linux/rk-isp1-config.h>
#include <linux/rk-isp2-config.h>
#include <linux/rk-isp3-config.h>
#include <linux/rk-isp32-config.h>
#include <linux/rk-preisp.h>
#include "common.h"

2
drivers/media/platform/rockchip/isp/isp_params_v1x.h
View File

@ -4,7 +4,7 @@
#ifndef _RKISP_ISP_PARAM_V1X_H
#define _RKISP_ISP_PARAM_V1X_H
#include <linux/rkisp1-config.h>
#include <linux/rk-isp1-config.h>
#include <linux/rk-preisp.h>
#include "common.h"
#include "isp_params.h"

2
drivers/media/platform/rockchip/isp/isp_params_v21.h
View File

@ -4,7 +4,7 @@
#ifndef _RKISP_ISP_PARAM_V21_H
#define _RKISP_ISP_PARAM_V21_H
#include <linux/rkisp1-config.h>
#include <linux/rk-isp1-config.h>
#include <linux/rk-preisp.h>
#include "common.h"
#include "isp_params.h"

2
drivers/media/platform/rockchip/isp/isp_params_v2x.h
View File

@ -4,7 +4,7 @@
#ifndef _RKISP_ISP_PARAM_V2X_H
#define _RKISP_ISP_PARAM_V2X_H
#include <linux/rkisp1-config.h>
#include <linux/rk-isp1-config.h>
#include <linux/rk-preisp.h>
#include "common.h"
#include "isp_params.h"

2
drivers/media/platform/rockchip/isp/isp_params_v32.h
View File

@ -4,7 +4,7 @@
#ifndef _RKISP_ISP_PARAM_V32_H
#define _RKISP_ISP_PARAM_V32_H
#include <linux/rkisp1-config.h>
#include <linux/rk-isp1-config.h>
#include <linux/rk-preisp.h>
#include "common.h"
#include "isp_params.h"

2
drivers/media/platform/rockchip/isp/isp_params_v3x.h
View File

@ -4,7 +4,7 @@
#ifndef _RKISP_ISP_PARAM_V3X_H
#define _RKISP_ISP_PARAM_V3X_H
#include <linux/rkisp1-config.h>
#include <linux/rk-isp1-config.h>
#include <linux/rk-preisp.h>
#include "common.h"
#include "isp_params.h"

2
drivers/media/platform/rockchip/isp/isp_stats.h
View File

@ -4,7 +4,7 @@
#ifndef _RKISP_ISP_STATS_H
#define _RKISP_ISP_STATS_H
#include <linux/rkisp1-config.h>
#include <linux/rk-isp1-config.h>
#include <linux/interrupt.h>
#include <linux/kfifo.h>
#include "common.h"

2
drivers/media/platform/rockchip/isp/isp_stats_v1x.h
View File

@ -4,7 +4,7 @@
#ifndef _RKISP_ISP_STATS_V1X_H
#define _RKISP_ISP_STATS_V1X_H
#include <linux/rkisp1-config.h>
#include <linux/rk-isp1-config.h>
#include <linux/interrupt.h>
#include <linux/kfifo.h>
#include "common.h"

2
drivers/media/platform/rockchip/isp/isp_stats_v21.h
View File

@ -4,7 +4,7 @@
#ifndef _RKISP_ISP_STATS_V21_H
#define _RKISP_ISP_STATS_V21_H
#include <linux/rkisp1-config.h>
#include <linux/rk-isp1-config.h>
#include <linux/interrupt.h>
#include <linux/kfifo.h>
#include "common.h"

2
drivers/media/platform/rockchip/isp/isp_stats_v2x.h
View File

@ -4,7 +4,7 @@
#ifndef _RKISP_ISP_STATS_V2X_H
#define _RKISP_ISP_STATS_V2X_H
#include <linux/rkisp1-config.h>
#include <linux/rk-isp1-config.h>
#include <linux/interrupt.h>
#include <linux/kfifo.h>
#include "common.h"

2
drivers/media/platform/rockchip/isp/isp_stats_v32.c
View File

@ -2,7 +2,7 @@
/* Copyright (c) 2022 Rockchip Electronics Co., Ltd. */
#include <linux/kfifo.h>
#include <linux/rkisp32-config.h>
#include <linux/rk-isp32-config.h>
#include <media/v4l2-common.h>
#include <media/v4l2-ioctl.h>
#include <media/videobuf2-core.h>

2
drivers/media/platform/rockchip/isp/isp_stats_v32.h
View File

@ -4,7 +4,7 @@
#ifndef _RKISP_ISP_STATS_V32_H
#define _RKISP_ISP_STATS_V32_H
#include <linux/rkisp1-config.h>
#include <linux/rk-isp1-config.h>
#include <linux/interrupt.h>
#include <linux/kfifo.h>
#include "common.h"

2
drivers/media/platform/rockchip/isp/isp_stats_v3x.h
View File

@ -4,7 +4,7 @@
#ifndef _RKISP_ISP_STATS_V3X_H
#define _RKISP_ISP_STATS_V3X_H
#include <linux/rkisp1-config.h>
#include <linux/rk-isp1-config.h>
#include <linux/interrupt.h>
#include <linux/kfifo.h>
#include "common.h"

2
drivers/media/platform/rockchip/isp/rkisp.c
View File

@ -43,7 +43,7 @@
#include <linux/kfifo.h>
#include <linux/interrupt.h>
#include <linux/rk-preisp.h>
#include <linux/rkisp21-config.h>
#include <linux/rk-isp21-config.h>
#include <linux/iommu.h>
#include <media/v4l2-event.h>
#include <media/media-entity.h>

2
drivers/media/platform/rockchip/isp/rkisp_tb_helper.h
View File

@ -4,7 +4,7 @@
#ifndef _RKISP_TB_HELPER_H
#define _RKISP_TB_HELPER_H
#include <linux/rkisp1-config.h>
#include <linux/rk-isp1-config.h>
enum rkisp_tb_state {
RKISP_TB_RUN = 0,

2
drivers/media/platform/rockchip/isp/version.h
View File

@ -4,7 +4,7 @@
#ifndef _RKISP_VERSION_H
#define _RKISP_VERSION_H
#include <linux/version.h>
#include <linux/rkisp21-config.h>
#include <linux/rk-isp21-config.h>
/*
* RKISP DRIVER VERSION NOTE

2
drivers/media/platform/rockchip/isp1/isp_params.h
View File

@ -35,7 +35,7 @@
#ifndef _RKISP1_ISP_H
#define _RKISP1_ISP_H
#include <linux/rkisp1-config.h>
#include <linux/rk-isp1-config.h>
#include <linux/rk-preisp.h>
#include "common.h"

2
drivers/media/platform/rockchip/isp1/isp_stats.h
View File

@ -35,7 +35,7 @@
#ifndef _RKISP1_ISP_STATS_H
#define _RKISP1_ISP_STATS_H
#include <linux/rkisp1-config.h>
#include <linux/rk-isp1-config.h>
#include <linux/interrupt.h>
#include <linux/kfifo.h>
#include "common.h"

2
drivers/media/platform/rockchip/ispp/fec.c
View File

@ -9,7 +9,7 @@
#include <media/videobuf2-dma-contig.h>
#include <media/videobuf2-v4l2.h>
#include <linux/pm_runtime.h>
#include <linux/rkispp-config.h>
#include <linux/rk-ispp-config.h>
#include <uapi/linux/rk-video-format.h>
#include "hw.h"

2
drivers/media/platform/rockchip/ispp/params.c
View File

@ -7,7 +7,7 @@
#include <media/videobuf2-vmalloc.h>
#include <media/v4l2-event.h>
#include <media/v4l2-mc.h>
#include <linux/rkisp1-config.h>
#include <linux/rk-isp1-config.h>
#include <uapi/linux/rk-video-format.h>
#include "dev.h"
#include "regs.h"

2
drivers/media/platform/rockchip/ispp/params.h
View File

@ -5,7 +5,7 @@
#define _RKISPP_PARAMS_H
#include <linux/fec-config.h>
#include <linux/rkispp-config.h>
#include <linux/rk-ispp-config.h>
#include "common.h"
enum rkispp_paramvdev_id {

2
drivers/media/platform/rockchip/ispp/params_v10.c
View File

@ -7,7 +7,7 @@
#include <media/videobuf2-vmalloc.h>
#include <media/v4l2-event.h>
#include <media/v4l2-mc.h>
#include <linux/rkisp1-config.h>
#include <linux/rk-isp1-config.h>
#include <uapi/linux/rk-video-format.h>
#include "dev.h"
#include "regs.h"

2
drivers/media/platform/rockchip/ispp/stats.h
View File

@ -4,7 +4,7 @@
#ifndef _RKISPP_STATS_H
#define _RKISPP_STATS_H
#include <linux/rkispp-config.h>
#include <linux/rk-ispp-config.h>
#include <linux/interrupt.h>
#include <linux/kfifo.h>
#include "common.h"

2
drivers/media/platform/rockchip/ispp/stream.c
View File

@ -13,7 +13,7 @@
#include <media/v4l2-subdev.h>
#include <media/videobuf2-dma-contig.h>
#include <media/videobuf2-dma-sg.h>
#include <linux/rkisp1-config.h>
#include <linux/rk-isp1-config.h>
#include <uapi/linux/rk-video-format.h>
#include "dev.h"

2
drivers/media/platform/rockchip/ispp/stream_v10.c
View File

@ -13,7 +13,7 @@
#include <media/v4l2-subdev.h>
#include <media/videobuf2-dma-contig.h>
#include <media/videobuf2-dma-sg.h>
#include <linux/rkisp1-config.h>
#include <linux/rk-isp1-config.h>
#include <uapi/linux/rk-video-format.h>
#include "dev.h"

2
drivers/media/platform/rockchip/ispp/stream_v20.c
View File

@ -13,7 +13,7 @@
#include <media/v4l2-subdev.h>
#include <media/videobuf2-dma-contig.h>
#include <media/videobuf2-dma-sg.h>
#include <linux/rkisp1-config.h>
#include <linux/rk-isp1-config.h>
#include "dev.h"
#include "regs.h"

2
drivers/media/platform/rockchip/ispp/version.h
View File

@ -4,7 +4,7 @@
#ifndef _RKISPP_VERSION_H
#define _RKISPP_VERSION_H
#include <linux/version.h>
#include <linux/rkispp-config.h>
#include <linux/rk-ispp-config.h>
/*
* RKISPP DRIVER VERSION NOTE

2
drivers/media/spi/rk1608_dphy.c
View File

@ -24,7 +24,7 @@
#include <linux/of_platform.h>
#include <linux/types.h>
#include <linux/rk-preisp.h>
#include <linux/rkisp1-config.h>
#include <linux/rk-isp1-config.h>
#include <linux/rk-camera-module.h>
#include "rk1608_dphy.h"
#include <linux/compat.h>

2
include/soc/rockchip/rockchip_rockit.h
View File

@ -6,7 +6,7 @@
#define __SOC_ROCKCHIP_ROCKIT_H
#include <linux/dma-buf.h>
#include <linux/rkisp2-config.h>
#include <linux/rk-isp2-config.h>
#define ROCKIT_BUF_NUM_MAX 5
#define ROCKIT_ISP_NUM_MAX 3

8
include/uapi/linux/rkisp1-config.h → include/uapi/linux/rk-isp1-config.h
View File

@ -4,12 +4,12 @@
* Copyright (C) 2017 Rockchip Electronics Co., Ltd.
*/
#ifndef _UAPI_RKISP1_CONFIG_H
#define _UAPI_RKISP1_CONFIG_H
#ifndef _UAPI_RK_ISP1_CONFIG_H
#define _UAPI_RK_ISP1_CONFIG_H
#include <linux/types.h>
#include <linux/v4l2-controls.h>
#include "rkisp21-config.h"
#include "rk-isp21-config.h"
#define CIFISP_MODULE_DPCC (1 << 0)
#define CIFISP_MODULE_BLS (1 << 1)
@ -869,4 +869,4 @@ struct rkisp1_stat_buffer {
struct cifisp_stat params;
} __attribute__ ((packed));
#endif /* _UAPI_RKISP1_CONFIG_H */
#endif /* _UAPI_RK_ISP1_CONFIG_H */

6
include/uapi/linux/rkisp2-config.h → include/uapi/linux/rk-isp2-config.h
View File

@ -4,8 +4,8 @@
* Copyright (C) 2017 Rockchip Electronics Co., Ltd.
*/
#ifndef _UAPI_RKISP2_CONFIG_H
#define _UAPI_RKISP2_CONFIG_H
#ifndef _UAPI_RK_ISP2_CONFIG_H
#define _UAPI_RK_ISP2_CONFIG_H
#include <linux/types.h>
#include <linux/v4l2-controls.h>
@ -2003,4 +2003,4 @@ struct rkisp_thunderboot_shmem {
s32 shm_fd;
} __attribute__ ((packed));
#endif /* _UAPI_RKISP2_CONFIG_H */
#endif /* _UAPI_RK_ISP2_CONFIG_H */

8
include/uapi/linux/rkisp21-config.h → include/uapi/linux/rk-isp21-config.h
View File

@ -4,12 +4,12 @@
* Copyright (C) 2020 Rockchip Electronics Co., Ltd.
*/
#ifndef _UAPI_RKISP21_CONFIG_H
#define _UAPI_RKISP21_CONFIG_H
#ifndef _UAPI_RK_ISP21_CONFIG_H
#define _UAPI_RK_ISP21_CONFIG_H
#include <linux/types.h>
#include <linux/v4l2-controls.h>
#include <linux/rkisp2-config.h>
#include <linux/rk-isp2-config.h>
#define ISP2X_MODULE_BAYNR BIT_ULL(36)
#define ISP2X_MODULE_BAY3D BIT_ULL(37)
@ -809,4 +809,4 @@ struct rkisp_isp21_stat_buffer {
struct isp21_stat params;
} __attribute__ ((packed));
#endif /* _UAPI_RKISP21_CONFIG_H */
#endif /* _UAPI_RK_ISP21_CONFIG_H */

8
include/uapi/linux/rkisp3-config.h → include/uapi/linux/rk-isp3-config.h
View File

@ -4,12 +4,12 @@
* Copyright (C) 2021 Rockchip Electronics Co., Ltd.
*/
#ifndef _UAPI_RKISP3_CONFIG_H
#define _UAPI_RKISP3_CONFIG_H
#ifndef _UAPI_RK_ISP3_CONFIG_H
#define _UAPI_RK_ISP3_CONFIG_H
#include <linux/types.h>
#include <linux/v4l2-controls.h>
#include <linux/rkisp21-config.h>
#include <linux/rk-isp21-config.h>
#define ISP3X_MODULE_DPCC ISP2X_MODULE_DPCC
#define ISP3X_MODULE_BLS ISP2X_MODULE_BLS
@ -1074,4 +1074,4 @@ struct rkisp3x_isp_stat_buffer {
struct isp3x_stat params;
} __attribute__ ((packed));
#endif /* _UAPI_RKISP3_CONFIG_H */
#endif /* _UAPI_RK_ISP3_CONFIG_H */

8
include/uapi/linux/rkisp32-config.h → include/uapi/linux/rk-isp32-config.h
View File

@ -4,12 +4,12 @@
* Copyright (C) 2022 Rockchip Electronics Co., Ltd.
*/
#ifndef _UAPI_RKISP32_CONFIG_H
#define _UAPI_RKISP32_CONFIG_H
#ifndef _UAPI_RK_ISP32_CONFIG_H
#define _UAPI_RK_ISP32_CONFIG_H
#include <linux/types.h>
#include <linux/v4l2-controls.h>
#include <linux/rkisp3-config.h>
#include <linux/rk-isp3-config.h>
#define RKISP_CMD_GET_TB_HEAD_V32 \
_IOR('V', BASE_VIDIOC_PRIVATE + 12, struct rkisp32_thunderboot_resmem_head)
@ -1524,4 +1524,4 @@ struct rkisp32_lite_stat_buffer {
u32 frame_id;
u32 params_id;
} __attribute__ ((packed));
#endif /* _UAPI_RKISP32_CONFIG_H */
#endif /* _UAPI_RK_ISP32_CONFIG_H */

4
include/uapi/linux/rkispp-config.h → include/uapi/linux/rk-ispp-config.h
View File

@ -3,8 +3,8 @@
* Copyright (C) 2019 Rockchip Electronics Co., Ltd.
*/
#ifndef _UAPI_RKISPP_CONFIG_H
#define _UAPI_RKISPP_CONFIG_H
#ifndef _UAPI_RK_ISPP_CONFIG_H
#define _UAPI_RK_ISPP_CONFIG_H
#include <linux/types.h>
#include <linux/v4l2-controls.h>