Commit 354846c3 authored by Bryan O'Donoghue's avatar Bryan O'Donoghue Committed by Hans Verkuil
Browse files

media: venus: Populate video encoder/decoder nodename entries 



Populate encoder and decoder node-name entries for the upstream parts. Once
done the compat="video-encoder" and compat="video-decoder" in the dtsi can
be dropped though the venus driver will continue to favour DT declared
video-encoder/video-decoder declarations over static declarations for
compatibility.

Tested-by: default avatarRenjiang Han <quic_renjiang@quicinc.com>
Signed-off-by: default avatarBryan O'Donoghue <bryan.odonoghue@linaro.org>
Signed-off-by: default avatarStanimir Varbanov <stanimir.k.varbanov@gmail.com>
Signed-off-by: default avatarHans Verkuil <hverkuil@xs4all.nl>
parent 687bfbba

drivers/media/platform/qcom/venus/core.c

+10 −0
Original line number Diff line number Diff line
@@ -671,6 +671,8 @@ static const struct venus_resources msm8916_res = { 
	.vmem_addr = 0,

	.dma_mask = 0xddc00000 - 1,

	.fwname = "qcom/venus-1.8/venus.mbn",

	.dec_nodename = "video-decoder",

	.enc_nodename = "video-encoder",

};



static const struct freq_tbl msm8996_freq_table[] = {
@@ -880,6 +882,8 @@ static const struct venus_resources sdm845_res_v2 = { 
	.cp_nonpixel_start = 0x1000000,

	.cp_nonpixel_size = 0x24800000,

	.fwname = "qcom/venus-5.2/venus.mbn",

	.dec_nodename = "video-core0",

	.enc_nodename = "video-core1",

};



static const struct freq_tbl sc7180_freq_table[] = {
@@ -928,6 +932,8 @@ static const struct venus_resources sc7180_res = { 
	.cp_nonpixel_start = 0x1000000,

	.cp_nonpixel_size = 0x24800000,

	.fwname = "qcom/venus-5.4/venus.mbn",

	.dec_nodename = "video-decoder",

	.enc_nodename = "video-encoder",

};



static const struct freq_tbl sm8250_freq_table[] = {
@@ -983,6 +989,8 @@ static const struct venus_resources sm8250_res = { 
	.vmem_addr = 0,

	.dma_mask = 0xe0000000 - 1,

	.fwname = "qcom/vpu-1.0/venus.mbn",

	.dec_nodename = "video-decoder",

	.enc_nodename = "video-encoder",

};



static const struct freq_tbl sc7280_freq_table[] = {
@@ -1045,6 +1053,8 @@ static const struct venus_resources sc7280_res = { 
	.cp_nonpixel_start = 0x1000000,

	.cp_nonpixel_size = 0x24800000,

	.fwname = "qcom/vpu-2.0/venus.mbn",

	.dec_nodename = "video-decoder",

	.enc_nodename = "video-encoder",

};



static const struct of_device_id venus_dt_match[] = {