From 9ca7fb1fbe55b3ec2452726b0c53ab226866481d Mon Sep 17 00:00:00 2001 From: Salendarsingh Gaud Date: Tue, 15 Sep 2026 13:08:48 +0530 Subject: [PATCH 1/2] Remove sa8775p-ride.dts and sa8775p-ride-r3.dts --- conf/machine/qcs9100-ride-sx.conf | 2 -- 1 file changed, 2 deletions(-) diff --git a/conf/machine/qcs9100-ride-sx.conf b/conf/machine/qcs9100-ride-sx.conf index 83516c9fb..ff51f6c7f 100644 --- a/conf/machine/qcs9100-ride-sx.conf +++ b/conf/machine/qcs9100-ride-sx.conf @@ -11,8 +11,6 @@ QCOM_DTB_DEFAULT ?= "qcs9100-ride-r3" KERNEL_DEVICETREE ?= " \ qcom/qcs9100-ride.dtb \ qcom/qcs9100-ride-r3.dtb \ - qcom/sa8775p-ride.dtb \ - qcom/sa8775p-ride-r3.dtb \ " # These DTs are not upstreamed and currently exist only in linux-qcom kernels From 41323d2429907b359153c8f47811082c60b741e3 Mon Sep 17 00:00:00 2001 From: Salendarsingh Gaud Date: Tue, 15 Sep 2026 13:45:49 +0530 Subject: [PATCH 2/2] Shikra changes as per upstream --- conf/machine/include/fit-dtb-compatible.inc | 4 ++-- conf/machine/shikra-evk.conf | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/machine/include/fit-dtb-compatible.inc b/conf/machine/include/fit-dtb-compatible.inc index 8d4665cc2..2944ca0df 100644 --- a/conf/machine/include/fit-dtb-compatible.inc +++ b/conf/machine/include/fit-dtb-compatible.inc @@ -66,8 +66,8 @@ FIT_DTB_COMPATIBLE[qcom_qcs8275-iot] = \ FIT_DTB_COMPATIBLE[qcom_qcs8300-adp] = "qcs8300-ride" # ---------- shikra ---------- -FIT_DTB_COMPATIBLE[qcom_shikracqm-itp] = "shikra-cqm-evk shikra-cqm-evk-imx577-camera" -FIT_DTB_COMPATIBLE[qcom_shikracqs-itp] = "shikra-cqs-evk shikra-cqm-evk-imx577-camera" +FIT_DTB_COMPATIBLE[qcom_shikracqm-itp] = "shikra-cqm-evk shikra-cqm-cqs-evk-imx577-camera" +FIT_DTB_COMPATIBLE[qcom_shikracqs-itp] = "shikra-cqs-evk shikra-cqm-cqs-evk-imx577-camera" FIT_DTB_COMPATIBLE[qcom_shikraiqs-itp] = "shikra-iqs-evk shikra-iqs-evk-imx577-camera" # ---------- talos ---------- diff --git a/conf/machine/shikra-evk.conf b/conf/machine/shikra-evk.conf index ec97bc8e3..55e61c886 100644 --- a/conf/machine/shikra-evk.conf +++ b/conf/machine/shikra-evk.conf @@ -10,7 +10,7 @@ KERNEL_DEVICETREE ?= " \ qcom/shikra-cqm-evk.dtb \ qcom/shikra-cqs-evk.dtb \ qcom/shikra-iqs-evk.dtb \ - qcom/shikra-cqm-evk-imx577-camera.dtbo \ + qcom/shikra-cqm-cqs-evk-imx577-camera.dtbo \ qcom/shikra-iqs-evk-imx577-camera.dtbo \ "