arm: mach-sc5xx: Align header paths with SYS_SOC convention

Define CONFIG_SYS_SOC in the mach-sc5xx Kconfig. Follow the standard
U-Boot include path convention by moving the SC5xx SoC headers from
arch/arm/include/asm/arch-adi/sc5xx/ to the conventional
arch/arm/include/asm/arch-sc5xx/ location. Update includes from
<asm/arch-adi/sc5xx/*.h> to <asm/arch/*.h> across mach-sc5xx and board
files.

Signed-off-by: Philip Molloy <[email protected]>

25 files changed, 36 insertions, 33 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 6c596971ae4..78d84e701c6 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -640,7 +640,7 @@ L:	[email protected]
 S:	Supported
 T:	git https://github.com/analogdevicesinc/u-boot
 F:	arch/arm/dts/sc5*
-F:	arch/arm/include/asm/arch-adi/
+F:	arch/arm/include/asm/arch-sc5xx/
 F:	arch/arm/mach-sc5xx/
 F:	board/adi/
 F:	configs/sc5*
diff --git a/arch/arm/include/asm/arch-adi/sc5xx/sc5xx.h b/arch/arm/include/asm/arch-sc5xx/sc5xx.h
index c80de67d7ae..c80de67d7ae 100644
--- a/arch/arm/include/asm/arch-adi/sc5xx/sc5xx.h
+++ b/arch/arm/include/asm/arch-sc5xx/sc5xx.h
diff --git a/arch/arm/include/asm/arch-adi/sc5xx/soc.h b/arch/arm/include/asm/arch-sc5xx/soc.h
index 065d272acab..065d272acab 100644
--- a/arch/arm/include/asm/arch-adi/sc5xx/soc.h
+++ b/arch/arm/include/asm/arch-sc5xx/soc.h
diff --git a/arch/arm/include/asm/arch-adi/sc5xx/spl.h b/arch/arm/include/asm/arch-sc5xx/spl.h
index 077667daa10..077667daa10 100644
--- a/arch/arm/include/asm/arch-adi/sc5xx/spl.h
+++ b/arch/arm/include/asm/arch-sc5xx/spl.h
diff --git a/arch/arm/mach-sc5xx/Kconfig b/arch/arm/mach-sc5xx/Kconfig
index 774c69091ee..cfa7ed46a82 100644
--- a/arch/arm/mach-sc5xx/Kconfig
+++ b/arch/arm/mach-sc5xx/Kconfig
@@ -13,6 +13,9 @@ if ARCH_SC5XX
 config SYS_VENDOR
 	default "adi"
 
+config SYS_SOC
+	default "sc5xx"
+
 choice
 	prompt "SC5xx SoC Select"
 	help
diff --git a/arch/arm/mach-sc5xx/init/clkinit.c b/arch/arm/mach-sc5xx/init/clkinit.c
index 3dcba33bd1b..f9c83c6efac 100644
--- a/arch/arm/mach-sc5xx/init/clkinit.c
+++ b/arch/arm/mach-sc5xx/init/clkinit.c
@@ -6,7 +6,7 @@
  *
  */
 
-#include <asm/arch-adi/sc5xx/sc5xx.h>
+#include <asm/arch/sc5xx.h>
 #include <asm/io.h>
 #include <linux/types.h>
 #include "clkinit.h"
diff --git a/arch/arm/mach-sc5xx/init/dmcinit.c b/arch/arm/mach-sc5xx/init/dmcinit.c
index 2bf2cc53a9f..12052613feb 100644
--- a/arch/arm/mach-sc5xx/init/dmcinit.c
+++ b/arch/arm/mach-sc5xx/init/dmcinit.c
@@ -7,7 +7,7 @@
  */
 
 #include <asm/io.h>
-#include <asm/arch-adi/sc5xx/sc5xx.h>
+#include <asm/arch/sc5xx.h>
 #include <linux/types.h>
 #include "clkinit.h"
 #include "dmcinit.h"
