MLK-20802: VPU Encoder: modify some name to avoid confuse

change MXC_VPU_DECODER to MXC_VPU_MALONE
change the directory name  vpu-encoder-b0 to  vpu_windsor

Signed-off-by: ming_qian <ming.qian@nxp.com>

17 files changed, 30 insertions, 30 deletions

diff --git a/drivers/mxc/Kconfig b/drivers/mxc/Kconfig
index 79a8aff487dc..9712bd033832 100755
--- a/drivers/mxc/Kconfig
+++ b/drivers/mxc/Kconfig
@@ -24,7 +24,7 @@ source "drivers/mxc/hantro_845/Kconfig"
 source "drivers/mxc/hantro_845_h1/Kconfig"
 source "drivers/mxc/vpu-malone/Kconfig"
 source "drivers/mxc/vpu-decoder-b0/Kconfig"
-source "drivers/mxc/vpu-encoder-b0/Kconfig"
+source "drivers/mxc/vpu_windsor/Kconfig"
 endif
 
 if ARCH_MXC
diff --git a/drivers/mxc/Makefile b/drivers/mxc/Makefile
index 109166cbc1d2..c4bf6a03c028 100755
--- a/drivers/mxc/Makefile
+++ b/drivers/mxc/Makefile
@@ -12,4 +12,4 @@ obj-$(CONFIG_MXC_VPU_MALONE) += vpu-malone/
 obj-$(CONFIG_MX8_HDP)	+= hdp/
 obj-$(CONFIG_IMX_HDP_CEC)	+= hdp-cec/
 obj-$(CONFIG_MXC_VPU_DECODER) += vpu-decoder-b0/
-obj-$(CONFIG_MXC_VPU_ENCODER) += vpu-encoder-b0/
+obj-$(CONFIG_MXC_VPU_WINDSOR) += vpu_windsor/
diff --git a/drivers/mxc/vpu-encoder-b0/Kconfig b/drivers/mxc/vpu-encoder-b0/Kconfig
deleted file mode 100755
index d863815d80a5..000000000000
--- a/drivers/mxc/vpu-encoder-b0/Kconfig
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# Codec configuration
-#
-
-menu "MXC VPU(Video Processing Unit) B0 ENCODER support"
-
-config MXC_VPU_ENCODER
-	  tristate "Support for MXC VPU(Video Processing Unit) ENCODER"
-	  depends on MEDIA_SUPPORT
-	  depends on VIDEO_DEV
-	  depends on VIDEO_V4L2
-	  select VIDEOBUF2_DMA_CONTIG
-	  select VIDEOBUF2_VMALLOC
-	  default y
-	---help---
-	  The VPU codec device provides codec function for H.264 etc.
-
-config MXC_VPU_ENCODER_DEBUG
-	bool "MXC VPU ENCODER debugging"
-	depends on MXC_VPU_ENCODER != n
-	help
-	  This is an option for the developers; most people should
-	  say N here.  This enables MXC VPU driver debugging.
-
-endmenu
diff --git a/drivers/mxc/vpu_windsor/Kconfig b/drivers/mxc/vpu_windsor/Kconfig
new file mode 100644
index 000000000000..11562a6475c6
--- /dev/null
+++ b/drivers/mxc/vpu_windsor/Kconfig
@@ -0,0 +1,25 @@
+#
+# Codec configuration
+#
+
+menu "MXC VPU(Video Processing Unit) WINDSOR ENCODER support"
+
+config MXC_VPU_WINDSOR
+	  tristate "Support for MXC VPU(Video Processing Unit) WINDSOR ENCODER"
+	  depends on MEDIA_SUPPORT
+	  depends on VIDEO_DEV
+	  depends on VIDEO_V4L2
+	  select VIDEOBUF2_DMA_CONTIG
+	  select VIDEOBUF2_VMALLOC
+	  default y
+	---help---
+	  The VPU codec device provides codec function for H.264 etc.
+
+config MXC_VPU_WINDSOR_DEBUG
+	bool "MXC VPU WINDSOR ENCODER debugging"
+	depends on MXC_VPU_WINDSOR != n
+	help
+	  This is an option for the developers; most people should
+	  say N here.  This enables MXC VPU WINDSOR Encoder driver debugging.
+
+endmenu
diff --git a/drivers/mxc/vpu-encoder-b0/Makefile b/drivers/mxc/vpu_windsor/Makefile
index a71500655db2..14bbfe66cb55 100644
--- a/drivers/mxc/vpu-encoder-b0/Makefile
+++ b/drivers/mxc/vpu_windsor/Makefile
@@ -4,12 +4,12 @@
 
 EXTRA_CFLAGS += $(DEFINES)
 
-obj-$(CONFIG_MXC_VPU_ENCODER) = vpu-encoder.o
-vpu-encoder-objs = vpu_encoder_b0.o \
+obj-$(CONFIG_MXC_VPU_WINDSOR) = vpu-windsor.o
+vpu-windsor-objs = vpu_encoder_b0.o \
 	vpu_encoder_ctrl.o \
 	vpu_event_msg.o \
 	vpu_encoder_mem.o \
 	vpu_encoder_rpc.o
 
 clean:
