Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a29add8c authored by Philipp Zabel's avatar Philipp Zabel Committed by Mauro Carvalho Chehab
Browse files

media: rockchip/vpu: rename from rockchip to hantro 



Rename the driver and all relevant identifiers from Rockchip to Hantro,
as other Hantro IP based VPU implementations can be supported by the
same driver.
The RK3288 decoder is Hantro G1 based, the encoder is Hantro H1.

This patch just renames, no functional changes.

Signed-off-by: default avatarPhilipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent 4e8c120d

MAINTAINERS

+2 −2
Original line number Diff line number Diff line
@@ -13512,11 +13512,11 @@ S: Maintained 
F:	drivers/media/platform/rockchip/rga/

F:	Documentation/devicetree/bindings/media/rockchip-rga.txt



ROCKCHIP VPU CODEC DRIVER

HANTRO VPU CODEC DRIVER

M:	Ezequiel Garcia <ezequiel@collabora.com>

L:	linux-media@vger.kernel.org

S:	Maintained

F:	drivers/staging/media/platform/rockchip/vpu/

F:	drivers/staging/media/platform/hantro/

F:	Documentation/devicetree/bindings/media/rockchip-vpu.txt



ROCKER DRIVER

drivers/staging/media/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -26,14 +26,14 @@ source "drivers/staging/media/bcm2048/Kconfig" 


source "drivers/staging/media/davinci_vpfe/Kconfig"



source "drivers/staging/media/hantro/Kconfig"



source "drivers/staging/media/imx/Kconfig"



source "drivers/staging/media/meson/vdec/Kconfig"



source "drivers/staging/media/omap4iss/Kconfig"



source "drivers/staging/media/rockchip/vpu/Kconfig"



source "drivers/staging/media/sunxi/Kconfig"



source "drivers/staging/media/tegra-vde/Kconfig"

drivers/staging/media/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -7,6 +7,6 @@ obj-$(CONFIG_VIDEO_MESON_VDEC) += meson/vdec/ 
obj-$(CONFIG_VIDEO_OMAP4)	+= omap4iss/

obj-$(CONFIG_VIDEO_SUNXI)	+= sunxi/

obj-$(CONFIG_TEGRA_VDE)		+= tegra-vde/

obj-$(CONFIG_VIDEO_ROCKCHIP_VPU) += rockchip/vpu/

obj-$(CONFIG_VIDEO_HANTRO)	+= hantro/

obj-$(CONFIG_VIDEO_IPU3_IMGU)	+= ipu3/

obj-$(CONFIG_SOC_CAMERA)	+= soc_camera/

drivers/staging/media/rockchip/vpu/Kconfig→drivers/staging/media/hantro/Kconfig

+23 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

config VIDEO_ROCKCHIP_VPU

	tristate "Rockchip VPU driver"

config VIDEO_HANTRO

	tristate "Hantro VPU driver"

	depends on ARCH_ROCKCHIP || COMPILE_TEST

	depends on VIDEO_DEV && VIDEO_V4L2 && MEDIA_CONTROLLER

	depends on MEDIA_CONTROLLER_REQUEST_API
@@ -8,7 +8,16 @@ config VIDEO_ROCKCHIP_VPU 
	select VIDEOBUF2_VMALLOC

	select V4L2_MEM2MEM_DEV

	help

	  Support for the Video Processing Unit present on Rockchip SoC,

	  which accelerates video and image encoding and decoding.

	  Support for the Hantro IP based Video Processing Unit present on

	  Rockchip SoC, which accelerates video and image encoding and

	  decoding.

	  To compile this driver as a module, choose M here: the module

	  will be called rockchip-vpu.
 
	  will be called hantro-vpu.



config VIDEO_HANTRO_ROCKCHIP

	bool "Hantro VPU Rockchip support"

	depends on VIDEO_HANTRO

	depends on ARCH_ROCKCHIP || COMPILE_TEST

	default y

	help

	  Enable support for RK3288 and RK3399 SoCs.

drivers/staging/media/hantro/Makefile

0 → 100644
+15 −0
Original line number Diff line number Diff line 
obj-$(CONFIG_VIDEO_HANTRO) += hantro-vpu.o



hantro-vpu-y += \

		hantro_drv.o \

		hantro_v4l2.o \

		hantro_h1_jpeg_enc.o \

		hantro_g1_mpeg2_dec.o \

		rk3399_vpu_hw_jpeg_enc.o \

		rk3399_vpu_hw_mpeg2_dec.o \

		hantro_jpeg.o \

		hantro_mpeg2.o



hantro-vpu-$(CONFIG_VIDEO_HANTRO_ROCKCHIP) += \

		rk3288_vpu_hw.o \

		rk3399_vpu_hw.o