From: Nikita Travkin Date: Thu, 27 Feb 2025 14:26:48 +0000 (+0500) Subject: arm64: dts: qcom: qrb5165-rb5-vision-mezzanine: Drop CMA heap X-Git-Tag: v6.16-rc1~97^2~20^2~115^2~124 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2a26a02e668ff101580647221c898d75ed93f8f5;p=thirdparty%2Fkernel%2Fstable.git arm64: dts: qcom: qrb5165-rb5-vision-mezzanine: Drop CMA heap Initially added, the cma heap was supposed to help with libcamera swisp, however a mistake was made such that the node was never applied as part of the overlay since the change was added to the overlay root ("/") and not with a reference to the target dtb root ("&{/}"). Moveover libcamera doesn't require CMA heap on Qualcomm platforms anymore as it can now use UDMA buffers instead. Drop the CMA heap node. This change has no effect on the final dtb. This reverts commit 99d557cfe4fcf89664762796678e26009aa3bdd9. Fixes: 99d557cfe4fc ("arm64: dts: qcom: qrb5165-rb5-vision-mezzanine: Add cma heap for libcamera softisp support") Suggested-by: Bryan O'Donoghue Signed-off-by: Nikita Travkin Reviewed-by: Bryan O'Donoghue Link: https://lore.kernel.org/r/20250227-qcom-nonroot-overlays-v2-1-bde44f708cbe@trvn.ru Signed-off-by: Bjorn Andersson --- diff --git a/arch/arm64/boot/dts/qcom/qrb5165-rb5-vision-mezzanine.dtso b/arch/arm64/boot/dts/qcom/qrb5165-rb5-vision-mezzanine.dtso index ae256c713a360..5fe331923dd3c 100644 --- a/arch/arm64/boot/dts/qcom/qrb5165-rb5-vision-mezzanine.dtso +++ b/arch/arm64/boot/dts/qcom/qrb5165-rb5-vision-mezzanine.dtso @@ -9,17 +9,6 @@ #include #include -/ { - reserved-memory { - linux,cma { - compatible = "shared-dma-pool"; - size = <0x0 0x8000000>; - reusable; - linux,cma-default; - }; - }; -}; - &camcc { status = "okay"; };