FAILED: patch "[PATCH] arm64: tegra: Update AHUB clock parent and rate" failed to apply to 5.10-stable tree

The patch below does not apply to the 5.10-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

To reproduce the conflict and resubmit, you may use the following commands:

git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.10.y
git checkout FETCH_HEAD
git cherry-pick -x dc6d5d85ed3a3fe566314f388bce4c71a26b1677
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2023091319-garter-composite-636c@gregkh' --subject-prefix 'PATCH 5.10.y' HEAD^..

Possible dependencies:

dc6d5d85ed3a ("arm64: tegra: Update AHUB clock parent and rate")
2838cfddbc1c ("arm64: tegra: Bump #address-cells and #size-cells") 132b552cba15 ("arm64: tegra: Fix up compatible string for SDMMC1 on Tegra234") b2fbcbe1ae19 ("arm64: tegra: Use correct compatible string for Tegra234 HDA") 7f0ea5acfc19 ("arm64: tegra: Use correct compatible string for Tegra194 HDA") 47a2f35d9ea7 ("arm64: tegra: Fix non-prefetchable aperture of PCIe C3 controller") 6f380a4ec04f ("arm64: tegra: Separate AON pinmux from main pinmux on Tegra194") 794b834d4cd3 ("arm64: tegra: Add ECAM aperture info for all the PCIe controllers") 8fbd2d118917 ("arm64: tegra: Enable GTE nodes")
78159542034f ("arm64: tegra: Sort nodes by unit-address")
d71b893a119d ("arm64: tegra: Add Tegra234 SDMMC1 device tree node") 1bbba854bc40 ("arm64: tegra: Add SBSA UART for Tegra234")
7a2c613bdbd8 ("arm64: tegra: Add PWM fan for Jetson AGX Orin")
2566d28c4097 ("arm64: tegra: Populate Tegra234 PWMs")
04491207d2d1 ("arm64: tegra: Remove unused property for I2C")
248400656b1c ("arm64: tegra: Fix Prefetchable aperture ranges of Tegra234 PCIe controllers") 68c31ad01105 ("arm64: tegra: Add NVDEC on Tegra234")
e25770feb6d6 ("arm64: tegra: Fix ranges for host1x nodes")
8aec2c17b95e ("arm64: tegra: Enable MGBE on Jetson AGX Orin Developer Kit") 610cdf3186bc ("arm64: tegra: Add MGBE nodes on Tegra234")

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From dc6d5d85ed3a3fe566314f388bce4c71a26b1677 Mon Sep 17 00:00:00 2001
From: Sameer Pujar <[email protected]>
Date: Thu, 29 Jun 2023 10:42:17 +0530
Subject: [PATCH] arm64: tegra: Update AHUB clock parent and rate

I2S data sanity test failures are seen at lower AHUB clock rates on Tegra234. The Tegra194 uses the same clock relationship for AHUB and it is likely that similar issues would be seen. Thus update the AHUB clock parent and rates here as well for Tegra194, Tegra186 and Tegra210.

index 7e4c496fd91c..2b3bb5d0af17 100644
@@ -135,7 +135,8 @@ tegra_ahub: ahub@2900800 {
 			clocks = <&bpmp TEGRA186_CLK_AHUB>;
 			clock-names = "ahub";
 			assigned-clocks = <&bpmp TEGRA186_CLK_AHUB>;
-			assigned-clock-parents = <&bpmp TEGRA186_CLK_PLL_A_OUT0>;
+			assigned-clock-parents = <&bpmp TEGRA186_CLK_PLLP_OUT0>;
+			assigned-clock-rates = <81600000>;
 			#address-cells = <1>;
 			#size-cells = <1>;
 			ranges = <0x02900800 0x02900800 0x11800>;

index 154fc8c0eb6d..33f92b77cd9d 100644
@@ -231,7 +231,8 @@ tegra_ahub: ahub@2900800 {
 				clocks = <&bpmp TEGRA194_CLK_AHUB>;
 				clock-names = "ahub";
 				assigned-clocks = <&bpmp TEGRA194_CLK_AHUB>;
-				assigned-clock-parents = <&bpmp TEGRA194_CLK_PLLA_OUT0>;
+				assigned-clock-parents = <&bpmp TEGRA194_CLK_PLLP_OUT0>;
+				assigned-clock-rates = <81600000>;
 				status = "disabled";
 
 				#address-cells = <2>;

index 617583ff2736..e7b4e3013964 100644
@@ -1386,7 +1386,8 @@ tegra_ahub: ahub@702d0800 {
 			clocks = <&tegra_car TEGRA210_CLK_D_AUDIO>;
 			clock-names = "ahub";
 			assigned-clocks = <&tegra_car TEGRA210_CLK_D_AUDIO>;
-			assigned-clock-parents = <&tegra_car TEGRA210_CLK_PLL_A_OUT0>;
+			assigned-clock-parents = <&tegra_car TEGRA210_CLK_PLL_P>;
+			assigned-clock-rates = <81600000>;
 			#address-cells = <1>;
 			#size-cells = <1>;
 			ranges = <0x702d0000 0x702d0000 0x0000e400>;