The following changes since commit 45040f675041956ad763f9ef139ecee3647aa8bb: media: hantro: IMX8M: add variant for G2/HEVC codec (2021-06-08 16:13:53 +0200) are available in the Git repository at: git://linuxtv.org/hverkuil/media_tree.git tags/br-v5.14o for you to fetch changes up to e47575ad338b8b303884d7d820c1f4b73bf464fc: media: hantro: add support for Rockchip RK3036 (2021-06-15 15:39:35 +0200) ---------------------------------------------------------------- Tag branch ---------------------------------------------------------------- Alex Bee (6): dt-bindings: media: rockchip-vpu: add new compatibles dt-bindings: media: rockchip-vdec: add RK3228 compatible media: hantro: reorder variants media: hantro: merge Rockchip platform drivers media: hantro: add support for Rockchip RK3066 media: hantro: add support for Rockchip RK3036 Documentation/devicetree/bindings/media/rockchip,vdec.yaml | 10 +- Documentation/devicetree/bindings/media/rockchip-vpu.yaml | 33 +- drivers/staging/media/hantro/Makefile | 9 +- drivers/staging/media/hantro/hantro_drv.c | 6 +- drivers/staging/media/hantro/hantro_hw.h | 32 +- drivers/staging/media/hantro/rk3288_vpu_hw.c | 208 ------------- drivers/staging/media/hantro/rk3399_vpu_hw.c | 222 -------------- .../hantro/{rk3399_vpu_hw_jpeg_enc.c => rockchip_vpu2_hw_jpeg_enc.c} | 30 +- .../{rk3399_vpu_hw_mpeg2_dec.c => rockchip_vpu2_hw_mpeg2_dec.c} | 25 +- .../hantro/{rk3399_vpu_hw_vp8_dec.c => rockchip_vpu2_hw_vp8_dec.c} | 2 +- .../staging/media/hantro/{rk3399_vpu_regs.h => rockchip_vpu2_regs.h} | 6 +- drivers/staging/media/hantro/rockchip_vpu_hw.c | 526 ++++++++++++++++++++++++++++++++ 12 files changed, 616 insertions(+), 493 deletions(-) delete mode 100644 drivers/staging/media/hantro/rk3288_vpu_hw.c delete mode 100644 drivers/staging/media/hantro/rk3399_vpu_hw.c rename drivers/staging/media/hantro/{rk3399_vpu_hw_jpeg_enc.c => rockchip_vpu2_hw_jpeg_enc.c} (87%) rename drivers/staging/media/hantro/{rk3399_vpu_hw_mpeg2_dec.c => rockchip_vpu2_hw_mpeg2_dec.c} (94%) rename drivers/staging/media/hantro/{rk3399_vpu_hw_vp8_dec.c => rockchip_vpu2_hw_vp8_dec.c} (99%) rename drivers/staging/media/hantro/{rk3399_vpu_regs.h => rockchip_vpu2_regs.h} (99%) create mode 100644 drivers/staging/media/hantro/rockchip_vpu_hw.c