Unverified Commit 82645d8a authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'qcom-arm64-fixes-for-6.14' of... 

Merge tag 'qcom-arm64-fixes-for-6.14' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into arm/fixes

Qualcomm Arm64 Devicetree fixes for v6.14

Revert the change to marking SDM845 SMMU dma-coherent, as this is
reported not to be true.

* tag 'qcom-arm64-fixes-for-6.14' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux:
  Revert "arm64: dts: qcom: sdm845: Affirm IDR0.CCTW on apps_smmu"

Link: https://lore.kernel.org/r/20250310191409.1208520-1-andersson@kernel.org


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents edcccc68 f00db31d

arch/arm64/boot/dts/qcom/sdm845.dtsi

+0 −1
Original line number Diff line number Diff line
@@ -5163,7 +5163,6 @@ apps_smmu: iommu@15000000 { 
				     <GIC_SPI 341 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 342 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 343 IRQ_TYPE_LEVEL_HIGH>;

			dma-coherent;

		};



		anoc_1_tbu: tbu@150c5000 {