From efcb9583560e04a8448e76485b5f9c8208d7efb6 Mon Sep 17 00:00:00 2001 From: Jeffy Chen Date: Wed, 1 Jun 2016 16:43:23 +0800 Subject: [PATCH] CHROMIUM: [media] rk3288-vpu: move rk3288-vpu to rockchip-vpu Change-Id: I4c884307550b0782c29a482d5df6793132c3a9ff Signed-off-by: Jeffy Chen Signed-off-by: Yakir Yang --- drivers/media/platform/Kconfig | 8 ++++---- drivers/media/platform/Makefile | 2 +- .../media/platform/{rk3288-vpu => rockchip-vpu}/Makefile | 4 ++-- .../platform/{rk3288-vpu => rockchip-vpu}/rk3288_vpu.c | 0 .../{rk3288-vpu => rockchip-vpu}/rk3288_vpu_common.h | 0 .../{rk3288-vpu => rockchip-vpu}/rk3288_vpu_dec.c | 0 .../{rk3288-vpu => rockchip-vpu}/rk3288_vpu_dec.h | 0 .../{rk3288-vpu => rockchip-vpu}/rk3288_vpu_enc.c | 0 .../{rk3288-vpu => rockchip-vpu}/rk3288_vpu_enc.h | 0 .../platform/{rk3288-vpu => rockchip-vpu}/rk3288_vpu_hw.c | 0 .../platform/{rk3288-vpu => rockchip-vpu}/rk3288_vpu_hw.h | 0 .../{rk3288-vpu => rockchip-vpu}/rk3288_vpu_hw_h264d.c | 0 .../{rk3288-vpu => rockchip-vpu}/rk3288_vpu_hw_vp8d.c | 0 .../{rk3288-vpu => rockchip-vpu}/rk3288_vpu_hw_vp8e.c | 0 .../{rk3288-vpu => rockchip-vpu}/rk3288_vpu_regs.h | 0 15 files changed, 7 insertions(+), 7 deletions(-) rename drivers/media/platform/{rk3288-vpu => rockchip-vpu}/Makefile (62%) rename drivers/media/platform/{rk3288-vpu => rockchip-vpu}/rk3288_vpu.c (100%) rename drivers/media/platform/{rk3288-vpu => rockchip-vpu}/rk3288_vpu_common.h (100%) rename drivers/media/platform/{rk3288-vpu => rockchip-vpu}/rk3288_vpu_dec.c (100%) rename drivers/media/platform/{rk3288-vpu => rockchip-vpu}/rk3288_vpu_dec.h (100%) rename drivers/media/platform/{rk3288-vpu => rockchip-vpu}/rk3288_vpu_enc.c (100%) rename drivers/media/platform/{rk3288-vpu => rockchip-vpu}/rk3288_vpu_enc.h (100%) rename drivers/media/platform/{rk3288-vpu => rockchip-vpu}/rk3288_vpu_hw.c (100%) rename drivers/media/platform/{rk3288-vpu => rockchip-vpu}/rk3288_vpu_hw.h (100%) rename drivers/media/platform/{rk3288-vpu => rockchip-vpu}/rk3288_vpu_hw_h264d.c (100%) rename drivers/media/platform/{rk3288-vpu => rockchip-vpu}/rk3288_vpu_hw_vp8d.c (100%) rename drivers/media/platform/{rk3288-vpu => rockchip-vpu}/rk3288_vpu_hw_vp8e.c (100%) rename drivers/media/platform/{rk3288-vpu => rockchip-vpu}/rk3288_vpu_regs.h (100%) diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index 3a006fa02e6e..9f3f03bdc1bd 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -267,16 +267,16 @@ config VIDEO_TI_VPE Support for the TI VPE(Video Processing Engine) block found on DRA7XX SoC. -config VIDEO_RK3288_VPU - tristate "Rockchip RK3288 VPU driver" +config VIDEO_ROCKCHIP_VPU + tristate "Rockchip ROCKCHIP VPU driver" depends on VIDEO_DEV && VIDEO_V4L2 select VIDEOBUF2_DMA_CONTIG default n ---help--- - Support for the VPU video codec found on Rockchip RK3288 SoC. + Support for the VPU video codec found on Rockchip SoC. To compile this driver as a module, choose M here: the module - will be called rk3288-vpu. + will be called rockchip-vpu. config VIDEO_TI_VPE_DEBUG bool "VPE debug messages" diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile index 63d3e79c9b49..c52535ead136 100644 --- a/drivers/media/platform/Makefile +++ b/drivers/media/platform/Makefile @@ -54,6 +54,6 @@ obj-$(CONFIG_VIDEO_AM437X_VPFE) += am437x/ obj-$(CONFIG_VIDEO_XILINX) += xilinx/ -obj-$(CONFIG_VIDEO_RK3288_VPU) += rk3288-vpu/ +obj-$(CONFIG_VIDEO_ROCKCHIP_VPU) += rockchip-vpu/ ccflags-y += -I$(srctree)/drivers/media/i2c diff --git a/drivers/media/platform/rk3288-vpu/Makefile b/drivers/media/platform/rockchip-vpu/Makefile similarity index 62% rename from drivers/media/platform/rk3288-vpu/Makefile rename to drivers/media/platform/rockchip-vpu/Makefile index c6024e68c72a..7fb2433f9f58 100644 --- a/drivers/media/platform/rk3288-vpu/Makefile +++ b/drivers/media/platform/rockchip-vpu/Makefile @@ -1,7 +1,7 @@ -obj-$(CONFIG_VIDEO_RK3288_VPU) += rk3288-vpu.o +obj-$(CONFIG_VIDEO_ROCKCHIP_VPU) += rockchip-vpu.o -rk3288-vpu-y += rk3288_vpu.o \ +rockchip-vpu-y += rk3288_vpu.o \ rk3288_vpu_dec.o \ rk3288_vpu_enc.o \ rk3288_vpu_hw.o \ diff --git a/drivers/media/platform/rk3288-vpu/rk3288_vpu.c b/drivers/media/platform/rockchip-vpu/rk3288_vpu.c similarity index 100% rename from drivers/media/platform/rk3288-vpu/rk3288_vpu.c rename to drivers/media/platform/rockchip-vpu/rk3288_vpu.c diff --git a/drivers/media/platform/rk3288-vpu/rk3288_vpu_common.h b/drivers/media/platform/rockchip-vpu/rk3288_vpu_common.h similarity index 100% rename from drivers/media/platform/rk3288-vpu/rk3288_vpu_common.h rename to drivers/media/platform/rockchip-vpu/rk3288_vpu_common.h diff --git a/drivers/media/platform/rk3288-vpu/rk3288_vpu_dec.c b/drivers/media/platform/rockchip-vpu/rk3288_vpu_dec.c similarity index 100% rename from drivers/media/platform/rk3288-vpu/rk3288_vpu_dec.c rename to drivers/media/platform/rockchip-vpu/rk3288_vpu_dec.c diff --git a/drivers/media/platform/rk3288-vpu/rk3288_vpu_dec.h b/drivers/media/platform/rockchip-vpu/rk3288_vpu_dec.h similarity index 100% rename from drivers/media/platform/rk3288-vpu/rk3288_vpu_dec.h rename to drivers/media/platform/rockchip-vpu/rk3288_vpu_dec.h diff --git a/drivers/media/platform/rk3288-vpu/rk3288_vpu_enc.c b/drivers/media/platform/rockchip-vpu/rk3288_vpu_enc.c similarity index 100% rename from drivers/media/platform/rk3288-vpu/rk3288_vpu_enc.c rename to drivers/media/platform/rockchip-vpu/rk3288_vpu_enc.c diff --git a/drivers/media/platform/rk3288-vpu/rk3288_vpu_enc.h b/drivers/media/platform/rockchip-vpu/rk3288_vpu_enc.h similarity index 100% rename from drivers/media/platform/rk3288-vpu/rk3288_vpu_enc.h rename to drivers/media/platform/rockchip-vpu/rk3288_vpu_enc.h diff --git a/drivers/media/platform/rk3288-vpu/rk3288_vpu_hw.c b/drivers/media/platform/rockchip-vpu/rk3288_vpu_hw.c similarity index 100% rename from drivers/media/platform/rk3288-vpu/rk3288_vpu_hw.c rename to drivers/media/platform/rockchip-vpu/rk3288_vpu_hw.c diff --git a/drivers/media/platform/rk3288-vpu/rk3288_vpu_hw.h b/drivers/media/platform/rockchip-vpu/rk3288_vpu_hw.h similarity index 100% rename from drivers/media/platform/rk3288-vpu/rk3288_vpu_hw.h rename to drivers/media/platform/rockchip-vpu/rk3288_vpu_hw.h diff --git a/drivers/media/platform/rk3288-vpu/rk3288_vpu_hw_h264d.c b/drivers/media/platform/rockchip-vpu/rk3288_vpu_hw_h264d.c similarity index 100% rename from drivers/media/platform/rk3288-vpu/rk3288_vpu_hw_h264d.c rename to drivers/media/platform/rockchip-vpu/rk3288_vpu_hw_h264d.c diff --git a/drivers/media/platform/rk3288-vpu/rk3288_vpu_hw_vp8d.c b/drivers/media/platform/rockchip-vpu/rk3288_vpu_hw_vp8d.c similarity index 100% rename from drivers/media/platform/rk3288-vpu/rk3288_vpu_hw_vp8d.c rename to drivers/media/platform/rockchip-vpu/rk3288_vpu_hw_vp8d.c diff --git a/drivers/media/platform/rk3288-vpu/rk3288_vpu_hw_vp8e.c b/drivers/media/platform/rockchip-vpu/rk3288_vpu_hw_vp8e.c similarity index 100% rename from drivers/media/platform/rk3288-vpu/rk3288_vpu_hw_vp8e.c rename to drivers/media/platform/rockchip-vpu/rk3288_vpu_hw_vp8e.c diff --git a/drivers/media/platform/rk3288-vpu/rk3288_vpu_regs.h b/drivers/media/platform/rockchip-vpu/rk3288_vpu_regs.h similarity index 100% rename from drivers/media/platform/rk3288-vpu/rk3288_vpu_regs.h rename to drivers/media/platform/rockchip-vpu/rk3288_vpu_regs.h -- 2.34.1