diff --git a/arch/arm/mach-sc5xx/sc57x-spl.c b/arch/arm/mach-sc5xx/sc57x-spl.c
index 28380b89b48..6084493cf4f 100644
--- a/arch/arm/mach-sc5xx/sc57x-spl.c
+++ b/arch/arm/mach-sc5xx/sc57x-spl.c
@@ -3,7 +3,7 @@
  * (C) Copyright 2024 - Analog Devices, Inc.
  */
 
-#include <asm/arch-adi/sc5xx/spl.h>
+#include <asm/arch/spl.h>
 
 // Table 45-16 in SC573 HRM
 const struct adi_boot_args adi_rom_boot_args[] = {
diff --git a/arch/arm/mach-sc5xx/sc57x.c b/arch/arm/mach-sc5xx/sc57x.c
index 02b04cd1b2f..7e58e92b188 100644
--- a/arch/arm/mach-sc5xx/sc57x.c
+++ b/arch/arm/mach-sc5xx/sc57x.c
@@ -7,8 +7,8 @@
  */
 
 #include <asm/io.h>
-#include <asm/arch-adi/sc5xx/sc5xx.h>
-#include <asm/arch-adi/sc5xx/spl.h>
+#include <asm/arch/sc5xx.h>
+#include <asm/arch/spl.h>
 
 #define REG_SPU0_SECUREC0 0x3108B980
 #define REG_PADS0_PCFG0 0x31004404
diff --git a/arch/arm/mach-sc5xx/sc58x-spl.c b/arch/arm/mach-sc5xx/sc58x-spl.c
index ae809f09e55..2582e38ce12 100644
--- a/arch/arm/mach-sc5xx/sc58x-spl.c
+++ b/arch/arm/mach-sc5xx/sc58x-spl.c
@@ -3,7 +3,7 @@
  * (C) Copyright 2024 - Analog Devices, Inc.
  */
 
-#include <asm/arch-adi/sc5xx/spl.h>
+#include <asm/arch/spl.h>
 
 // Table 53-13 in SC58x HRM
 const struct adi_boot_args adi_rom_boot_args[] = {
diff --git a/arch/arm/mach-sc5xx/sc58x.c b/arch/arm/mach-sc5xx/sc58x.c
index c981cafd986..dc11df683a8 100644
--- a/arch/arm/mach-sc5xx/sc58x.c
+++ b/arch/arm/mach-sc5xx/sc58x.c
@@ -7,8 +7,8 @@
  */
 
 #include <asm/io.h>
-#include <asm/arch-adi/sc5xx/sc5xx.h>
-#include <asm/arch-adi/sc5xx/spl.h>
+#include <asm/arch/sc5xx.h>
+#include <asm/arch/spl.h>
 
 #define REG_SPU0_SECUREC0 0x3108C980
 #define REG_PADS0_PCFG0 0x31004404
diff --git a/arch/arm/mach-sc5xx/sc59x-spl.c b/arch/arm/mach-sc5xx/sc59x-spl.c
index c8fc25fe7c4..883bdb3c772 100644
--- a/arch/arm/mach-sc5xx/sc59x-spl.c
+++ b/arch/arm/mach-sc5xx/sc59x-spl.c
@@ -3,7 +3,7 @@
  * (C) Copyright 2024 - Analog Devices, Inc.
  */
 
-#include <asm/arch-adi/sc5xx/spl.h>
+#include <asm/arch/spl.h>
 
 // Table 45-14 in sc594 HRM
 const struct adi_boot_args adi_rom_boot_args[] = {
diff --git a/arch/arm/mach-sc5xx/sc59x.c b/arch/arm/mach-sc5xx/sc59x.c
index 675f8c7d69a..286f6d52eef 100644
--- a/arch/arm/mach-sc5xx/sc59x.c
+++ b/arch/arm/mach-sc5xx/sc59x.c
@@ -7,8 +7,8 @@
  */
 
 #include <asm/io.h>
-#include <asm/arch-adi/sc5xx/sc5xx.h>
-#include <asm/arch-adi/sc5xx/spl.h>
+#include <asm/arch/sc5xx.h>
+#include <asm/arch/spl.h>
 
 #define REG_SPU0_SECUREC0 0x3108B980
 #define REG_PADS0_PCFG0 0x31004604
diff --git a/arch/arm/mach-sc5xx/sc59x_64-spl.c b/arch/arm/mach-sc5xx/sc59x_64-spl.c
index 3992538133d..500824b5bb9 100644
--- a/arch/arm/mach-sc5xx/sc59x_64-spl.c
+++ b/arch/arm/mach-sc5xx/sc59x_64-spl.c
@@ -3,7 +3,7 @@
  * (C) Copyright 2024 - Analog Devices, Inc.
  */
 
-#include <asm/arch-adi/sc5xx/spl.h>
+#include <asm/arch/spl.h>
 
 // Table 47-14 in SC598 hardware reference manual
 const struct adi_boot_args adi_rom_boot_args[] = {
diff --git a/arch/arm/mach-sc5xx/sc59x_64.c b/arch/arm/mach-sc5xx/sc59x_64.c
index a8402075d0a..b9694a48e87 100644
--- a/arch/arm/mach-sc5xx/sc59x_64.c
+++ b/arch/arm/mach-sc5xx/sc59x_64.c
@@ -8,8 +8,8 @@
 
 #include <asm/io.h>
 #include <asm/armv8/mmu.h>
-#include <asm/arch-adi/sc5xx/sc5xx.h>
-#include <asm/arch-adi/sc5xx/spl.h>
+#include <asm/arch/sc5xx.h>
+#include <asm/arch/spl.h>
 
 #define REG_TSGENWR0_CNTCR 0x310AE000
 #define REG_PADS0_PCFG0 0x31004604
diff --git a/arch/arm/mach-sc5xx/soc.c b/arch/arm/mach-sc5xx/soc.c
index cf8ff0dc3af..09978a5cf44 100644
--- a/arch/arm/mach-sc5xx/soc.c
+++ b/arch/arm/mach-sc5xx/soc.c
@@ -6,8 +6,8 @@
  *
  */
 
-#include <asm/arch-adi/sc5xx/sc5xx.h>
-#include <asm/arch-adi/sc5xx/soc.h>
+#include <asm/arch/sc5xx.h>
+#include <asm/arch/soc.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <cpu_func.h>
diff --git a/arch/arm/mach-sc5xx/spl.c b/arch/arm/mach-sc5xx/spl.c
index c529829420d..94e4a08fa32 100644
--- a/arch/arm/mach-sc5xx/spl.c
+++ b/arch/arm/mach-sc5xx/spl.c
@@ -7,8 +7,8 @@
  */
 
 #include <spl.h>
-#include <asm/arch-adi/sc5xx/sc5xx.h>
-#include <asm/arch-adi/sc5xx/spl.h>
+#include <asm/arch/sc5xx.h>
+#include <asm/arch/spl.h>
 #include "init/clkinit.h"
 #include "init/dmcinit.h"
 
diff --git a/board/adi/carriers/somcrr_common.c b/board/adi/carriers/somcrr_common.c
index 34ae48f31d2..7bd890d6e70 100644
--- a/board/adi/carriers/somcrr_common.c
+++ b/board/adi/carriers/somcrr_common.c
@@ -3,7 +3,7 @@
  * (C) Copyright 2025 - Analog Devices, Inc.
  */
 
-#include <asm/arch-adi/sc5xx/sc5xx.h>
+#include <asm/arch/sc5xx.h>
 #include <linux/delay.h>
 
 #include "somcrr.h"
diff --git a/board/adi/common-sc594-som/sc594-som.c b/board/adi/common-sc594-som/sc594-som.c
index aab729fc761..37817c4b062 100644
--- a/board/adi/common-sc594-som/sc594-som.c
+++ b/board/adi/common-sc594-som/sc594-som.c
@@ -6,8 +6,8 @@
 #include <config.h>
 #include <phy.h>
 #include <asm/u-boot.h>
-#include <asm/arch-adi/sc5xx/sc5xx.h>
-#include <asm/arch-adi/sc5xx/soc.h>
+#include <asm/arch/sc5xx.h>
+#include <asm/arch/soc.h>
 
 #include "../carriers/somcrr.h"
 
diff --git a/board/adi/common-sc598-som/sc598-som.c b/board/adi/common-sc598-som/sc598-som.c
index 96b73520e66..0e1ee828956 100644
--- a/board/adi/common-sc598-som/sc598-som.c
+++ b/board/adi/common-sc598-som/sc598-som.c
@@ -6,8 +6,8 @@
 #include <config.h>
 #include <phy.h>
 #include <asm/u-boot.h>
-#include <asm/arch-adi/sc5xx/sc5xx.h>
-#include <asm/arch-adi/sc5xx/soc.h>
+#include <asm/arch/sc5xx.h>
+#include <asm/arch/soc.h>
 #include <asm/armv8/mmu.h>
 
 #include "../carriers/somcrr.h"
diff --git a/board/adi/sc573-ezkit/sc573-ezkit.c b/board/adi/sc573-ezkit/sc573-ezkit.c
index 288c2670761..464142b27a5 100644
--- a/board/adi/sc573-ezkit/sc573-ezkit.c
+++ b/board/adi/sc573-ezkit/sc573-ezkit.c
@@ -5,8 +5,8 @@
 
 #include <phy.h>
 #include <asm/u-boot.h>
-#include <asm/arch-adi/sc5xx/sc5xx.h>
-#include <asm/arch-adi/sc5xx/soc.h>
+#include <asm/arch/sc5xx.h>
+#include <asm/arch/soc.h>
 
 int board_phy_config(struct phy_device *phydev)
 {
diff --git a/board/adi/sc584-ezkit/sc584-ezkit.c b/board/adi/sc584-ezkit/sc584-ezkit.c
index 288c2670761..464142b27a5 100644
--- a/board/adi/sc584-ezkit/sc584-ezkit.c
+++ b/board/adi/sc584-ezkit/sc584-ezkit.c
@@ -5,8 +5,8 @@
 
 #include <phy.h>
 #include <asm/u-boot.h>
-#include <asm/arch-adi/sc5xx/sc5xx.h>
-#include <asm/arch-adi/sc5xx/soc.h>
+#include <asm/arch/sc5xx.h>
+#include <asm/arch/soc.h>
 
 int board_phy_config(struct phy_device *phydev)
 {
diff --git a/board/adi/sc589-ezkit/sc589-ezkit.c b/board/adi/sc589-ezkit/sc589-ezkit.c
index 288c2670761..464142b27a5 100644
--- a/board/adi/sc589-ezkit/sc589-ezkit.c
+++ b/board/adi/sc589-ezkit/sc589-ezkit.c
@@ -5,8 +5,8 @@
 
 #include <phy.h>
 #include <asm/u-boot.h>
-#include <asm/arch-adi/sc5xx/sc5xx.h>
-#include <asm/arch-adi/sc5xx/soc.h>
+#include <asm/arch/sc5xx.h>
+#include <asm/arch/soc.h>
 
 int board_phy_config(struct phy_device *phydev)
 {
diff --git a/board/adi/sc589-mini/sc589-mini.c b/board/adi/sc589-mini/sc589-mini.c
index 288c2670761..464142b27a5 100644
--- a/board/adi/sc589-mini/sc589-mini.c
+++ b/board/adi/sc589-mini/sc589-mini.c
@@ -5,8 +5,8 @@
 
 #include <phy.h>
 #include <asm/u-boot.h>
-#include <asm/arch-adi/sc5xx/sc5xx.h>
-#include <asm/arch-adi/sc5xx/soc.h>
+#include <asm/arch/sc5xx.h>
+#include <asm/arch/soc.h>
 
 int board_phy_config(struct phy_device *phydev)
 {
diff --git a/drivers/net/dwc_eth_qos_adi.c b/drivers/net/dwc_eth_qos_adi.c
index b578225eaad..37db8525b48 100644
--- a/drivers/net/dwc_eth_qos_adi.c
+++ b/drivers/net/dwc_eth_qos_adi.c
@@ -15,7 +15,7 @@
 #include <reset.h>
 #include <linux/io.h>
 
-#include <asm/arch-adi/sc5xx/sc5xx.h>
+#include <asm/arch/sc5xx.h>
 
 #include "dwc_eth_qos.h"