Merge pull request #664 from kernelkit/styx-rename

board/aarch64: styx: Update board name
kernelkit · Sep 30, 2024 · 1adace8 · 1adace8
2 parents 58edaf3 + 059e22c
commit 1adace8
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 22 deletions.
diff --git a/board/aarch64/dts/styx/styx-a.dts → board/aarch64/dts/styx/dcp-sc-28p-a.dts b/board/aarch64/dts/styx/styx-a.dts → board/aarch64/dts/styx/dcp-sc-28p-a.dts
@@ -3,14 +3,13 @@
  * Copyright (C) 2021 Marvell International Ltd.
  * Copyright (C) 2024 Addiva Elektronik AB
  *
- * Device tree for Styx board
-.*/
+ * Device tree for revision A of DCP-SC-28P
+ */
 
-#include "styx.dtsi"
+#include "dcp-sc-28p.dtsi"
 / {
-	model = "Styx (rev A)";
-	compatible = "styx,styx-a",
-		"styx,styx",
+	compatible = "styx,dcp-sc-28p-a",
+		"styx,dcp-sc-28p",
 		"marvell,armada-ap807-quad",
 		"marvell,armada-ap807";
 };

diff --git a/board/aarch64/dts/styx/styx-b.dts → board/aarch64/dts/styx/dcp-sc-28p-b.dts b/board/aarch64/dts/styx/styx-b.dts → board/aarch64/dts/styx/dcp-sc-28p-b.dts
@@ -3,13 +3,13 @@
  * Copyright (C) 2021 Marvell International Ltd.
  * Copyright (C) 2024 Addiva Elektronik AB
  *
- * Device tree for Styx board
+ * Device tree for revision B of DCP-SC-28P
  */
 
-#include "styx.dtsi"
+#include "dcp-sc-28p.dtsi"
 / {
-	model = "Styx";
-	compatible = "styx,styx-b",
+	compatible = "styx,dcp-sc-28p-b",
+		"styx,dcp-sc-28p",
 		"marvell,armada-ap807-quad",
 		"marvell,armada-ap807";
 };

diff --git a/board/aarch64/dts/styx/styx-mpp.h → board/aarch64/dts/styx/dcp-sc-28p-mpp.h b/board/aarch64/dts/styx/styx-mpp.h → board/aarch64/dts/styx/dcp-sc-28p-mpp.h
@@ -1,5 +1,5 @@
-#ifndef _STYX_MPP_H
-#define _STYX_MPP_H
+#ifndef _DCP_SC_28P_MPP_H
+#define _DCP_SC_28P_MPP_H
 
 #define SFP0_TX_DISABLE(X) X( "mpp0", cp0_gpio1,  0, GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)
 #define SFP1_TX_DISABLE(X) X( "mpp1", cp0_gpio1,  1, GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)
@@ -73,4 +73,4 @@
 #define MPP_GPIO_REF_NO_CHIP(_mpp, _chip, _no, _flags) <_no (_flags)>
 #define MPP_IRQ_REF(_mpp, _chip, _no, _flags) <&_chip _no (_flags)>
 
-#endif	/* _STYX_MPP_H */
+#endif	/* _DCP_SC_28P_MPP_H */
diff --git a/board/aarch64/dts/styx/styx.dtsi → board/aarch64/dts/styx/dcp-sc-28p.dtsi b/board/aarch64/dts/styx/styx.dtsi → board/aarch64/dts/styx/dcp-sc-28p.dtsi
@@ -3,7 +3,7 @@
  * Copyright (C) 2021 Marvell International Ltd.
  * Copyright (C) 2023 Addiva Elektronik AB
  *
- * Device tree for Styx board
+ * Device tree base for DCP-SC-28P
  */
 
 #include <dt-bindings/input/input.h>
@@ -12,13 +12,10 @@
 
 #include "../marvell/cn9130-patched.dtsi"
 
-#include "styx-mpp.h"
+#include "dcp-sc-28p-mpp.h"
 
 / {
-	model = "Styx";
-	compatible = "styx,styx",
-		"marvell,armada-ap807-quad",
-		"marvell,armada-ap807";
+	model = "DCP-SC-28P";
 
 	chosen {
 		stdout-path = "serial0:115200n8";

diff --git a/board/aarch64/rootfs/boot/styx/styx-b.dtb b/board/aarch64/rootfs/boot/styx/styx-b.dtb
@@ -0,0 +1 @@
+dcp-sc-28p-b.dtb
diff --git a/board/aarch64/rootfs/boot/styx/styx.dtb b/board/aarch64/rootfs/boot/styx/styx.dtb
@@ -1 +1 @@
-styx-a.dtb
+dcp-sc-28p-a.dtb
diff --git a/configs/aarch64_defconfig b/configs/aarch64_defconfig
@@ -31,7 +31,7 @@ BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.52"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="${BR2_EXTERNAL_INFIX_PATH}/board/aarch64/linux_defconfig"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
-BR2_LINUX_KERNEL_INTREE_DTS_NAME="alder/alder styx/styx-a styx/styx-b marvell/armada-3720-espressobin marvell/armada-3720-espressobin-emmc marvell/armada-3720-espressobin-v7 marvell/armada-3720-espressobin-v7-emmc marvell/armada-3720-espressobin-ultra marvell/cn9130-crb-A marvell/cn9130-crb-B microchip/sparx5_pcb135_emmc_no_psci"
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="alder/alder styx/dcp-sc-28p-a styx/dcp-sc-28p-b marvell/armada-3720-espressobin marvell/armada-3720-espressobin-emmc marvell/armada-3720-espressobin-v7 marvell/armada-3720-espressobin-v7-emmc marvell/armada-3720-espressobin-ultra marvell/cn9130-crb-A marvell/cn9130-crb-B microchip/sparx5_pcb135_emmc_no_psci"
 BR2_LINUX_KERNEL_CUSTOM_DTS_OVERLAY="${BR2_EXTERNAL_INFIX_PATH}/board/aarch64/dts"
 BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME=y
 BR2_LINUX_KERNEL_INSTALL_TARGET=y

diff --git a/configs/aarch64_minimal_defconfig b/configs/aarch64_minimal_defconfig
@@ -31,7 +31,7 @@ BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.52"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="${BR2_EXTERNAL_INFIX_PATH}/board/aarch64/linux_defconfig"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
-BR2_LINUX_KERNEL_INTREE_DTS_NAME="alder/alder styx/styx-a styx/styx-b marvell/armada-3720-espressobin marvell/armada-3720-espressobin-emmc marvell/armada-3720-espressobin-v7 marvell/armada-3720-espressobin-v7-emmc marvell/armada-3720-espressobin-ultra marvell/cn9130-crb-A marvell/cn9130-crb-B microchip/sparx5_pcb135_emmc_no_psci"
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="alder/alder styx/dcp-sc-28p-a styx/dcp-sc-28p-b marvell/armada-3720-espressobin marvell/armada-3720-espressobin-emmc marvell/armada-3720-espressobin-v7 marvell/armada-3720-espressobin-v7-emmc marvell/armada-3720-espressobin-ultra marvell/cn9130-crb-A marvell/cn9130-crb-B microchip/sparx5_pcb135_emmc_no_psci"
 BR2_LINUX_KERNEL_CUSTOM_DTS_OVERLAY="${BR2_EXTERNAL_INFIX_PATH}/board/aarch64/dts"
 BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME=y
 BR2_LINUX_KERNEL_INSTALL_TARGET=y