arm64: tegra: Move HDA into the correct bus
Subsystems (2)
PATCH 1/1 arm64: tegra: Move HDA into the correct bus
From: Thierry Reding <[email protected]>
HDA is part of the DISP_USB bus, so move it into that and drop the address prefix accordingly.
--- .../arm64/boot/dts/nvidia/tegra264-p3971.dtsi | 4 ++- arch/arm64/boot/dts/nvidia/tegra264.dtsi | 32 +++++++++---------- 2 files changed, 19 insertions(+), 17 deletions(-)
arch/arm64/boot/dts/nvidia/tegra264-p3971.dtsi +3 -1
@@ -29,8 +29,10 @@ interrupt-controller@9960000 { status = "okay"; }; }; + }; - hda@88090b0000 { + bus@8800000000 { + hda@90b0000 { nvidia,model = "NVIDIA Jetson Thor AGX HDA"; status = "okay"; };
arch/arm64/boot/dts/nvidia/tegra264.dtsi +16 -16
@@ -3347,22 +3347,6 @@ pmc: pmc@c800000 { #interrupt-cells = <2>; interrupt-controller; }; - - hda@88090b0000 { - compatible = "nvidia,tegra264-hda"; - reg = <0x88 0x90b0000 0x0 0x10000>; - interrupts = <GIC_SPI 251 IRQ_TYPE_LEVEL_HIGH>; - clocks = <&bpmp TEGRA264_CLK_AZA_2XBIT>; - clock-names = "hda"; - resets = <&bpmp TEGRA264_RESET_HDA>, - <&bpmp TEGRA264_RESET_HDACODEC>; - reset-names = "hda", "hda2codec_2x"; - interconnects = <&mc TEGRA264_MEMORY_CLIENT_HDAR &emc>, - <&mc TEGRA264_MEMORY_CLIENT_HDAW &emc>; - interconnect-names = "dma-mem", "write"; - iommus = <&smmu3 TEGRA264_SID_HDA>; - status = "disabled"; - }; }; /* TOP_MMIO */
@@ -3716,6 +3700,22 @@ smmu3: iommu@6000000 { #iommu-cells = <1>; dma-coherent; }; + + hda@90b0000 { + compatible = "nvidia,tegra264-hda"; + reg = <0x0 0x90b0000 0x0 0x10000>; + interrupts = <GIC_SPI 251 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&bpmp TEGRA264_CLK_AZA_2XBIT>; + clock-names = "hda"; + resets = <&bpmp TEGRA264_RESET_HDA>, + <&bpmp TEGRA264_RESET_HDACODEC>; + reset-names = "hda", "hda2codec_2x"; + interconnects = <&mc TEGRA264_MEMORY_CLIENT_HDAR &emc>, + <&mc TEGRA264_MEMORY_CLIENT_HDAW &emc>; + interconnect-names = "dma-mem", "write"; + iommus = <&smmu3 TEGRA264_SID_HDA>; + status = "disabled"; + }; }; /* UPHY MMIO */
Signature · 1 line
2.51.2
Quoted 5 lines · Thierry Reding
From: Thierry Reding <[email protected]>
HDA is part of the
DISP_USBbus, so move it into that and drop the address prefix accordingly.
Is there a fixes-tag we need for this?
Otherwise ...
Jon
Quoted 72 lines
Signed-off-by Thierry Reding <[email protected]>--- .../arm64/boot/dts/nvidia/tegra264-p3971.dtsi | 4 ++- arch/arm64/boot/dts/nvidia/tegra264.dtsi | 32 +++++++++---------- 2 files changed, 19 insertions(+), 17 deletions(-)arch/arm64/boot/dts/nvidia/tegra264-p3971.dtsi +3
-1@@ -29,8 +29,10 @@ interrupt-controller@9960000 { status = "okay"; }; }; + }; - hda@88090b0000 { + bus@8800000000 { + hda@90b0000 { nvidia,model = "NVIDIA Jetson Thor AGX HDA"; status = "okay"; };arch/arm64/boot/dts/nvidia/tegra264.dtsi +16
-16@@ -3347,22 +3347,6 @@ pmc: pmc@c800000 { #interrupt-cells = <2>; interrupt-controller; }; - - hda@88090b0000 { - compatible = "nvidia,tegra264-hda"; - reg = <0x88 0x90b0000 0x0 0x10000>; - interrupts = <GIC_SPI 251 IRQ_TYPE_LEVEL_HIGH>; - clocks = <&bpmp TEGRA264_CLK_AZA_2XBIT>; - clock-names = "hda"; - resets = <&bpmp TEGRA264_RESET_HDA>, - <&bpmp TEGRA264_RESET_HDACODEC>; - reset-names = "hda", "hda2codec_2x"; - interconnects = <&mc TEGRA264_MEMORY_CLIENT_HDAR &emc>, - <&mc TEGRA264_MEMORY_CLIENT_HDAW &emc>; - interconnect-names = "dma-mem", "write"; - iommus = <&smmu3 TEGRA264_SID_HDA>; - status = "disabled"; - }; }; /* TOP_MMIO */@@ -3716,6 +3700,22 @@ smmu3: iommu@6000000 { #iommu-cells = <1>; dma-coherent; }; + + hda@90b0000 { + compatible = "nvidia,tegra264-hda"; + reg = <0x0 0x90b0000 0x0 0x10000>; + interrupts = <GIC_SPI 251 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&bpmp TEGRA264_CLK_AZA_2XBIT>; + clock-names = "hda"; + resets = <&bpmp TEGRA264_RESET_HDA>, + <&bpmp TEGRA264_RESET_HDACODEC>; + reset-names = "hda", "hda2codec_2x"; + interconnects = <&mc TEGRA264_MEMORY_CLIENT_HDAR &emc>, + <&mc TEGRA264_MEMORY_CLIENT_HDAW &emc>; + interconnect-names = "dma-mem", "write"; + iommus = <&smmu3 TEGRA264_SID_HDA>; + status = "disabled"; + }; }; /* UPHY MMIO */
Signature · 1 line
nvpublic
Quoted 9 lines · Jon Hunter
Quoted 5 lines · Thierry Reding
From: Thierry Reding <[email protected]>
HDA is part of the
DISP_USBbus, so move it into that and drop the address prefix accordingly.
Quoted 5 lines
Is there a fixes-tag we need for this?
Otherwise ...
Acked-by Jon Hunter <[email protected]>
I think it'd be good if Sheetal could review and test it, at which point I could equally well merge it into her initial patch that added this, which is still very close to the top of the arm64/dt branch. Even if it remains a standalone patch, no need for a Fixes: tag since it'll all go into the same version anyway and doesn't need to be backported.
Thierry