Rename qcs9100 based ride-r3 board to lemans ride-r3 and use it for all the IoT ride-r3 boards. Rename sa8775p based ride/ride-r3 boards to lemans-auto ride/ride-r3, to allow users to run with old automotive memory-map. Remove support for qcs9100-ride, as no platform currently uses it. Signed-off-by: Wasim Nazir --- arch/arm64/boot/dts/qcom/Makefile | 7 +++---- .../{sa8775p-ride-r3.dts => lemans-auto-ride-r3.dts} | 6 +++--- .../qcom/{sa8775p-ride.dts => lemans-auto-ride.dts} | 6 +++--- .../qcom/{sa8775p-pmics.dtsi => lemans-pmics.dtsi} | 0 .../qcom/{qcs9100-ride-r3.dts => lemans-ride-r3.dts} | 12 +++++++++--- arch/arm64/boot/dts/qcom/qcs9100-ride.dts | 11 ----------- 6 files changed, 18 insertions(+), 24 deletions(-) rename arch/arm64/boot/dts/qcom/{sa8775p-ride-r3.dts => lemans-auto-ride-r3.dts} (59%) rename arch/arm64/boot/dts/qcom/{sa8775p-ride.dts => lemans-auto-ride.dts} (60%) rename arch/arm64/boot/dts/qcom/{sa8775p-pmics.dtsi => lemans-pmics.dtsi} (100%) rename arch/arm64/boot/dts/qcom/{qcs9100-ride-r3.dts => lemans-ride-r3.dts} (36%) delete mode 100644 arch/arm64/boot/dts/qcom/qcs9100-ride.dts diff --git a/arch/arm64/boot/dts/qcom/Makefile b/arch/arm64/boot/dts/qcom/Makefile index 4bfa926b6a08..2a1941c29537 100644 --- a/arch/arm64/boot/dts/qcom/Makefile +++ b/arch/arm64/boot/dts/qcom/Makefile @@ -29,6 +29,9 @@ dtb-$(CONFIG_ARCH_QCOM) += ipq9574-rdp433.dtb dtb-$(CONFIG_ARCH_QCOM) += ipq9574-rdp449.dtb dtb-$(CONFIG_ARCH_QCOM) += ipq9574-rdp453.dtb dtb-$(CONFIG_ARCH_QCOM) += ipq9574-rdp454.dtb +dtb-$(CONFIG_ARCH_QCOM) += lemans-auto-ride.dtb +dtb-$(CONFIG_ARCH_QCOM) += lemans-auto-ride-r3.dtb +dtb-$(CONFIG_ARCH_QCOM) += lemans-ride-r3.dtb dtb-$(CONFIG_ARCH_QCOM) += msm8216-samsung-fortuna3g.dtb dtb-$(CONFIG_ARCH_QCOM) += msm8916-acer-a1-724.dtb dtb-$(CONFIG_ARCH_QCOM) += msm8916-alcatel-idol347.dtb @@ -126,8 +129,6 @@ dtb-$(CONFIG_ARCH_QCOM) += qcs6490-rb3gen2-industrial-mezzanine.dtb dtb-$(CONFIG_ARCH_QCOM) += qcs6490-rb3gen2-vision-mezzanine.dtb dtb-$(CONFIG_ARCH_QCOM) += qcs8300-ride.dtb dtb-$(CONFIG_ARCH_QCOM) += qcs8550-aim300-aiot.dtb -dtb-$(CONFIG_ARCH_QCOM) += qcs9100-ride.dtb -dtb-$(CONFIG_ARCH_QCOM) += qcs9100-ride-r3.dtb dtb-$(CONFIG_ARCH_QCOM) += qdu1000-idp.dtb dtb-$(CONFIG_ARCH_QCOM) += qrb2210-rb1.dtb dtb-$(CONFIG_ARCH_QCOM) += qrb4210-rb2.dtb @@ -140,8 +141,6 @@ dtb-$(CONFIG_ARCH_QCOM) += qru1000-idp.dtb dtb-$(CONFIG_ARCH_QCOM) += sa8155p-adp.dtb dtb-$(CONFIG_ARCH_QCOM) += sa8295p-adp.dtb dtb-$(CONFIG_ARCH_QCOM) += sa8540p-ride.dtb -dtb-$(CONFIG_ARCH_QCOM) += sa8775p-ride.dtb -dtb-$(CONFIG_ARCH_QCOM) += sa8775p-ride-r3.dtb sc7180-acer-aspire1-el2-dtbs := sc7180-acer-aspire1.dtb sc7180-el2.dtbo dtb-$(CONFIG_ARCH_QCOM) += sc7180-acer-aspire1.dtb sc7180-acer-aspire1-el2.dtb dtb-$(CONFIG_ARCH_QCOM) += sc7180-idp.dtb diff --git a/arch/arm64/boot/dts/qcom/sa8775p-ride-r3.dts b/arch/arm64/boot/dts/qcom/lemans-auto-ride-r3.dts similarity index 59% rename from arch/arm64/boot/dts/qcom/sa8775p-ride-r3.dts rename to arch/arm64/boot/dts/qcom/lemans-auto-ride-r3.dts index 3e19ff5e061f..0e19ec46be3c 100644 --- a/arch/arm64/boot/dts/qcom/sa8775p-ride-r3.dts +++ b/arch/arm64/boot/dts/qcom/lemans-auto-ride-r3.dts @@ -7,11 +7,11 @@ #include "lemans-auto.dtsi" -#include "sa8775p-pmics.dtsi" +#include "lemans-pmics.dtsi" #include "lemans-ride-common.dtsi" #include "lemans-ride-ethernet-aqr115c.dtsi" / { - model = "Qualcomm SA8775P Ride Rev3"; - compatible = "qcom,sa8775p-ride-r3", "qcom,sa8775p"; + model = "Qualcomm Technologies, Inc. Lemans-auto Ride Rev3"; + compatible = "qcom,lemans-auto-ride-r3", "qcom,sa8775p"; }; diff --git a/arch/arm64/boot/dts/qcom/sa8775p-ride.dts b/arch/arm64/boot/dts/qcom/lemans-auto-ride.dts similarity index 60% rename from arch/arm64/boot/dts/qcom/sa8775p-ride.dts rename to arch/arm64/boot/dts/qcom/lemans-auto-ride.dts index 68a99582b538..6af707263ad7 100644 --- a/arch/arm64/boot/dts/qcom/sa8775p-ride.dts +++ b/arch/arm64/boot/dts/qcom/lemans-auto-ride.dts @@ -7,11 +7,11 @@ #include "lemans-auto.dtsi" -#include "sa8775p-pmics.dtsi" +#include "lemans-pmics.dtsi" #include "lemans-ride-common.dtsi" #include "lemans-ride-ethernet-88ea1512.dtsi" / { - model = "Qualcomm SA8775P Ride"; - compatible = "qcom,sa8775p-ride", "qcom,sa8775p"; + model = "Qualcomm Technologies, Inc. Lemans-auto Ride"; + compatible = "qcom,lemans-auto-ride", "qcom,sa8775p"; }; diff --git a/arch/arm64/boot/dts/qcom/sa8775p-pmics.dtsi b/arch/arm64/boot/dts/qcom/lemans-pmics.dtsi similarity index 100% rename from arch/arm64/boot/dts/qcom/sa8775p-pmics.dtsi rename to arch/arm64/boot/dts/qcom/lemans-pmics.dtsi diff --git a/arch/arm64/boot/dts/qcom/qcs9100-ride-r3.dts b/arch/arm64/boot/dts/qcom/lemans-ride-r3.dts similarity index 36% rename from arch/arm64/boot/dts/qcom/qcs9100-ride-r3.dts rename to arch/arm64/boot/dts/qcom/lemans-ride-r3.dts index 759d1ec694b2..310c93f4a275 100644 --- a/arch/arm64/boot/dts/qcom/qcs9100-ride-r3.dts +++ b/arch/arm64/boot/dts/qcom/lemans-ride-r3.dts @@ -2,10 +2,16 @@ /* * Copyright (c) 2024, Qualcomm Innovation Center, Inc. All rights reserved. */ + /dts-v1/; -#include "sa8775p-ride-r3.dts" +#include "lemans.dtsi" +#include "lemans-pmics.dtsi" + +#include "lemans-ride-common.dtsi" +#include "lemans-ride-ethernet-aqr115c.dtsi" + / { - model = "Qualcomm QCS9100 Ride Rev3"; - compatible = "qcom,qcs9100-ride-r3", "qcom,qcs9100", "qcom,sa8775p"; + model = "Qualcomm Technologies, Inc. Lemans Ride Rev3"; + compatible = "qcom,lemans-ride-r3", "qcom,sa8775p"; }; diff --git a/arch/arm64/boot/dts/qcom/qcs9100-ride.dts b/arch/arm64/boot/dts/qcom/qcs9100-ride.dts deleted file mode 100644 index 979462dfec30..000000000000 --- a/arch/arm64/boot/dts/qcom/qcs9100-ride.dts +++ /dev/null @@ -1,11 +0,0 @@ -// SPDX-License-Identifier: BSD-3-Clause -/* - * Copyright (c) 2024, Qualcomm Innovation Center, Inc. All rights reserved. - */ -/dts-v1/; - -#include "sa8775p-ride.dts" -/ { - model = "Qualcomm QCS9100 Ride"; - compatible = "qcom,qcs9100-ride", "qcom,qcs9100", "qcom,sa8775p"; -}; -- 2.49.0