[PATCH 3/3] arm64: dts: qcom: kaanapali: Fix deprecated cpu compatibles
From: Sibi Sankar
Date: Tue Mar 10 2026 - 00:09:46 EST
The generic Qualcomm Oryon CPU compatible used by the Kaanapali
SoC is deprecated and incorrect since it uses a single compatible
to describe two different core variants. It is now replaced with
two different core-specific compatibles based on MIDR part and
variant number.
CPUS 0-5:
MIDR_EL1[PART_NUM] - 0x2
MIDR_EL1[VARIANT] - 0x2
CPUS 6-7:
MIDR_EL1[PART_NUM] - 0x2
MIDR_EL1[VARIANT] - 0x3
Fixes: 2eeb5767d53f ("arm64: dts: qcom: Introduce Kaanapali SoC")
Signed-off-by: Sibi Sankar <sibi.sankar@xxxxxxxxxxxxxxxx>
Reviewed-by: Konrad Dybcio <konrad.dybcio@xxxxxxxxxxxxxxxx>
---
arch/arm64/boot/dts/qcom/kaanapali.dtsi | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/arch/arm64/boot/dts/qcom/kaanapali.dtsi b/arch/arm64/boot/dts/qcom/kaanapali.dtsi
index 9ef57ad0ca71..40b9a5953d39 100644
--- a/arch/arm64/boot/dts/qcom/kaanapali.dtsi
+++ b/arch/arm64/boot/dts/qcom/kaanapali.dtsi
@@ -31,7 +31,7 @@ cpus {
cpu0: cpu@0 {
device_type = "cpu";
- compatible = "qcom,oryon";
+ compatible = "qcom,oryon-2-2";
reg = <0x0 0x0>;
enable-method = "psci";
next-level-cache = <&l2_0>;
@@ -48,7 +48,7 @@ l2_0: l2-cache {
cpu1: cpu@100 {
device_type = "cpu";
- compatible = "qcom,oryon";
+ compatible = "qcom,oryon-2-2";
reg = <0x0 0x100>;
enable-method = "psci";
next-level-cache = <&l2_0>;
@@ -59,7 +59,7 @@ cpu1: cpu@100 {
cpu2: cpu@200 {
device_type = "cpu";
- compatible = "qcom,oryon";
+ compatible = "qcom,oryon-2-2";
reg = <0x0 0x200>;
enable-method = "psci";
next-level-cache = <&l2_0>;
@@ -70,7 +70,7 @@ cpu2: cpu@200 {
cpu3: cpu@300 {
device_type = "cpu";
- compatible = "qcom,oryon";
+ compatible = "qcom,oryon-2-2";
reg = <0x0 0x300>;
enable-method = "psci";
next-level-cache = <&l2_0>;
@@ -81,7 +81,7 @@ cpu3: cpu@300 {
cpu4: cpu@400 {
device_type = "cpu";
- compatible = "qcom,oryon";
+ compatible = "qcom,oryon-2-2";
reg = <0x0 0x400>;
enable-method = "psci";
next-level-cache = <&l2_0>;
@@ -92,7 +92,7 @@ cpu4: cpu@400 {
cpu5: cpu@500 {
device_type = "cpu";
- compatible = "qcom,oryon";
+ compatible = "qcom,oryon-2-2";
reg = <0x0 0x500>;
enable-method = "psci";
next-level-cache = <&l2_0>;
@@ -103,7 +103,7 @@ cpu5: cpu@500 {
cpu6: cpu@10000 {
device_type = "cpu";
- compatible = "qcom,oryon";
+ compatible = "qcom,oryon-2-3";
reg = <0x0 0x10000>;
enable-method = "psci";
next-level-cache = <&l2_1>;
@@ -120,7 +120,7 @@ l2_1: l2-cache {
cpu7: cpu@10100 {
device_type = "cpu";
- compatible = "qcom,oryon";
+ compatible = "qcom,oryon-2-3";
reg = <0x0 0x10100>;
enable-method = "psci";
next-level-cache = <&l2_1>;
--
2.34.1