On Fri, 31 May 2019 10:55:14 +0200
Philipp Zabel <p.zabel@xxxxxxxxxxxxxx> wrote:
> 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: Philipp Zabel <p.zabel@xxxxxxxxxxxxxx>
> Reviewed-by: Boris Brezillon <boris.brezillon@xxxxxxxxxxxxx>
> ---
> MAINTAINERS | 4 +-
> drivers/staging/media/Kconfig | 2 +-
> drivers/staging/media/Makefile | 2 +-
> .../media/{rockchip/vpu => hantro}/Kconfig | 11 +-
> drivers/staging/media/hantro/Makefile | 13 +
> .../media/{rockchip/vpu => hantro}/TODO | 0
> .../vpu/rockchip_vpu.h => hantro/hantro.h} | 136 +++++-----
> .../hantro_drv.c} | 251 +++++++++---------
> .../hantro_g1_mpeg2_dec.c} | 55 ++--
> .../hantro_h1_jpeg_enc.c} | 44 +--
> drivers/staging/media/hantro/hantro_hw.h | 102 +++++++
> .../hantro_jpeg.c} | 18 +-
> drivers/staging/media/hantro/hantro_jpeg.h | 13 +
> .../hantro_mpeg2.c} | 14 +-
> .../hantro_v4l2.c} | 234 ++++++++--------
> .../hantro_v4l2.h} | 16 +-
> .../{rockchip/vpu => hantro}/rk3288_vpu_hw.c | 64 ++---
> .../vpu => hantro}/rk3288_vpu_regs.h | 2 +-
> .../{rockchip/vpu => hantro}/rk3399_vpu_hw.c | 64 ++---
> .../vpu => hantro}/rk3399_vpu_hw_jpeg_enc.c | 32 +--
> .../vpu => hantro}/rk3399_vpu_hw_mpeg2_dec.c | 37 ++-
> .../vpu => hantro}/rk3399_vpu_regs.h | 2 +-
> drivers/staging/media/rockchip/vpu/Makefile | 14 -
> .../media/rockchip/vpu/rockchip_vpu_hw.h | 103 -------
> .../media/rockchip/vpu/rockchip_vpu_jpeg.h | 14 -
> 25 files changed, 616 insertions(+), 631 deletions(-)
> rename drivers/staging/media/{rockchip/vpu => hantro}/Kconfig (59%)
> create mode 100644 drivers/staging/media/hantro/Makefile
> rename drivers/staging/media/{rockchip/vpu => hantro}/TODO (100%)
> rename drivers/staging/media/{rockchip/vpu/rockchip_vpu.h => hantro/hantro.h} (69%)
> rename drivers/staging/media/{rockchip/vpu/rockchip_vpu_drv.c => hantro/hantro_drv.c} (74%)
> rename drivers/staging/media/{rockchip/vpu/rk3288_vpu_hw_mpeg2_dec.c => hantro/hantro_g1_mpeg2_dec.c} (87%)
> rename drivers/staging/media/{rockchip/vpu/rk3288_vpu_hw_jpeg_enc.c => hantro/hantro_h1_jpeg_enc.c} (76%)
> create mode 100644 drivers/staging/media/hantro/hantro_hw.h
> rename drivers/staging/media/{rockchip/vpu/rockchip_vpu_jpeg.c => hantro/hantro_jpeg.c} (95%)
> create mode 100644 drivers/staging/media/hantro/hantro_jpeg.h
> rename drivers/staging/media/{rockchip/vpu/rockchip_vpu_mpeg2.c => hantro/hantro_mpeg2.c} (79%)
> rename drivers/staging/media/{rockchip/vpu/rockchip_vpu_v4l2.c => hantro/hantro_v4l2.c} (69%)
> rename drivers/staging/media/{rockchip/vpu/rockchip_vpu_v4l2.h => hantro/hantro_v4l2.h} (53%)
> rename drivers/staging/media/{rockchip/vpu => hantro}/rk3288_vpu_hw.c (68%)
> rename drivers/staging/media/{rockchip/vpu => hantro}/rk3288_vpu_regs.h (99%)
Didn't notice that in my initial review, but rk3288_vpu_regs.h should
be split in 2: hantro_{g1,h1}_regs.h (g1 being the decoder part and h1
the encoder).
> rename drivers/staging/media/{rockchip/vpu => hantro}/rk3399_vpu_hw.c (69%)
> rename drivers/staging/media/{rockchip/vpu => hantro}/rk3399_vpu_hw_jpeg_enc.c (86%)
> rename drivers/staging/media/{rockchip/vpu => hantro}/rk3399_vpu_hw_mpeg2_dec.c (92%)
> rename drivers/staging/media/{rockchip/vpu => hantro}/rk3399_vpu_regs.h (99%)
Same here, rk3399_vpu_regs.h should be split into hantro_{g2,h2}_regs.h
(I still need to make sure this is actually a g2/h2 combo we have on
this SoC). That's also true for the
rk3399_vpu_hw_{mpeg2_dec,jpeg_enc}.c files: they should be renamed
hantro_{g2_mpeg2_dec,h2_jpeg_enc}.c
> delete mode 100644 drivers/staging/media/rockchip/vpu/Makefile
> delete mode 100644 drivers/staging/media/rockchip/vpu/rockchip_vpu_hw.h
> delete mode 100644 drivers/staging/media/rockchip/vpu/rockchip_vpu_jpeg.h
