From c98bf0533be6479f6b7d973b2419e9c4b7181456 Mon Sep 17 00:00:00 2001
From: Philip Molloy <philip.molloy@analog.com>
Date: Tue, 24 Mar 2026 10:09:44 +0000
Subject: 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>
---
 board/adi/carriers/somcrr_common.c     | 2 +-
 board/adi/common-sc594-som/sc594-som.c | 4 ++--
 board/adi/common-sc598-som/sc598-som.c | 4 ++--
 board/adi/sc573-ezkit/sc573-ezkit.c    | 4 ++--
 board/adi/sc584-ezkit/sc584-ezkit.c    | 4 ++--
 board/adi/sc589-ezkit/sc589-ezkit.c    | 4 ++--
 board/adi/sc589-mini/sc589-mini.c      | 4 ++--
 7 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'board')

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)
 {
-- 
cgit v1.2.3