diff mbox series

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

Message ID 20200226114017.1.I15e0f7eff0c67a2b49d4992f9d80fc1d2fdadf63@changeid (mailing list archive)
State Superseded
Headers show
Series arm64: dts: sc7180: Move venus node to the correct position | expand

Commit Message

Matthias Kaehlcke Feb. 26, 2020, 7:40 p.m. UTC
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@chromium.org>
---

 arch/arm64/boot/dts/qcom/sc7180.dtsi | 52 ++++++++++++++--------------
 1 file changed, 26 insertions(+), 26 deletions(-)

Comments

Doug Anderson Feb. 26, 2020, 8:40 p.m. UTC | #1
Hi,

On Wed, Feb 26, 2020 at 11:40 AM Matthias Kaehlcke <mka@chromium.org> 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@chromium.org>
> ---
>
>  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>;

Maybe try one more time?

>>> print [hex(x) for x in sorted([0x0aa00000, 0x0a6f8800])]
['0xa6f8800', '0xaa00000']

...makes me convinced that the codec should come _after_ the USB node, no?

-Doug
Matthias Kaehlcke Feb. 26, 2020, 8:44 p.m. UTC | #2
On Wed, Feb 26, 2020 at 12:40:23PM -0800, Doug Anderson wrote:
> Hi,
> 
> On Wed, Feb 26, 2020 at 11:40 AM Matthias Kaehlcke <mka@chromium.org> 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@chromium.org>
> > ---
> >
> >  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>;
> 
> Maybe try one more time?
> 
> >>> print [hex(x) for x in sorted([0x0aa00000, 0x0a6f8800])]
> ['0xa6f8800', '0xaa00000']
> 
> ...makes me convinced that the codec should come _after_ the USB node, no?

indeed, thanks for catching it!
diff mbox series

Patch

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>;