-	rm -rf $(vpu-encoder-objs)
+	rm -rf $(vpu-windsor-objs)
diff --git a/drivers/mxc/vpu-encoder-b0/mediasys_types.h b/drivers/mxc/vpu_windsor/mediasys_types.h
index 62a187ae1dd7..62a187ae1dd7 100644
--- a/drivers/mxc/vpu-encoder-b0/mediasys_types.h
+++ b/drivers/mxc/vpu_windsor/mediasys_types.h
diff --git a/drivers/mxc/vpu-encoder-b0/vpu_encoder_b0.c b/drivers/mxc/vpu_windsor/vpu_encoder_b0.c
index 5c9ff867fe09..5c9ff867fe09 100644
--- a/drivers/mxc/vpu-encoder-b0/vpu_encoder_b0.c
+++ b/drivers/mxc/vpu_windsor/vpu_encoder_b0.c
diff --git a/drivers/mxc/vpu-encoder-b0/vpu_encoder_b0.h b/drivers/mxc/vpu_windsor/vpu_encoder_b0.h
index 48c32ed85a62..48c32ed85a62 100644
--- a/drivers/mxc/vpu-encoder-b0/vpu_encoder_b0.h
+++ b/drivers/mxc/vpu_windsor/vpu_encoder_b0.h
diff --git a/drivers/mxc/vpu-encoder-b0/vpu_encoder_config.h b/drivers/mxc/vpu_windsor/vpu_encoder_config.h
index 2b7dbf1357cc..2b7dbf1357cc 100644
--- a/drivers/mxc/vpu-encoder-b0/vpu_encoder_config.h
+++ b/drivers/mxc/vpu_windsor/vpu_encoder_config.h
diff --git a/drivers/mxc/vpu-encoder-b0/vpu_encoder_ctrl.c b/drivers/mxc/vpu_windsor/vpu_encoder_ctrl.c
index 37aee18aabf6..37aee18aabf6 100644
--- a/drivers/mxc/vpu-encoder-b0/vpu_encoder_ctrl.c
+++ b/drivers/mxc/vpu_windsor/vpu_encoder_ctrl.c
diff --git a/drivers/mxc/vpu-encoder-b0/vpu_encoder_ctrl.h b/drivers/mxc/vpu_windsor/vpu_encoder_ctrl.h
index 5fc98187dc6d..5fc98187dc6d 100644
--- a/drivers/mxc/vpu-encoder-b0/vpu_encoder_ctrl.h
+++ b/drivers/mxc/vpu_windsor/vpu_encoder_ctrl.h
diff --git a/drivers/mxc/vpu-encoder-b0/vpu_encoder_mem.c b/drivers/mxc/vpu_windsor/vpu_encoder_mem.c
index 61bc87e5016f..61bc87e5016f 100644
--- a/drivers/mxc/vpu-encoder-b0/vpu_encoder_mem.c
+++ b/drivers/mxc/vpu_windsor/vpu_encoder_mem.c
diff --git a/drivers/mxc/vpu-encoder-b0/vpu_encoder_mem.h b/drivers/mxc/vpu_windsor/vpu_encoder_mem.h
index 2d9673b26e64..2d9673b26e64 100644
--- a/drivers/mxc/vpu-encoder-b0/vpu_encoder_mem.h
+++ b/drivers/mxc/vpu_windsor/vpu_encoder_mem.h
diff --git a/drivers/mxc/vpu-encoder-b0/vpu_encoder_rpc.c b/drivers/mxc/vpu_windsor/vpu_encoder_rpc.c
index f670a940c8db..f670a940c8db 100644
--- a/drivers/mxc/vpu-encoder-b0/vpu_encoder_rpc.c
+++ b/drivers/mxc/vpu_windsor/vpu_encoder_rpc.c
diff --git a/drivers/mxc/vpu-encoder-b0/vpu_encoder_rpc.h b/drivers/mxc/vpu_windsor/vpu_encoder_rpc.h
index 934b542a4929..934b542a4929 100644
--- a/drivers/mxc/vpu-encoder-b0/vpu_encoder_rpc.h
+++ b/drivers/mxc/vpu_windsor/vpu_encoder_rpc.h
diff --git a/drivers/mxc/vpu-encoder-b0/vpu_event_msg.c b/drivers/mxc/vpu_windsor/vpu_event_msg.c
index 6bb668f38e68..6bb668f38e68 100644
--- a/drivers/mxc/vpu-encoder-b0/vpu_event_msg.c
+++ b/drivers/mxc/vpu_windsor/vpu_event_msg.c
diff --git a/drivers/mxc/vpu-encoder-b0/vpu_event_msg.h b/drivers/mxc/vpu_windsor/vpu_event_msg.h
index cc02956eab6c..cc02956eab6c 100644
--- a/drivers/mxc/vpu-encoder-b0/vpu_event_msg.h
+++ b/drivers/mxc/vpu_windsor/vpu_event_msg.h