* [PATCH] arm64: dts: sc7180: Move venus node to the correct position
@ 2020-02-26 19:40 Matthias Kaehlcke
2020-02-26 20:40 ` Doug Anderson
0 siblings, 1 reply; 3+ messages in thread
From: Matthias Kaehlcke @ 2020-02-26 19:40 UTC (permalink / raw)
To: Andy Gross, Bjorn Andersson, Rob Herring, Mark Rutland, Dikshita Agarwal
Cc: linux-arm-msm, Douglas Anderson, linux-kernel, devicetree,
Matthias Kaehlcke
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>;
@@ -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>;
--
2.25.1.481.gfbce0eb801-goog
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] arm64: dts: sc7180: Move venus node to the correct position
2020-02-26 19:40 [PATCH] arm64: dts: sc7180: Move venus node to the correct position Matthias Kaehlcke
@ 2020-02-26 20:40 ` Doug Anderson
2020-02-26 20:44 ` Matthias Kaehlcke
0 siblings, 1 reply; 3+ messages in thread
From: Doug Anderson @ 2020-02-26 20:40 UTC (permalink / raw)
To: Matthias Kaehlcke
Cc: Andy Gross, Bjorn Andersson, Rob Herring, Mark Rutland,
Dikshita Agarwal, linux-arm-msm, LKML,
open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS
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
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] arm64: dts: sc7180: Move venus node to the correct position
2020-02-26 20:40 ` Doug Anderson
@ 2020-02-26 20:44 ` Matthias Kaehlcke
0 siblings, 0 replies; 3+ messages in thread
From: Matthias Kaehlcke @ 2020-02-26 20:44 UTC (permalink / raw)
To: Doug Anderson
Cc: Andy Gross, Bjorn Andersson, Rob Herring, Mark Rutland,
Dikshita Agarwal, linux-arm-msm, LKML,
open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS
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!
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-02-26 20:44 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-02-26 19:40 [PATCH] arm64: dts: sc7180: Move venus node to the correct position Matthias Kaehlcke
2020-02-26 20:40 ` Doug Anderson
2020-02-26 20:44 ` Matthias Kaehlcke
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.