From a10f6254a5a5aebebc7aa558bb7c63332d88d4e4 Mon Sep 17 00:00:00 2001 From: Brad Griffis Date: Tue, 3 Sep 2024 16:48:46 +0000 Subject: [PATCH] t23x: dts: fix up previous patch to align with upstream Clean up errors in this patch: 7670c8e ("UPSTREAM: arm64: tegra: Add audio support for IGX Orin") It added nodes that were not part of the upstream patch. Remove those nodes since they are not present upstream. Bug 4115300 Change-Id: Ieab09a185b0ea64e6dc71b90cfca948fb29ca68f Signed-off-by: Brad Griffis Reviewed-on: https://git-master.nvidia.com/r/c/device/hardware/nvidia/t23x-public-dts/+/3207071 (cherry picked from commit 3bdc809ebc50391ae6e50db4a161df734bd9f680) Reviewed-on: https://git-master.nvidia.com/r/c/device/hardware/nvidia/t23x-public-dts/+/3216021 Reviewed-by: Jon Hunter GVS: buildbot_gerritrpt --- nv-platform/tegra234-p3740-0002.dtsi | 4 ++++ tegra234-p3740-0002.dtsi | 10 ++-------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/nv-platform/tegra234-p3740-0002.dtsi b/nv-platform/tegra234-p3740-0002.dtsi index 02f2fed..2b0b2ec 100644 --- a/nv-platform/tegra234-p3740-0002.dtsi +++ b/nv-platform/tegra234-p3740-0002.dtsi @@ -6,6 +6,10 @@ / { bus@0 { i2c@31c0000 { + audio-codec@1c { + #sound-dai-cells = <1>; + }; + typec: stusb1600@28 { status = "okay"; compatible = "st,stusb1600"; diff --git a/tegra234-p3740-0002.dtsi b/tegra234-p3740-0002.dtsi index 1fd89d3..527f2f3 100644 --- a/tegra234-p3740-0002.dtsi +++ b/tegra234-p3740-0002.dtsi @@ -36,7 +36,8 @@ rt5640: audio-codec@1c { compatible = "realtek,rt5640"; reg = <0x1c>; - + interrupt-parent = <&gpio>; + interrupts = ; clocks = <&bpmp TEGRA234_CLK_AUD_MCLK>; clock-names = "mclk"; @@ -44,15 +45,8 @@ realtek,dmic2-data-pin = ; realtek,jack-detect-source = ; - /* Codec IRQ output */ - interrupt-parent = <&gpio>; - interrupts = ; - - #sound-dai-cells = <1>; sound-name-prefix = "CVB-RT"; - status = "okay"; - port { rt5640_ep: endpoint { remote-endpoint = <&i2s4_dap>;