From: Konrad Dybcio <konradybcio@kernel.org>
Add the required nodes to enable Venus on sc8280xp.
Signed-off-by: Konrad Dybcio <konrad.dybcio@linaro.org>
[ johan: use sm8350 videocc defines ]
Signed-off-by: Johan Hovold <johan+linaro@kernel.org>
[ bod: dropped video encoder/decoder declarations ]
[ bod: added interconnect tags ]
Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
---
arch/arm64/boot/dts/qcom/sc8280xp.dtsi | 82 ++++++++++++++++++++++++++++++++++
1 file changed, 82 insertions(+)
diff --git a/arch/arm64/boot/dts/qcom/sc8280xp.dtsi b/arch/arm64/boot/dts/qcom/sc8280xp.dtsi
index 01501acb1790a..fe8aa24d5d51e 100644
--- a/arch/arm64/boot/dts/qcom/sc8280xp.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc8280xp.dtsi
@@ -10,6 +10,8 @@
#include <dt-bindings/clock/qcom,rpmh.h>
#include <dt-bindings/clock/qcom,sc8280xp-camcc.h>
#include <dt-bindings/clock/qcom,sc8280xp-lpasscc.h>
+#include <dt-bindings/clock/qcom,sm8350-videocc.h>
+#include <dt-bindings/interconnect/qcom,icc.h>
#include <dt-bindings/interconnect/qcom,osm-l3.h>
#include <dt-bindings/interconnect/qcom,sc8280xp.h>
#include <dt-bindings/interrupt-controller/arm-gic.h>
@@ -690,6 +692,11 @@ reserved-region@85b00000 {
no-map;
};
+ pil_video_mem: pil_video_region@86700000 {
+ reg = <0 0x86700000 0 0x500000>;
+ no-map;
+ };
+
pil_adsp_mem: adsp-region@86c00000 {
reg = <0 0x86c00000 0 0x2000000>;
no-map;
@@ -3699,6 +3706,81 @@ usb_1_dwc3_ss: endpoint {
};
};
+ venus: video-codec@aa00000 {
+ compatible = "qcom,sm8350-venus";
+ reg = <0 0x0aa00000 0 0x100000>;
+ interrupts = <GIC_SPI 174 IRQ_TYPE_LEVEL_HIGH>;
+
+ clocks = <&gcc GCC_VIDEO_AXI0_CLK>,
+ <&videocc VIDEO_CC_MVS0C_CLK>,
+ <&videocc VIDEO_CC_MVS0_CLK>;
+ clock-names = "iface",
+ "core",
+ "vcodec0_core";
+ power-domains = <&videocc MVS0C_GDSC>,
+ <&videocc MVS0_GDSC>,
+ <&rpmhpd SC8280XP_MX>;
+ power-domain-names = "venus",
+ "vcodec0",
+ "mx";
+
+ resets = <&gcc GCC_VIDEO_AXI0_CLK_ARES>;
+ reset-names = "core";
+
+ interconnects = <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ACTIVE_ONLY
+ &config_noc SLAVE_VENUS_CFG QCOM_ICC_TAG_ACTIVE_ONLY>,
+ <&mmss_noc MASTER_VIDEO_P0 QCOM_ICC_TAG_ALWAYS
+ &mc_virt SLAVE_EBI1 QCOM_ICC_TAG_ALWAYS>,
+ <&mmss_noc MASTER_VIDEO_P0 QCOM_ICC_TAG_ALWAYS
+ &gem_noc SLAVE_LLCC QCOM_ICC_TAG_ALWAYS>;
+ interconnect-names = "cpu-cfg",
+ "video-mem",
+ "video-llcc";
+
+ operating-points-v2 = <&venus_opp_table>;
+ iommus = <&apps_smmu 0x2e00 0x400>;
+ memory-region = <&pil_video_mem>;
+
+ status = "disabled";
+
+ venus_opp_table: opp-table {
+ compatible = "operating-points-v2";
+
+ opp-720000000 {
+ opp-hz = /bits/ 64 <720000000>;
+ required-opps = <&rpmhpd_opp_low_svs>;
+ };
+
+ opp-1014000000 {
+ opp-hz = /bits/ 64 <1014000000>;
+ required-opps = <&rpmhpd_opp_svs>;
+ };
+
+ opp-1098000000 {
+ opp-hz = /bits/ 64 <1098000000>;
+ required-opps = <&rpmhpd_opp_svs_l1>;
+ };
+
+ opp-1332000000 {
+ opp-hz = /bits/ 64 <1332000000>;
+ required-opps = <&rpmhpd_opp_nom>;
+ };
+ };
+ };
+
+ videocc: clock-controller@abf0000 {
+ compatible = "qcom,sc8280xp-videocc";
+ reg = <0 0x0abf0000 0 0x10000>;
+ clocks = <&rpmhcc RPMH_CXO_CLK>,
+ <&rpmhcc RPMH_CXO_CLK_A>,
+ <&sleep_clk>;
+ power-domains = <&rpmhpd SC8280XP_MMCX>;
+ required-opps = <&rpmhpd_opp_low_svs>;
+ #clock-cells = <1>;
+ #reset-cells = <1>;
+ #power-domain-cells = <1>;
+ };
+
cci0: cci@ac4a000 {
compatible = "qcom,sc8280xp-cci", "qcom,msm8996-cci";
reg = <0 0x0ac4a000 0 0x1000>;
--
2.47.2On 04/03/2025 14:07, Bryan O'Donoghue wrote:
> From: Konrad Dybcio <konradybcio@kernel.org>
>
> Add the required nodes to enable Venus on sc8280xp.
>
> Signed-off-by: Konrad Dybcio <konrad.dybcio@linaro.org>
SoB and From do not match.
> [ johan: use sm8350 videocc defines ]
> Signed-off-by: Johan Hovold <johan+linaro@kernel.org>
> [ bod: dropped video encoder/decoder declarations ]
> [ bod: added interconnect tags ]
> Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
> ---
> arch/arm64/boot/dts/qcom/sc8280xp.dtsi | 82 ++++++++++++++++++++++++++++++++++
> 1 file changed, 82 insertions(+)
>
> diff --git a/arch/arm64/boot/dts/qcom/sc8280xp.dtsi b/arch/arm64/boot/dts/qcom/sc8280xp.dtsi
> index 01501acb1790a..fe8aa24d5d51e 100644
> --- a/arch/arm64/boot/dts/qcom/sc8280xp.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sc8280xp.dtsi
> @@ -10,6 +10,8 @@
> #include <dt-bindings/clock/qcom,rpmh.h>
> #include <dt-bindings/clock/qcom,sc8280xp-camcc.h>
> #include <dt-bindings/clock/qcom,sc8280xp-lpasscc.h>
> +#include <dt-bindings/clock/qcom,sm8350-videocc.h>
> +#include <dt-bindings/interconnect/qcom,icc.h>
> #include <dt-bindings/interconnect/qcom,osm-l3.h>
> #include <dt-bindings/interconnect/qcom,sc8280xp.h>
> #include <dt-bindings/interrupt-controller/arm-gic.h>
> @@ -690,6 +692,11 @@ reserved-region@85b00000 {
> no-map;
> };
>
> + pil_video_mem: pil_video_region@86700000 {
No underscores in node names.
> + reg = <0 0x86700000 0 0x500000>;
> + no-map;
> + };
Best regards,
Krzysztof
On 4.03.2025 3:02 PM, Krzysztof Kozlowski wrote: > On 04/03/2025 14:07, Bryan O'Donoghue wrote: >> From: Konrad Dybcio <konradybcio@kernel.org> >> >> Add the required nodes to enable Venus on sc8280xp. >> >> Signed-off-by: Konrad Dybcio <konrad.dybcio@linaro.org> > > > SoB and From do not match. .mailmap breaks this I previously worked around this by kicking the relevant entries from the file, but that in turn broke base-commit in the cover letter Konrad
On Tue, Mar 04, 2025 at 05:41:27PM +0100, Konrad Dybcio wrote: > On 4.03.2025 3:02 PM, Krzysztof Kozlowski wrote: > > On 04/03/2025 14:07, Bryan O'Donoghue wrote: > >> From: Konrad Dybcio <konradybcio@kernel.org> > >> > >> Add the required nodes to enable Venus on sc8280xp. > >> > >> Signed-off-by: Konrad Dybcio <konrad.dybcio@linaro.org> > > > > > > SoB and From do not match. > > .mailmap breaks this > > I previously worked around this by kicking the relevant entries from the > file, but that in turn broke base-commit in the cover letter You can override that by using 'b4 --edit-deps' -- With best wishes Dmitry
On 04/03/2025 16:41, Konrad Dybcio wrote: > On 4.03.2025 3:02 PM, Krzysztof Kozlowski wrote: >> On 04/03/2025 14:07, Bryan O'Donoghue wrote: >>> From: Konrad Dybcio <konradybcio@kernel.org> >>> >>> Add the required nodes to enable Venus on sc8280xp. >>> >>> Signed-off-by: Konrad Dybcio <konrad.dybcio@linaro.org> >> >> >> SoB and From do not match. > > .mailmap breaks this > > I previously worked around this by kicking the relevant entries from the > file, but that in turn broke base-commit in the cover letter > > Konrad OK with you if I switch your email to kernel.org here ? --- bod
On 4.03.2025 5:49 PM, Bryan O'Donoghue wrote: > On 04/03/2025 16:41, Konrad Dybcio wrote: >> On 4.03.2025 3:02 PM, Krzysztof Kozlowski wrote: >>> On 04/03/2025 14:07, Bryan O'Donoghue wrote: >>>> From: Konrad Dybcio <konradybcio@kernel.org> >>>> >>>> Add the required nodes to enable Venus on sc8280xp. >>>> >>>> Signed-off-by: Konrad Dybcio <konrad.dybcio@linaro.org> >>> >>> >>> SoB and From do not match. >> >> .mailmap breaks this >> >> I previously worked around this by kicking the relevant entries from the >> file, but that in turn broke base-commit in the cover letter >> >> Konrad > > OK with you if I switch your email to kernel.org here ? I personally don't mind as I'm still the same person, not sure if Linaro will be a fan of removing their name from the author field though Konrad
© 2016 - 2026 Red Hat, Inc.