From b05136fc067cf58b1fba5494587ee717d809bcd4 Mon Sep 17 00:00:00 2001 From: Piotr Zierhoffer Date: Mon, 16 Sep 2024 15:03:27 +0200 Subject: [PATCH] x86: Add intel,x86_64 compat to all x86-64 platforms MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This will help distinguish 64 and 32-bit platforms by tooling, following the pattern visible in e.g. RISC-V. Signed-off-by: Piotr Zierhoffer Signed-off-by: Mateusz HoĊ‚enko --- boards/intel/adl/intel_adl.dts | 4 ++++ boards/up-bridge-the-gap/up_squared/up_squared.dts | 4 ++-- dts/x86/intel/alder_lake.dtsi | 4 ++-- dts/x86/intel/apollo_lake.dtsi | 2 +- dts/x86/intel/elkhart_lake.dtsi | 2 +- dts/x86/intel/raptor_lake_p.dtsi | 2 +- dts/x86/intel/raptor_lake_s.dtsi | 2 +- 7 files changed, 12 insertions(+), 8 deletions(-) diff --git a/boards/intel/adl/intel_adl.dts b/boards/intel/adl/intel_adl.dts index 16dfb20a556..10b37802aeb 100644 --- a/boards/intel/adl/intel_adl.dts +++ b/boards/intel/adl/intel_adl.dts @@ -22,3 +22,7 @@ sdhc0 = &emmc; }; }; + +&cpu { + compatible = "intel,x86_64"; +}; diff --git a/boards/up-bridge-the-gap/up_squared/up_squared.dts b/boards/up-bridge-the-gap/up_squared/up_squared.dts index 2e8e763115f..24818e98930 100644 --- a/boards/up-bridge-the-gap/up_squared/up_squared.dts +++ b/boards/up-bridge-the-gap/up_squared/up_squared.dts @@ -36,14 +36,14 @@ cpu@0 { device_type = "cpu"; - compatible = "intel,apollo-lake"; + compatible = "intel,apollo-lake", "intel,x86_64"; d-cache-line-size = <64>; reg = <0>; }; cpu@1 { device_type = "cpu"; - compatible = "intel,apollo-lake"; + compatible = "intel,apollo-lake", "intel,x86_64"; d-cache-line-size = <64>; reg = <1>; }; diff --git a/dts/x86/intel/alder_lake.dtsi b/dts/x86/intel/alder_lake.dtsi index b205df48589..6f33e2a44d1 100644 --- a/dts/x86/intel/alder_lake.dtsi +++ b/dts/x86/intel/alder_lake.dtsi @@ -16,9 +16,9 @@ #address-cells = <1>; #size-cells = <0>; - cpu@0 { + cpu: cpu@0 { device_type = "cpu"; - compatible = "intel,alder-lake"; + compatible = "intel,alder-lake", "intel,x86_64"; d-cache-line-size = <64>; reg = <0>; }; diff --git a/dts/x86/intel/apollo_lake.dtsi b/dts/x86/intel/apollo_lake.dtsi index a439feea175..5920decfc4d 100644 --- a/dts/x86/intel/apollo_lake.dtsi +++ b/dts/x86/intel/apollo_lake.dtsi @@ -16,7 +16,7 @@ cpu@0 { device_type = "cpu"; - compatible = "intel,apollo-lake"; + compatible = "intel,apollo-lake", "intel,x86_64"; d-cache-line-size = <64>; reg = <0>; }; diff --git a/dts/x86/intel/elkhart_lake.dtsi b/dts/x86/intel/elkhart_lake.dtsi index 828db51d28b..43a7806a8ec 100644 --- a/dts/x86/intel/elkhart_lake.dtsi +++ b/dts/x86/intel/elkhart_lake.dtsi @@ -16,7 +16,7 @@ cpu@0 { device_type = "cpu"; - compatible = "intel,elkhart-lake"; + compatible = "intel,elkhart-lake", "intel,x86_64"; d-cache-line-size = <64>; reg = <0>; }; diff --git a/dts/x86/intel/raptor_lake_p.dtsi b/dts/x86/intel/raptor_lake_p.dtsi index 1c6de091d2f..2f3c4bfa610 100644 --- a/dts/x86/intel/raptor_lake_p.dtsi +++ b/dts/x86/intel/raptor_lake_p.dtsi @@ -15,7 +15,7 @@ #size-cells = <0>; cpu@0 { - compatible = "intel,raptor-lake"; + compatible = "intel,raptor-lake", "intel,x86_64"; device_type = "cpu"; d-cache-line-size = <64>; reg = <0>; diff --git a/dts/x86/intel/raptor_lake_s.dtsi b/dts/x86/intel/raptor_lake_s.dtsi index 0e55b60a0b3..96b59a019c0 100644 --- a/dts/x86/intel/raptor_lake_s.dtsi +++ b/dts/x86/intel/raptor_lake_s.dtsi @@ -16,7 +16,7 @@ cpu@0 { device_type = "cpu"; - compatible = "intel,raptor-lake"; + compatible = "intel,raptor-lake", "intel,x86_64"; d-cache-line-size = <64>; reg = <0>; };