Commit 058bd0a6 authored by Matthias Kaehlcke's avatar Matthias Kaehlcke Committed by Bjorn Andersson
Browse files

arm64: dts: sc7180: Move venus node to the correct position



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: default avatarDouglas Anderson <dianders@chromium.org>
Signed-off-by: default avatarMatthias Kaehlcke <mka@chromium.org>
Link: https://lore.kernel.org/r/20200227092649.v3.1.I15e0f7eff0c67a2b49d4992f9d80fc1d2fdadf63@changeid


Signed-off-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
parent 1222783e
Loading
Loading
Loading
Loading
+26 −26
Original line number Diff line number Diff line
@@ -1376,6 +1376,32 @@
			};
		};

		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>;
@@ -1538,32 +1564,6 @@
			#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>;