arm64: dts: sc7180: Move venus node to the correct position
authorMatthias Kaehlcke <mka@chromium.org>
Thu, 27 Feb 2020 17:26:52 +0000 (09:26 -0800)
committerBjorn Andersson <bjorn.andersson@linaro.org>
Fri, 28 Feb 2020 05:59:56 +0000 (21:59 -0800)
Per convention device nodes for SC7180 should be ordered by address.
This is currently not the case for the venus node, move it to the
correct position.

Reviewed-by: Douglas Anderson <dianders@chromium.org>
Signed-off-by: Matthias Kaehlcke <mka@chromium.org>
Link: https://lore.kernel.org/r/20200227092649.v3.1.I15e0f7eff0c67a2b49d4992f9d80fc1d2fdadf63@changeid
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
arch/arm64/boot/dts/qcom/sc7180.dtsi

index 253274d..31bf210 100644 (file)
                        };
                };
 
+               venus: video-codec@aa00000 {
+                       compatible = "qcom,sc7180-venus";
+                       reg = <0 0x0aa00000 0 0xff000>;
+                       interrupts = <GIC_SPI 174 IRQ_TYPE_LEVEL_HIGH>;
+                       power-domains = <&videocc VENUS_GDSC>,
+                                       <&videocc VCODEC0_GDSC>;
+                       power-domain-names = "venus", "vcodec0";
+                       clocks = <&videocc VIDEO_CC_VENUS_CTL_CORE_CLK>,
+                                <&videocc VIDEO_CC_VENUS_AHB_CLK>,
+                                <&videocc VIDEO_CC_VENUS_CTL_AXI_CLK>,
+                                <&videocc VIDEO_CC_VCODEC0_CORE_CLK>,
+                                <&videocc VIDEO_CC_VCODEC0_AXI_CLK>;
+                       clock-names = "core", "iface", "bus",
+                                     "vcodec0_core", "vcodec0_bus";
+                       iommus = <&apps_smmu 0x0c00 0x60>;
+                       memory-region = <&venus_mem>;
+
+                       video-decoder {
+                               compatible = "venus-decoder";
+                       };
+
+                       video-encoder {
+                               compatible = "venus-encoder";
+                       };
+               };
+
                videocc: clock-controller@ab00000 {
                        compatible = "qcom,sc7180-videocc";
                        reg = <0 0x0ab00000 0 0x10000>;
                        #power-domain-cells = <1>;
                };
 
-               venus: video-codec@aa00000 {
-                       compatible = "qcom,sc7180-venus";
-                       reg = <0 0x0aa00000 0 0xff000>;
-                       interrupts = <GIC_SPI 174 IRQ_TYPE_LEVEL_HIGH>;
-                       power-domains = <&videocc VENUS_GDSC>,
-                                       <&videocc VCODEC0_GDSC>;
-                       power-domain-names = "venus", "vcodec0";
-                       clocks = <&videocc VIDEO_CC_VENUS_CTL_CORE_CLK>,
-                                <&videocc VIDEO_CC_VENUS_AHB_CLK>,
-                                <&videocc VIDEO_CC_VENUS_CTL_AXI_CLK>,
-                                <&videocc VIDEO_CC_VCODEC0_CORE_CLK>,
-                                <&videocc VIDEO_CC_VCODEC0_AXI_CLK>;
-                       clock-names = "core", "iface", "bus",
-                                     "vcodec0_core", "vcodec0_bus";
-                       iommus = <&apps_smmu 0x0c00 0x60>;
-                       memory-region = <&venus_mem>;
-
-                       video-decoder {
-                               compatible = "venus-decoder";
-                       };
-
-                       video-encoder {
-                               compatible = "venus-encoder";
-                       };
-               };
-
                pdc: interrupt-controller@b220000 {
                        compatible = "qcom,sc7180-pdc", "qcom,pdc";
                        reg = <0 0x0b220000 0 0x30000>;