diff --git a/drivers/media/platform/rockchip/cif/cif-luma.h b/drivers/media/platform/rockchip/cif/cif-luma.h
index f57d19c4123a..40a5787e1d0e 100644
--- a/drivers/media/platform/rockchip/cif/cif-luma.h
+++ b/drivers/media/platform/rockchip/cif/cif-luma.h
@@ -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"
diff --git a/drivers/media/platform/rockchip/isp/bridge.h b/drivers/media/platform/rockchip/isp/bridge.h
index 8310b13df88a..cc1a7e936f62 100644
--- a/drivers/media/platform/rockchip/isp/bridge.h
+++ b/drivers/media/platform/rockchip/isp/bridge.h
@@ -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"
diff --git a/drivers/media/platform/rockchip/isp/isp_ispp.h b/drivers/media/platform/rockchip/isp/isp_ispp.h
index a12b476fbf38..16f106c396a8 100644
--- a/drivers/media/platform/rockchip/isp/isp_ispp.h
+++ b/drivers/media/platform/rockchip/isp/isp_ispp.h
@@ -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
diff --git a/drivers/media/platform/rockchip/isp/isp_mipi_luma.h b/drivers/media/platform/rockchip/isp/isp_mipi_luma.h
index 537a9d6a0796..681a8b6ac0c6 100644
--- a/drivers/media/platform/rockchip/isp/isp_mipi_luma.h
+++ b/drivers/media/platform/rockchip/isp/isp_mipi_luma.h
@@ -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"
diff --git a/drivers/media/platform/rockchip/isp/isp_params.h b/drivers/media/platform/rockchip/isp/isp_params.h
index a2e3f0be9ea1..d38c0dffb6bf 100644
--- a/drivers/media/platform/rockchip/isp/isp_params.h
+++ b/drivers/media/platform/rockchip/isp/isp_params.h
@@ -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"
 
diff --git a/drivers/media/platform/rockchip/isp/isp_params_v1x.h b/drivers/media/platform/rockchip/isp/isp_params_v1x.h
index 316bef51eaca..b6e4a2c6a9bc 100644
--- a/drivers/media/platform/rockchip/isp/isp_params_v1x.h
+++ b/drivers/media/platform/rockchip/isp/isp_params_v1x.h
@@ -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"
diff --git a/drivers/media/platform/rockchip/isp/isp_params_v21.h b/drivers/media/platform/rockchip/isp/isp_params_v21.h
index 2a32827aaeef..40ffa763e98e 100644
--- a/drivers/media/platform/rockchip/isp/isp_params_v21.h
+++ b/drivers/media/platform/rockchip/isp/isp_params_v21.h
@@ -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"
diff --git a/drivers/media/platform/rockchip/isp/isp_params_v2x.h b/drivers/media/platform/rockchip/isp/isp_params_v2x.h
index 707ada18205b..dd2a1d33f370 100644
--- a/drivers/media/platform/rockchip/isp/isp_params_v2x.h
+++ b/drivers/media/platform/rockchip/isp/isp_params_v2x.h
@@ -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"
diff --git a/drivers/media/platform/rockchip/isp/isp_params_v32.h b/drivers/media/platform/rockchip/isp/isp_params_v32.h
index 30c2e06a3ca8..fb1f21edbaea 100644
--- a/drivers/media/platform/rockchip/isp/isp_params_v32.h
+++ b/drivers/media/platform/rockchip/isp/isp_params_v32.h
@@ -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"
diff --git a/drivers/media/platform/rockchip/isp/isp_params_v3x.h b/drivers/media/platform/rockchip/isp/isp_params_v3x.h
index 20922283bb27..31c22419b64d 100644
--- a/drivers/media/platform/rockchip/isp/isp_params_v3x.h
+++ b/drivers/media/platform/rockchip/isp/isp_params_v3x.h
@@ -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"
diff --git a/drivers/media/platform/rockchip/isp/isp_stats.h b/drivers/media/platform/rockchip/isp/isp_stats.h
index eb9f79f9aacb..5e10d8f3d545 100644
--- a/drivers/media/platform/rockchip/isp/isp_stats.h
+++ b/drivers/media/platform/rockchip/isp/isp_stats.h
@@ -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"
diff --git a/drivers/media/platform/rockchip/isp/isp_stats_v1x.h b/drivers/media/platform/rockchip/isp/isp_stats_v1x.h
index 8f1853d4b01d..6dc2790c58d5 100644
--- a/drivers/media/platform/rockchip/isp/isp_stats_v1x.h
+++ b/drivers/media/platform/rockchip/isp/isp_stats_v1x.h
@@ -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"
diff --git a/drivers/media/platform/rockchip/isp/isp_stats_v21.h b/drivers/media/platform/rockchip/isp/isp_stats_v21.h
index c1dba6c65933..6fccd014db2b 100644
--- a/drivers/media/platform/rockchip/isp/isp_stats_v21.h
+++ b/drivers/media/platform/rockchip/isp/isp_stats_v21.h
@@ -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"
diff --git a/drivers/media/platform/rockchip/isp/isp_stats_v2x.h b/drivers/media/platform/rockchip/isp/isp_stats_v2x.h
index 5793ebfefcbb..37d7988f7013 100644
--- a/drivers/media/platform/rockchip/isp/isp_stats_v2x.h
+++ b/drivers/media/platform/rockchip/isp/isp_stats_v2x.h
@@ -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"
diff --git a/drivers/media/platform/rockchip/isp/isp_stats_v32.c b/drivers/media/platform/rockchip/isp/isp_stats_v32.c
index b7206238faac..bfc9624b45bd 100644
--- a/drivers/media/platform/rockchip/isp/isp_stats_v32.c
+++ b/drivers/media/platform/rockchip/isp/isp_stats_v32.c
@@ -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>
diff --git a/drivers/media/platform/rockchip/isp/isp_stats_v32.h b/drivers/media/platform/rockchip/isp/isp_stats_v32.h
index 58d6eb5a2556..b598c8734478 100644
--- a/drivers/media/platform/rockchip/isp/isp_stats_v32.h
+++ b/drivers/media/platform/rockchip/isp/isp_stats_v32.h
@@ -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"
diff --git a/drivers/media/platform/rockchip/isp/isp_stats_v3x.h b/drivers/media/platform/rockchip/isp/isp_stats_v3x.h
index 1b40c571f19e..042f11c70a36 100644
--- a/drivers/media/platform/rockchip/isp/isp_stats_v3x.h
+++ b/drivers/media/platform/rockchip/isp/isp_stats_v3x.h
@@ -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"
diff --git a/drivers/media/platform/rockchip/isp/rkisp.c b/drivers/media/platform/rockchip/isp/rkisp.c
index 29c3287a50cd..884b81b0437e 100644
--- a/drivers/media/platform/rockchip/isp/rkisp.c
+++ b/drivers/media/platform/rockchip/isp/rkisp.c
@@ -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>
diff --git a/drivers/media/platform/rockchip/isp/rkisp_tb_helper.h b/drivers/media/platform/rockchip/isp/rkisp_tb_helper.h
index 79d06469a354..a4b4a59bc7f7 100644
--- a/drivers/media/platform/rockchip/isp/rkisp_tb_helper.h
+++ b/drivers/media/platform/rockchip/isp/rkisp_tb_helper.h
@@ -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,
diff --git a/drivers/media/platform/rockchip/isp/version.h b/drivers/media/platform/rockchip/isp/version.h
index 0fe7eb9e0051..539a39c13315 100644
--- a/drivers/media/platform/rockchip/isp/version.h
+++ b/drivers/media/platform/rockchip/isp/version.h
@@ -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
diff --git a/drivers/media/platform/rockchip/isp1/isp_params.h b/drivers/media/platform/rockchip/isp1/isp_params.h
index ea707b7cf0e4..fe7065dcfe41 100644
--- a/drivers/media/platform/rockchip/isp1/isp_params.h
+++ b/drivers/media/platform/rockchip/isp1/isp_params.h
@@ -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"
 
