On Wed, Feb 26, 2020 at 01:04:55PM -0800, Matthias Kaehlcke wrote:
> 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.
>
> Signed-off-by: Matthias Kaehlcke <mka@xxxxxxxxxxxx>
> ---
> Excuses for sending v2 so shortly after v1, it seems ok in this case
> since v1 is obviously wrong and the patch is not likely to be
> controversial otherwise.
>
> Changes in v2:
> - insert the venus node *after* the usb@a6f8800 node, not before
>
> arch/arm64/boot/dts/qcom/sc7180.dtsi | 52 ++++++++++++++--------------
> 1 file changed, 26 insertions(+), 26 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/qcom/sc7180.dtsi b/arch/arm64/boot/dts/qcom/sc7180.dtsi
> index 253274d5f04c..5f97945e16a4 100644
> --- a/arch/arm64/boot/dts/qcom/sc7180.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sc7180.dtsi
> @@ -1332,6 +1332,32 @@ system-cache-controller@9200000 {
> interrupts = <GIC_SPI 582 IRQ_TYPE_LEVEL_HIGH>;
> };
>
> + 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";
> + };
> + };
> +
> usb_1: usb@a6f8800 {
> compatible = "qcom,sc7180-dwc3", "qcom,dwc3";
> reg = <0 0x0a6f8800 0 0x400>;
> @@ -1538,32 +1564,6 @@ dispcc: clock-controller@af00000 {
> #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>;
The patch has still the same problem, it would have helped to run
'git commit -a --amend', instead of 'git commit --amend' :(
