SONY phones/tables are based on a common board ('platform'). Devices
based on the same are often close to identical. Mention their association
in filenames, like it's done in arm64 DTs.
Signed-off-by: Konrad Dybcio <[email protected]>
---
arch/arm/boot/dts/Makefile | 8 ++++----
...a-yuga.dts => qcom-apq8064-sony-xperia-lagan-yuga.dts} | 0
...amami.dts => qcom-msm8974-sony-xperia-rhine-amami.dts} | 0
...nami.dts => qcom-msm8974-sony-xperia-rhine-honami.dts} | 0
...or.dts => qcom-msm8974-sony-xperia-shinano-castor.dts} | 0
5 files changed, 4 insertions(+), 4 deletions(-)
rename arch/arm/boot/dts/{qcom-apq8064-sony-xperia-yuga.dts => qcom-apq8064-sony-xperia-lagan-yuga.dts} (100%)
rename arch/arm/boot/dts/{qcom-msm8974-sony-xperia-amami.dts => qcom-msm8974-sony-xperia-rhine-amami.dts} (100%)
rename arch/arm/boot/dts/{qcom-msm8974-sony-xperia-honami.dts => qcom-msm8974-sony-xperia-rhine-honami.dts} (100%)
rename arch/arm/boot/dts/{qcom-msm8974-sony-xperia-castor.dts => qcom-msm8974-sony-xperia-shinano-castor.dts} (100%)
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 252353fb4e3b..91f630f4dbfd 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -988,7 +988,7 @@ dtb-$(CONFIG_ARCH_QCOM) += \
qcom-apq8060-dragonboard.dtb \
qcom-apq8064-cm-qs600.dtb \
qcom-apq8064-ifc6410.dtb \
- qcom-apq8064-sony-xperia-yuga.dtb \
+ qcom-apq8064-sony-xperia-lagan-yuga.dtb \
qcom-apq8064-asus-nexus7-flo.dtb \
qcom-apq8074-dragonboard.dtb \
qcom-apq8084-ifc6540.dtb \
@@ -1010,9 +1010,9 @@ dtb-$(CONFIG_ARCH_QCOM) += \
qcom-msm8974-fairphone-fp2.dtb \
qcom-msm8974-lge-nexus5-hammerhead.dtb \
qcom-msm8974-samsung-klte.dtb \
- qcom-msm8974-sony-xperia-amami.dtb \
- qcom-msm8974-sony-xperia-castor.dtb \
- qcom-msm8974-sony-xperia-honami.dtb \
+ qcom-msm8974-sony-xperia-rhine-amami.dtb \
+ qcom-msm8974-sony-xperia-rhine-honami.dtb \
+ qcom-msm8974-sony-xperia-shinano-castor.dtb \
qcom-mdm9615-wp8548-mangoh-green.dtb \
qcom-sdx55-mtp.dtb \
qcom-sdx55-t55.dtb \
diff --git a/arch/arm/boot/dts/qcom-apq8064-sony-xperia-yuga.dts b/arch/arm/boot/dts/qcom-apq8064-sony-xperia-lagan-yuga.dts
similarity index 100%
rename from arch/arm/boot/dts/qcom-apq8064-sony-xperia-yuga.dts
rename to arch/arm/boot/dts/qcom-apq8064-sony-xperia-lagan-yuga.dts
diff --git a/arch/arm/boot/dts/qcom-msm8974-sony-xperia-amami.dts b/arch/arm/boot/dts/qcom-msm8974-sony-xperia-rhine-amami.dts
similarity index 100%
rename from arch/arm/boot/dts/qcom-msm8974-sony-xperia-amami.dts
rename to arch/arm/boot/dts/qcom-msm8974-sony-xperia-rhine-amami.dts
diff --git a/arch/arm/boot/dts/qcom-msm8974-sony-xperia-honami.dts b/arch/arm/boot/dts/qcom-msm8974-sony-xperia-rhine-honami.dts
similarity index 100%
rename from arch/arm/boot/dts/qcom-msm8974-sony-xperia-honami.dts
rename to arch/arm/boot/dts/qcom-msm8974-sony-xperia-rhine-honami.dts
diff --git a/arch/arm/boot/dts/qcom-msm8974-sony-xperia-castor.dts b/arch/arm/boot/dts/qcom-msm8974-sony-xperia-shinano-castor.dts
similarity index 100%
rename from arch/arm/boot/dts/qcom-msm8974-sony-xperia-castor.dts
rename to arch/arm/boot/dts/qcom-msm8974-sony-xperia-shinano-castor.dts
--
2.35.2
On Fri, 15 Apr 2022 13:56:11 +0200, Konrad Dybcio wrote:
> SONY phones/tables are based on a common board ('platform'). Devices
> based on the same are often close to identical. Mention their association
> in filenames, like it's done in arm64 DTs.
>
>
Applied, thanks!
[01/23] ARM: dts: qcom-*-sony*: Mention SONY board names in DT filenames
commit: 73618b43dc5af291be0eb150f4ba8a3c1a5c5436
[02/23] ARM: dts: qcom-msm8974: Remove properties that are always overriden
commit: eba5e62045b2848042435ae0503d7c2354edf2af
[03/23] ARM: dts: qcom-msm8974*: Fix UART naming
commit: b905c34ae7db6b564589f02fa7eac7afaa0294e9
[04/23] ARM: dts: qcom-msm8974*: Fix I2C labels
commit: bb167546d06847a8729c973fe5165a231fd5c39d
[05/23] ARM: dts: qcom-msm8974: Fix up mdss nodes
commit: 4de36f7b6d0e7e792d36800ac6c5e3392b59573a
[06/23] ARM: dts: qcom-msm8974: Fix up SDHCI nodes
commit: 64cf62683b5398e46cf967c308be95685137626a
[07/23] ARM: dts: qcom-msm8974*: Rename msmgpio to tlmm
commit: 087c9704d5bb322dd5db52938416caeaf4cdc3c3
[08/23] ARM: dts: qcom-apq8074-dragonboard: Use &labels
commit: 9f440d17e2309c7d14eba0898c775be6d6e6d6b7
[09/23] ARM: dts: qcom-msm8974-fp2: Use &labels
commit: 409ab7dc57c41d9db54d221f4d247e229ba34cf9
[10/23] ARM: dts: qcom-msm8974-lge-nexus5: Use &labels
commit: 1c1574e24990e9f9d753958745b8274874241158
[11/23] ARM: dts: qcom-msm8974-klte: Use &labels
commit: 1d59524b9181e17110ae7b809c62a6a66f336fd6
[12/23] ARM: dts: qcom-msm8974-{"hon","am"}ami: Commonize and modernize the DTs
commit: 5c554c2d67a8c6c43a1fb542cbc73c33ff04c344
[13/23] ARM: dts: qcom-msm8974-castor: Use &labels
commit: 598a1e333224e73ae8f078ed6aa8dcd416cfb490
[14/23] ARM: dts: qcom-msm8974pro: Use &labels
commit: 7bdc6d8c37c0848da6646484aa1b5e3554525ee5
[15/23] ARM: dts: qcom-msm8974pro-*: Use the 8974pro name in DT filenames
commit: c919956818361826903707e023efbb6db7b49091
[16/23] ARM: dts: qcom-msm8974: Convert ADSP to a MMIO device
commit: 2daa785817dd35172b856c30fc5148b2773b6891
[17/23] ARM: dts: qcom-msm8974: Sort and clean up nodes
commit: f300826d27be7f7f671c922bf57007c98c683590
[18/23] ARM: dts: qcom-msm8974*: Enable IMEM unconditionally
commit: 9f43e1973840955c0bd639c504095fba5f565e20
[19/23] ARM: dts: qcom-msm8974*: Consolidate I2C/UART/SDHCI
commit: 1dfe967ec7cfb03b468d096a69d945070f1cd2a0
[20/23] ARM: dts: qcom-msm8974*: Clean up old GPIO declarations
commit: 09db313d392b42a3a356867d84dc933bcb4556ef
[21/23] ARM: dts: qcom-msm8974-rhine: Add NFC and enable I2C hosts
commit: e82be679de942decbcdaac82aecbcd1277e03fd1
[22/23] ARM: dts: qcom-msm8974-rhine: Add pstore node
commit: e63d4c51997af75cdf3f096c333a957b4579e43a
[23/23] ARM: dts: qcom-msm8974*: Remove unnecessary include
commit: 4b6a151f17cbea6e9bd5b043d0e6e7d19b77c3f7
Best regards,
--
Bjorn Andersson <[email protected]>