]> git.baikalelectronics.ru Git - kernel.git/commit
media: hantro: merge Rockchip platform drivers
authorAlex Bee <knaerzche@gmail.com>
Mon, 14 Jun 2021 21:32:13 +0000 (23:32 +0200)
committerMauro Carvalho Chehab <mchehab+huawei@kernel.org>
Thu, 17 Jun 2021 08:58:57 +0000 (10:58 +0200)
commitbcc5c0c392fbc65286bc04b29c8c53c3dcab9ab0
treed68450337412f3bc80d1a5517b94776c016ebf45
parente58ab2e9fb76105ceea0e449a8f57a25ec4349c1
media: hantro: merge Rockchip platform drivers

Merge the two Rockchip platform drivers into one as it was suggested at
[1] and [2].
This will hopefully make it easier to add new variants (which are surely
to come for Rockchip).
Also rename from "rk3288" to "v(d/e)pu1" and "rk3399" to "v(d/e)pu2"
where applicable, as this is the dicition the vendor uses and will
also refelect the variants that get added later in this series. Rename
from "rk3288" to "rockchip" if applicable to both hardware versions.

[1] https://patchwork.kernel.org/project/linux-rockchip/patch/20210107134101.195426-6-paul.kocialkowski@bootlin.com/
[2] https://patchwork.kernel.org/project/linux-rockchip/patch/20210525152225.154302-5-knaerzche@gmail.com/

Signed-off-by: Alex Bee <knaerzche@gmail.com>
Reviewed-by: Ezequiel Garcia <ezequiel@collabora.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
13 files changed:
drivers/staging/media/hantro/Makefile
drivers/staging/media/hantro/hantro_hw.h
drivers/staging/media/hantro/rk3288_vpu_hw.c [deleted file]
drivers/staging/media/hantro/rk3399_vpu_hw.c [deleted file]
drivers/staging/media/hantro/rk3399_vpu_hw_jpeg_enc.c [deleted file]
drivers/staging/media/hantro/rk3399_vpu_hw_mpeg2_dec.c [deleted file]
drivers/staging/media/hantro/rk3399_vpu_hw_vp8_dec.c [deleted file]
drivers/staging/media/hantro/rk3399_vpu_regs.h [deleted file]
drivers/staging/media/hantro/rockchip_vpu2_hw_jpeg_enc.c [new file with mode: 0644]
drivers/staging/media/hantro/rockchip_vpu2_hw_mpeg2_dec.c [new file with mode: 0644]
drivers/staging/media/hantro/rockchip_vpu2_hw_vp8_dec.c [new file with mode: 0644]
drivers/staging/media/hantro/rockchip_vpu2_regs.h [new file with mode: 0644]
drivers/staging/media/hantro/rockchip_vpu_hw.c [new file with mode: 0644]