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 <philip.molloy@analog.com>
2026-06-02 09:46:37 +03:00 · 2026-03-24 10:09:44 +00:00
parent 8c212d6e2e
commit c98bf0533b
25 changed files with 36 additions and 33 deletions
--- a/2
+++ b/2
@@ -640,7 +640,7 @@ L:	linux@analog.com
 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*
--- a/arch/arm/include/asm/arch-adi/sc5xx/sc5xx.h
+++ b/arch/arm/include/asm/arch-adi/sc5xx/sc5xx.h
--- a/arch/arm/include/asm/arch-adi/sc5xx/soc.h
+++ b/arch/arm/include/asm/arch-adi/sc5xx/soc.h
--- a/arch/arm/include/asm/arch-adi/sc5xx/spl.h
+++ b/arch/arm/include/asm/arch-adi/sc5xx/spl.h
--- 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
--- 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"
--- 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"
--- 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[] = {
--- 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
--- 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[] = {
--- 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
--- 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[] = {
--- 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
--- 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[] = {
--- 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
--- 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>
--- 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"

--- 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"
--- 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"

--- 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"
--- 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)
 {
--- 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)
 {
--- 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)
 {
--- 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)
 {
--- 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"