Drop arm64-dts-ti-makefile-add-hdmi-audio-check-for-am62a.patch

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-6.8/arm64-dts-ti-makefile-add-hdmi-audio-check-for-am62a.patch b/queue-6.8/arm64-dts-ti-makefile-add-hdmi-audio-check-for-am62a.patch
deleted file mode 100644 (file)
index f265c1e..0000000
--- a/queue-6.8/arm64-dts-ti-makefile-add-hdmi-audio-check-for-am62a.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 528ef85399f6c553fa8f458f9736a7f59d3baddf Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Thu, 1 Feb 2024 18:24:52 +0530
-Subject: arm64: dts: ti: Makefile: Add HDMI audio check for AM62A7-SK
-
-From: Aradhya Bhatia <a-bhatia1@ti.com>
-
-[ Upstream commit cff6dd01a68fe9a8aaab724ef4e21f37eff609e9 ]
-
-HDMI audio can be enabled over AM62A-SK using the same DT overlay that
-is used for AM625 / AM62-LP SK-EVMs.
-
-Add the sk.dtb + hdmi-audio.dtbo combination for AM62A7-SK as well, to
-check for overlay applicability during DTBS compile tests.
-
-Signed-off-by: Aradhya Bhatia <a-bhatia1@ti.com>
-Link: https://lore.kernel.org/r/20240201125452.1920623-4-a-bhatia1@ti.com
-Signed-off-by: Vignesh Raghavendra <vigneshr@ti.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/arm64/boot/dts/ti/Makefile | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/arch/arm64/boot/dts/ti/Makefile b/arch/arm64/boot/dts/ti/Makefile
-index 08ce34d21d5d0..c738d5bfa6bae 100644
---- a/arch/arm64/boot/dts/ti/Makefile
-+++ b/arch/arm64/boot/dts/ti/Makefile
-@@ -102,6 +102,7 @@ k3-am62a7-sk-csi2-ov5640-dtbs := k3-am62a7-sk.dtb \
-       k3-am62x-sk-csi2-ov5640.dtbo
- k3-am62a7-sk-csi2-tevi-ov5640-dtbs := k3-am62a7-sk.dtb \
-       k3-am62x-sk-csi2-tevi-ov5640.dtbo
-+k3-am62a7-sk-hdmi-audio-dtbs := k3-am62a7-sk.dtb k3-am62x-sk-hdmi-audio.dtbo
- k3-am642-tqma64xxl-mbax4xxl-sdcard-dtbs := \
-       k3-am642-tqma64xxl-mbax4xxl.dtb k3-am64-tqma64xxl-mbax4xxl-sdcard.dtbo
- k3-am642-tqma64xxl-mbax4xxl-wlan-dtbs := \
-@@ -119,6 +120,7 @@ dtb- += k3-am625-beagleplay-csi2-ov5640.dtb \
-       k3-am62-lp-sk-hdmi-audio.dtb \
-       k3-am62a7-sk-csi2-imx219.dtb \
-       k3-am62a7-sk-csi2-ov5640.dtb \
-+      k3-am62a7-sk-hdmi-audio.dtb \
-       k3-am642-tqma64xxl-mbax4xxl-sdcard.dtb \
-       k3-am642-tqma64xxl-mbax4xxl-wlan.dtb \
-       k3-j721e-evm-pcie0-ep.dtb \
--- 
-2.43.0
-

diff --git a/queue-6.8/series b/queue-6.8/series
index 17f78683526454cc4b40445eb547de7bb8c07c3d..909b94b70d706d6ea92111d5ac75c2125d4e0c52 100644 (file)
--- a/queue-6.8/series
+++ b/queue-6.8/series
@@ -12,7 +12,6 @@ vmci-fix-memcpy-run-time-warning-in-dg_dispatch_as_h.patch
 wifi-iwlwifi-pcie-add-the-pci-device-id-for-new-hard.patch
 arm64-dts-qcom-qcm6490-idp-add-definition-for-three-.patch
 net-dsa-qca8k-put-mdio-controller-of-node-if-unavail.patch
-arm64-dts-ti-makefile-add-hdmi-audio-check-for-am62a.patch
 arm64-dts-qcom-qrb2210-rb1-disable-cluster-power-dom.patch
 printk-for-suppress_panic_printk-check-for-other-cpu.patch
 panic-flush-kernel-log-buffer-at-the-end.patch