From 3b61e5bd689b7da5cea9e15e529420af9a6fce43 Mon Sep 17 00:00:00 2001 From: Oleksii Kutuzov <oleksii.kutuzov@seco.com> Date: Mon, 27 Jan 2025 09:42:13 +0000 Subject: [PATCH] [E81][DTB] Rename the common dtsi files Remove reference to qcs6490 as E81 has both qcs6490 and qcs5430 --- .../dts/seco/include/{qcs6490-e81-b79.dtsi => e81-b79.dtsi} | 0 .../include/{qcs6490-e81-common.dtsi => e81-common.dtsi} | 6 +++--- .../dts/seco/include/{qcs6490-pinfunc.h => e81-pinfunc.h} | 4 ++-- arch/arm64/boot/dts/seco/seco-qcs5430-fp1-e81.dts | 4 ++-- arch/arm64/boot/dts/seco/seco-qcs5430-fp2-e81.dts | 4 ++-- arch/arm64/boot/dts/seco/seco-qcs6490-e81.dts | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) rename arch/arm64/boot/dts/seco/include/{qcs6490-e81-b79.dtsi => e81-b79.dtsi} (100%) rename arch/arm64/boot/dts/seco/include/{qcs6490-e81-common.dtsi => e81-common.dtsi} (99%) rename arch/arm64/boot/dts/seco/include/{qcs6490-pinfunc.h => e81-pinfunc.h} (91%) diff --git a/arch/arm64/boot/dts/seco/include/qcs6490-e81-b79.dtsi b/arch/arm64/boot/dts/seco/include/e81-b79.dtsi similarity index 100% rename from arch/arm64/boot/dts/seco/include/qcs6490-e81-b79.dtsi rename to arch/arm64/boot/dts/seco/include/e81-b79.dtsi diff --git a/arch/arm64/boot/dts/seco/include/qcs6490-e81-common.dtsi b/arch/arm64/boot/dts/seco/include/e81-common.dtsi similarity index 99% rename from arch/arm64/boot/dts/seco/include/qcs6490-e81-common.dtsi rename to arch/arm64/boot/dts/seco/include/e81-common.dtsi index 165a24bf54836..111ccb1484cd2 100644 --- a/arch/arm64/boot/dts/seco/include/qcs6490-e81-common.dtsi +++ b/arch/arm64/boot/dts/seco/include/e81-common.dtsi @@ -18,8 +18,8 @@ * *****************************************************************************/ -#ifndef SECO_QCS6490_E81_DTSI -#define SECO_QCS6490_E81_DTSI +#ifndef SECO_E81_DTSI +#define SECO_E81_DTSI #include <dt-bindings/iio/qcom,spmi-adc7-pm7325.h> #include <dt-bindings/iio/qcom,spmi-adc7-pmk8350.h> @@ -31,7 +31,7 @@ #include "../../qcom/pm7325.dtsi" #include "../../qcom/pm8350c.dtsi" -#include "qcs6490-pinfunc.h" +#include "e81-pinfunc.h" / { diff --git a/arch/arm64/boot/dts/seco/include/qcs6490-pinfunc.h b/arch/arm64/boot/dts/seco/include/e81-pinfunc.h similarity index 91% rename from arch/arm64/boot/dts/seco/include/qcs6490-pinfunc.h rename to arch/arm64/boot/dts/seco/include/e81-pinfunc.h index 3c7f4ab5711ca..61a6e604db79d 100644 --- a/arch/arm64/boot/dts/seco/include/qcs6490-pinfunc.h +++ b/arch/arm64/boot/dts/seco/include/e81-pinfunc.h @@ -1,6 +1,6 @@ -#ifndef QCS6490_PINFUNC_H -#define QCS6490_PINFUNC_H +#ifndef E81_PINFUNC_H +#define E81_PINFUNC_H #define STM32_NGPIOS 30 diff --git a/arch/arm64/boot/dts/seco/seco-qcs5430-fp1-e81.dts b/arch/arm64/boot/dts/seco/seco-qcs5430-fp1-e81.dts index 2e23f85ee161d..b30f4a63572c3 100644 --- a/arch/arm64/boot/dts/seco/seco-qcs5430-fp1-e81.dts +++ b/arch/arm64/boot/dts/seco/seco-qcs5430-fp1-e81.dts @@ -9,8 +9,8 @@ /dts-v1/; -#include "include/qcs6490-e81-common.dtsi" -#include "include/qcs6490-e81-b79.dtsi" +#include "include/e81-common.dtsi" +#include "include/e81-b79.dtsi" / { model = "Qualcomm QCS5430 FP1 SECO board (E81) with B79 baseboard"; diff --git a/arch/arm64/boot/dts/seco/seco-qcs5430-fp2-e81.dts b/arch/arm64/boot/dts/seco/seco-qcs5430-fp2-e81.dts index efd70125dd041..bebdfa3a97e1a 100644 --- a/arch/arm64/boot/dts/seco/seco-qcs5430-fp2-e81.dts +++ b/arch/arm64/boot/dts/seco/seco-qcs5430-fp2-e81.dts @@ -9,8 +9,8 @@ /dts-v1/; -#include "include/qcs6490-e81-common.dtsi" -#include "include/qcs6490-e81-b79.dtsi" +#include "include/e81-common.dtsi" +#include "include/e81-b79.dtsi" / { model = "Qualcomm QCS5430 FP2 SECO board (E81) with B79 baseboard"; diff --git a/arch/arm64/boot/dts/seco/seco-qcs6490-e81.dts b/arch/arm64/boot/dts/seco/seco-qcs6490-e81.dts index 2c22e87932276..2cd5f0c1b24a5 100644 --- a/arch/arm64/boot/dts/seco/seco-qcs6490-e81.dts +++ b/arch/arm64/boot/dts/seco/seco-qcs6490-e81.dts @@ -9,8 +9,8 @@ /dts-v1/; -#include "include/qcs6490-e81-common.dtsi" -#include "include/qcs6490-e81-b79.dtsi" +#include "include/e81-common.dtsi" +#include "include/e81-b79.dtsi" / { model = "Qualcomm QCS6490 SECO board (E81) with B79 baseboard"; -- GitLab