Commit 4b898fed authored by Alex Bee's avatar Alex Bee Committed by Mauro Carvalho Chehab
Browse files

media: hantro: reorder variants 



Reorder variants in hantro driver alphanumeric.

Signed-off-by: default avatarAlex Bee <knaerzche@gmail.com>
Reviewed-by: default avatarEzequiel Garcia <ezequiel@collabora.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent 502cf736

drivers/staging/media/hantro/hantro_drv.c

+2 −2
Original line number Diff line number Diff line
@@ -582,9 +582,9 @@ static const struct v4l2_file_operations hantro_fops = { 


static const struct of_device_id of_hantro_match[] = {

#ifdef CONFIG_VIDEO_HANTRO_ROCKCHIP

	{ .compatible = "rockchip,rk3399-vpu", .data = &rk3399_vpu_variant, },

	{ .compatible = "rockchip,rk3328-vpu", .data = &rk3328_vpu_variant, },

	{ .compatible = "rockchip,rk3288-vpu", .data = &rk3288_vpu_variant, },

	{ .compatible = "rockchip,rk3328-vpu", .data = &rk3328_vpu_variant, },

	{ .compatible = "rockchip,rk3399-vpu", .data = &rk3399_vpu_variant, },

#endif

#ifdef CONFIG_VIDEO_HANTRO_IMX8M

	{ .compatible = "nxp,imx8mq-vpu", .data = &imx8mq_vpu_variant, },

drivers/staging/media/hantro/hantro_hw.h

+4 −4
Original line number Diff line number Diff line
@@ -203,12 +203,12 @@ enum hantro_enc_fmt { 
	RK3288_VPU_ENC_FMT_UYVY422 = 3,

};



extern const struct hantro_variant rk3399_vpu_variant;

extern const struct hantro_variant rk3328_vpu_variant;

extern const struct hantro_variant rk3288_vpu_variant;

extern const struct hantro_variant imx8mq_vpu_g2_variant;

extern const struct hantro_variant imx8mq_vpu_variant;

extern const struct hantro_variant rk3288_vpu_variant;

extern const struct hantro_variant rk3328_vpu_variant;

extern const struct hantro_variant rk3399_vpu_variant;

extern const struct hantro_variant sama5d4_vdec_variant;

extern const struct hantro_variant imx8mq_vpu_g2_variant;



extern const struct hantro_postproc_regs hantro_g1_postproc_regs;