diff --git a/drivers/media/platform/rockchip/isp1/isp_stats.h b/drivers/media/platform/rockchip/isp1/isp_stats.h
index bdb4779b1f69..183b48e6c098 100644
--- a/drivers/media/platform/rockchip/isp1/isp_stats.h
+++ b/drivers/media/platform/rockchip/isp1/isp_stats.h
@@ -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"
diff --git a/drivers/media/platform/rockchip/ispp/fec.c b/drivers/media/platform/rockchip/ispp/fec.c
index b14917d4c0bb..8004f3c5d577 100644
--- a/drivers/media/platform/rockchip/ispp/fec.c
+++ b/drivers/media/platform/rockchip/ispp/fec.c
@@ -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"
diff --git a/drivers/media/platform/rockchip/ispp/params.c b/drivers/media/platform/rockchip/ispp/params.c
index 413143d7a26d..af5fdddb2fad 100644
--- a/drivers/media/platform/rockchip/ispp/params.c
+++ b/drivers/media/platform/rockchip/ispp/params.c
@@ -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"
diff --git a/drivers/media/platform/rockchip/ispp/params.h b/drivers/media/platform/rockchip/ispp/params.h
index 6ea0c140a6fb..912e20159efd 100644
--- a/drivers/media/platform/rockchip/ispp/params.h
+++ b/drivers/media/platform/rockchip/ispp/params.h
@@ -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 {
diff --git a/drivers/media/platform/rockchip/ispp/params_v10.c b/drivers/media/platform/rockchip/ispp/params_v10.c
index b12c4f9a4b7b..5778acd20988 100644
--- a/drivers/media/platform/rockchip/ispp/params_v10.c
+++ b/drivers/media/platform/rockchip/ispp/params_v10.c
@@ -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"
diff --git a/drivers/media/platform/rockchip/ispp/stats.h b/drivers/media/platform/rockchip/ispp/stats.h
index deb141e2a6d0..8ca1bd540f5c 100644
--- a/drivers/media/platform/rockchip/ispp/stats.h
+++ b/drivers/media/platform/rockchip/ispp/stats.h
@@ -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"
diff --git a/drivers/media/platform/rockchip/ispp/stream.c b/drivers/media/platform/rockchip/ispp/stream.c
index 885c8b107a29..ab029f00e306 100644
--- a/drivers/media/platform/rockchip/ispp/stream.c
+++ b/drivers/media/platform/rockchip/ispp/stream.c
@@ -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"
diff --git a/drivers/media/platform/rockchip/ispp/stream_v10.c b/drivers/media/platform/rockchip/ispp/stream_v10.c
index 688fd3d0b8ff..5567fe6c92d9 100644
--- a/drivers/media/platform/rockchip/ispp/stream_v10.c
+++ b/drivers/media/platform/rockchip/ispp/stream_v10.c
@@ -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"
diff --git a/drivers/media/platform/rockchip/ispp/stream_v20.c b/drivers/media/platform/rockchip/ispp/stream_v20.c
index cd78a9aa9c95..a7f37d7d571e 100644
--- a/drivers/media/platform/rockchip/ispp/stream_v20.c
+++ b/drivers/media/platform/rockchip/ispp/stream_v20.c
@@ -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"
diff --git a/drivers/media/platform/rockchip/ispp/version.h b/drivers/media/platform/rockchip/ispp/version.h
index b7f01737aa92..398f500a22ac 100644
--- a/drivers/media/platform/rockchip/ispp/version.h
+++ b/drivers/media/platform/rockchip/ispp/version.h
@@ -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
diff --git a/drivers/media/spi/rk1608_dphy.c b/drivers/media/spi/rk1608_dphy.c
index 24efe49a4acb..378ba55f97ba 100644
--- a/drivers/media/spi/rk1608_dphy.c
+++ b/drivers/media/spi/rk1608_dphy.c
@@ -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>
diff --git a/include/soc/rockchip/rockchip_rockit.h b/include/soc/rockchip/rockchip_rockit.h
index 5b86f9501da9..212351b0cf6b 100644
--- a/include/soc/rockchip/rockchip_rockit.h
+++ b/include/soc/rockchip/rockchip_rockit.h
@@ -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
diff --git a/include/uapi/linux/rkisp1-config.h b/include/uapi/linux/rk-isp1-config.h
similarity index 99%
rename from include/uapi/linux/rkisp1-config.h
rename to include/uapi/linux/rk-isp1-config.h
index c26d4bb69261..3deace8e093d 100644
--- a/include/uapi/linux/rkisp1-config.h
+++ b/include/uapi/linux/rk-isp1-config.h
@@ -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 */
diff --git a/include/uapi/linux/rkisp2-config.h b/include/uapi/linux/rk-isp2-config.h
similarity index 99%
rename from include/uapi/linux/rkisp2-config.h
rename to include/uapi/linux/rk-isp2-config.h
index 0f5a9d1d5625..3b79d5f72e66 100644
--- a/include/uapi/linux/rkisp2-config.h
+++ b/include/uapi/linux/rk-isp2-config.h
@@ -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 */
diff --git a/include/uapi/linux/rkisp21-config.h b/include/uapi/linux/rk-isp21-config.h
similarity index 99%
rename from include/uapi/linux/rkisp21-config.h
rename to include/uapi/linux/rk-isp21-config.h
index 3e83014823f7..b8a63aa7e155 100644
--- a/include/uapi/linux/rkisp21-config.h
+++ b/include/uapi/linux/rk-isp21-config.h
@@ -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 */
diff --git a/include/uapi/linux/rkisp3-config.h b/include/uapi/linux/rk-isp3-config.h
similarity index 99%
rename from include/uapi/linux/rkisp3-config.h
rename to include/uapi/linux/rk-isp3-config.h
index 06cb06807b7e..97a4ce45e37f 100644
--- a/include/uapi/linux/rkisp3-config.h
+++ b/include/uapi/linux/rk-isp3-config.h
@@ -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 */
diff --git a/include/uapi/linux/rkisp32-config.h b/include/uapi/linux/rk-isp32-config.h
similarity index 99%
rename from include/uapi/linux/rkisp32-config.h
rename to include/uapi/linux/rk-isp32-config.h
index b8d1cd6c73c9..6c6ac72b62be 100644
--- a/include/uapi/linux/rkisp32-config.h
+++ b/include/uapi/linux/rk-isp32-config.h
@@ -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 */
diff --git a/include/uapi/linux/rkispp-config.h b/include/uapi/linux/rk-ispp-config.h
similarity index 99%
rename from include/uapi/linux/rkispp-config.h
rename to include/uapi/linux/rk-ispp-config.h
index 1707d1123e94..4330f418da2c 100644
--- a/include/uapi/linux/rkispp-config.h
+++ b/include/uapi/linux/rk-ispp-config.h
@@ -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>