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)
commitc9caebd57b3a0e3fc981bfc9e79de5c4086e0c1b
treed68450337412f3bc80d1a5517b94776c016ebf45
parent4b898fedeb26c4d09b83a2c5a3246a34ab99e216
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>
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/rockchip_vpu2_hw_jpeg_enc.c [moved from drivers/staging/media/hantro/rk3399_vpu_hw_jpeg_enc.c with 87% similarity]
drivers/staging/media/hantro/rockchip_vpu2_hw_mpeg2_dec.c [moved from drivers/staging/media/hantro/rk3399_vpu_hw_mpeg2_dec.c with 94% similarity]
drivers/staging/media/hantro/rockchip_vpu2_hw_vp8_dec.c [moved from drivers/staging/media/hantro/rk3399_vpu_hw_vp8_dec.c with 99% similarity]
drivers/staging/media/hantro/rockchip_vpu2_regs.h [moved from drivers/staging/media/hantro/rk3399_vpu_regs.h with 99% similarity]
drivers/staging/media/hantro/rockchip_vpu_hw.c [new file with mode: 0644]