29 files changed, 35 insertions, 25 deletions
diff --git a/src/cpu/ti/Kconfig b/src/cpu/ti/Kconfig
deleted file mode 100644
index 119e84bfc1..0000000000
--- a/src/cpu/ti/Kconfig
+++ /dev/null
@@ -1 +0,0 @@
-source "src/cpu/ti/am335x/Kconfig"
diff --git a/src/cpu/ti/Makefile.inc b/src/cpu/ti/Makefile.inc
deleted file mode 100644
index 64b22f62f2..0000000000
--- a/src/cpu/ti/Makefile.inc
+++ /dev/null
@@ -1 +0,0 @@
-subdirs-$(CONFIG_CPU_TI_AM335X) += am335x
diff --git a/src/mainboard/ti/beaglebone/Kconfig b/src/mainboard/ti/beaglebone/Kconfig
index 7399f22693..5be310cf80 100644
--- a/src/mainboard/ti/beaglebone/Kconfig
+++ b/src/mainboard/ti/beaglebone/Kconfig
@@ -4,7 +4,7 @@ if BOARD_TI_BEAGLEBONE
 
 config BOARD_SPECIFIC_OPTIONS
 	def_bool y
-	select CPU_TI_AM335X
+	select SOC_TI_AM335X
 	select BOARD_ROMSIZE_KB_4096
 	select MISSING_BOARD_RESET
 
diff --git a/src/mainboard/ti/beaglebone/bootblock.c b/src/mainboard/ti/beaglebone/bootblock.c
index 6e9538b229..ca1a39060d 100644
--- a/src/mainboard/ti/beaglebone/bootblock.c
+++ b/src/mainboard/ti/beaglebone/bootblock.c
@@ -3,9 +3,9 @@
 #include <device/mmio.h>
 #include <bootblock_common.h>
 #include <console/uart.h>
-#include <cpu/ti/am335x/clock.h>
-#include <cpu/ti/am335x/gpio.h>
-#include <cpu/ti/am335x/pinmux.h>
+#include <soc/ti/am335x/clock.h>
+#include <soc/ti/am335x/gpio.h>
+#include <soc/ti/am335x/pinmux.h>
 
 #include "leds.h"
 
diff --git a/src/mainboard/ti/beaglebone/devicetree.cb b/src/mainboard/ti/beaglebone/devicetree.cb
index dd999b4870..217a20175b 100644
--- a/src/mainboard/ti/beaglebone/devicetree.cb
+++ b/src/mainboard/ti/beaglebone/devicetree.cb
@@ -1,5 +1,5 @@
 ## SPDX-License-Identifier: GPL-2.0-only
 
-chip cpu/ti/am335x
+chip soc/ti/am335x
 	device cpu_cluster 0 on end
 end
diff --git a/src/mainboard/ti/beaglebone/leds.c b/src/mainboard/ti/beaglebone/leds.c
index 99ae6d934a..df58feaa1b 100644
--- a/src/mainboard/ti/beaglebone/leds.c
+++ b/src/mainboard/ti/beaglebone/leds.c
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later */
 
 #include <assert.h>
-#include <cpu/ti/am335x/gpio.h>
+#include <soc/ti/am335x/gpio.h>
 
 #include "leds.h"
 
diff --git a/src/soc/ti/Kconfig b/src/soc/ti/Kconfig
new file mode 100644
index 0000000000..eb66519f2e
--- /dev/null
+++ b/src/soc/ti/Kconfig
@@ -0,0 +1 @@
+source "src/soc/ti/am335x/Kconfig"
diff --git a/src/soc/ti/Makefile.inc b/src/soc/ti/Makefile.inc
new file mode 100644
index 0000000000..357cc82e18
--- /dev/null
+++ b/src/soc/ti/Makefile.inc
@@ -0,0 +1 @@
+subdirs-$(CONFIG_SOC_TI_AM335X) += am335x
diff --git a/src/cpu/ti/am335x/Kconfig b/src/soc/ti/am335x/Kconfig
index 3684480929..533a0de628 100644
--- a/src/cpu/ti/am335x/Kconfig
+++ b/src/soc/ti/am335x/Kconfig
@@ -1,4 +1,4 @@
-config CPU_TI_AM335X
+config SOC_TI_AM335X
 	select ARCH_BOOTBLOCK_ARMV7
 	select ARCH_VERSTAGE_ARMV7
 	select ARCH_ROMSTAGE_ARMV7
@@ -9,10 +9,10 @@ config CPU_TI_AM335X
 	bool
 	default n
 
-if CPU_TI_AM335X
+if SOC_TI_AM335X
 
 config MEMLAYOUT_LD_FILE
 	string
-	default "src/cpu/ti/am335x/memlayout.ld"
+	default "src/soc/ti/am335x/memlayout.ld"
 
 endif
diff --git a/src/cpu/ti/am335x/Makefile.inc b/src/soc/ti/am335x/Makefile.inc
index 6f414bcf79..2865338217 100644
--- a/src/cpu/ti/am335x/Makefile.inc
+++ b/src/soc/ti/am335x/Makefile.inc
@@ -1,3 +1,4 @@
+ifeq ($(CONFIG_SOC_TI_AM335X),y)
 bootblock-y	+= bootblock.c
 bootblock-y	+= bootblock_media.c
 bootblock-y	+= dmtimer.c
@@ -13,6 +14,7 @@ romstage-y	+= monotonic_timer.c
 ramstage-y	+= dmtimer.c
 ramstage-y	+= monotonic_timer.c
 ramstage-y	+= nand.c
+ramstage-y  += soc.c
 
 bootblock-y	+= uart.c
 romstage-y	+= uart.c
@@ -51,3 +53,4 @@ omap-header-y	+= header.c
 
 omap-header-srcs += $(CONFIG_MEMLAYOUT_LD_FILE)
 omap-header-y += header.ld
+endif
diff --git a/src/cpu/ti/am335x/bootblock.c b/src/soc/ti/am335x/bootblock.c
index 985e1a1a0b..985e1a1a0b 100644
--- a/src/cpu/ti/am335x/bootblock.c
+++ b/src/soc/ti/am335x/bootblock.c
diff --git a/src/cpu/ti/am335x/bootblock_media.c b/src/soc/ti/am335x/bootblock_media.c
index 050e0b77da..050e0b77da 100644
--- a/src/cpu/ti/am335x/bootblock_media.c
+++ b/src/soc/ti/am335x/bootblock_media.c
diff --git a/src/cpu/ti/am335x/cbmem.c b/src/soc/ti/am335x/cbmem.c
index 3765874ebe..3765874ebe 100644
--- a/src/cpu/ti/am335x/cbmem.c
+++ b/src/soc/ti/am335x/cbmem.c
diff --git a/src/cpu/ti/am335x/clock.h b/src/soc/ti/am335x/clock.h
index aadd3f6e93..38b4ece249 100644
--- a/src/cpu/ti/am335x/clock.h
+++ b/src/soc/ti/am335x/clock.h
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later */
 
-#ifndef __CPU_TI_AM335X_CLOCK_H__
-#define __CPU_TI_AM335X_CLOCK_H__
+#ifndef __SOC_TI_AM335X_CLOCK_H__
+#define __SOC_TI_AM335X_CLOCK_H__
 
 #include <stdint.h>
 
@@ -219,4 +219,4 @@ struct am335x_cm_cefuse_regs {
 static struct am335x_cm_cefuse_regs * const am335x_cm_cefuse =
 		(void *)0x44e00a00;
 
-#endif	/* __CPU_TI_AM335X_CLOCK_H__ */
+#endif	/* __SOC_TI_AM335X_CLOCK_H__ */
diff --git a/src/cpu/ti/am335x/dmtimer.c b/src/soc/ti/am335x/dmtimer.c
index b3aa7a18ba..b3aa7a18ba 100644
--- a/src/cpu/ti/am335x/dmtimer.c
+++ b/src/soc/ti/am335x/dmtimer.c
diff --git a/src/cpu/ti/am335x/dmtimer.h b/src/soc/ti/am335x/dmtimer.h
index 7e93a0c8f6..ad8515fbba 100644
--- a/src/cpu/ti/am335x/dmtimer.h
+++ b/src/soc/ti/am335x/dmtimer.h
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
-#ifndef __CPU_TI_AM335X_DMTIMER_H__
-#define __CPU_TI_AM335X_DMTIMER_H__
+#ifndef __SOC_TI_AM335X_DMTIMER_H__
+#define __SOC_TI_AM335X_DMTIMER_H__
 
 #include <stdint.h>
 
diff --git a/src/cpu/ti/am335x/gpio.c b/src/soc/ti/am335x/gpio.c
index de7f7404f7..d3d3581f86 100644
--- a/src/cpu/ti/am335x/gpio.c
+++ b/src/soc/ti/am335x/gpio.c
@@ -2,7 +2,7 @@
 
 #include <device/mmio.h>
 #include <console/console.h>
-#include <cpu/ti/am335x/gpio.h>
+#include <soc/ti/am335x/gpio.h>
 #include <stdint.h>
 
 static struct am335x_gpio_regs *gpio_regs_and_bit(unsigned int gpio,
diff --git a/src/cpu/ti/am335x/gpio.h b/src/soc/ti/am335x/gpio.h
index 62ad77ab16..0877a6258c 100644
--- a/src/cpu/ti/am335x/gpio.h
+++ b/src/soc/ti/am335x/gpio.h
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later */
 
-#ifndef __CPU_TI_AM335X_GPIO_H__
-#define __CPU_TI_AM335X_GPIO_H__
+#ifndef __SOC_TI_AM335X_GPIO_H__
+#define __SOC_TI_AM335X_GPIO_H__
 
 #include <stdint.h>
 
@@ -55,4 +55,4 @@ int gpio_direction_output(unsigned int gpio, int value);
 int gpio_get_value(unsigned int gpio);
 int gpio_set_value(unsigned int gpio, int value);
 
-#endif	/* __CPU_TI_AM335X_CLOCK_H__ */
+#endif	/* __SOC_TI_AM335X_CLOCK_H__ */
diff --git a/src/cpu/ti/am335x/header.c b/src/soc/ti/am335x/header.c
index 9edfdd062b..9edfdd062b 100644
--- a/src/cpu/ti/am335x/header.c
+++ b/src/soc/ti/am335x/header.c
diff --git a/src/cpu/ti/am335x/header.h b/src/soc/ti/am335x/header.h
index 578d2136f2..a0a54ad0f3 100644
--- a/src/cpu/ti/am335x/header.h
+++ b/src/soc/ti/am335x/header.h
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later */
 
-#ifndef __CPU_TI_AM335X_HEADER_H
-#define __CPU_TI_AM335X_HEADER_H
+#ifndef __SOC_TI_AM335X_HEADER_H
+#define __SOC_TI_AM335X_HEADER_H
 
 #include <stdint.h>
 
diff --git a/src/cpu/ti/am335x/header.ld b/src/soc/ti/am335x/header.ld
index 84e01362b1..84e01362b1 100644
--- a/src/cpu/ti/am335x/header.ld
+++ b/src/soc/ti/am335x/header.ld
diff --git a/src/cpu/ti/am335x/memlayout.ld b/src/soc/ti/am335x/memlayout.ld
index 78528e63b7..78528e63b7 100644
--- a/src/cpu/ti/am335x/memlayout.ld
+++ b/src/soc/ti/am335x/memlayout.ld
diff --git a/src/cpu/ti/am335x/monotonic_timer.c b/src/soc/ti/am335x/monotonic_timer.c
index b57258b6c8..b57258b6c8 100644
--- a/src/cpu/ti/am335x/monotonic_timer.c
+++ b/src/soc/ti/am335x/monotonic_timer.c
diff --git a/src/cpu/ti/am335x/nand.c b/src/soc/ti/am335x/nand.c
index a7029a02d6..a7029a02d6 100644
--- a/src/cpu/ti/am335x/nand.c
+++ b/src/soc/ti/am335x/nand.c
diff --git a/src/cpu/ti/am335x/pinmux.c b/src/soc/ti/am335x/pinmux.c
index 8cf888405f..8cf888405f 100644
--- a/src/cpu/ti/am335x/pinmux.c
+++ b/src/soc/ti/am335x/pinmux.c
diff --git a/src/cpu/ti/am335x/pinmux.h b/src/soc/ti/am335x/pinmux.h
index 0cb56a6199..c46d03dbc9 100644
--- a/src/cpu/ti/am335x/pinmux.h
+++ b/src/soc/ti/am335x/pinmux.h
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later */
 
-#ifndef __CPU_TI_AM335X_PINMUX_H
-#define __CPU_TI_AM335X_PINMUX_H
+#ifndef __SOC_TI_AM335X_PINMUX_H
+#define __SOC_TI_AM335X_PINMUX_H
 
 #include <stdint.h>
 
diff --git a/src/soc/ti/am335x/soc.c b/src/soc/ti/am335x/soc.c
new file mode 100644
index 0000000000..0362ed9c0c
--- /dev/null
+++ b/src/soc/ti/am335x/soc.c
@@ -0,0 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
+#include <device/device.h>
+
+struct chip_operations soc_ti_am335x_ops = {
+	CHIP_NAME("TI AM335X")
+};
diff --git a/src/cpu/ti/am335x/uart.c b/src/soc/ti/am335x/uart.c
index a8823400ad..90095d47d9 100644
--- a/src/cpu/ti/am335x/uart.c
+++ b/src/soc/ti/am335x/uart.c
@@ -4,7 +4,7 @@
 #include <console/uart.h>
 #include <device/mmio.h>
 #include <boot/coreboot_tables.h>
-#include <cpu/ti/am335x/uart.h>
+#include <soc/ti/am335x/uart.h>
 
 #define EFR_ENHANCED_EN		(1 << 4)
 #define FCR_FIFO_EN		(1 << 0)
diff --git a/src/cpu/ti/am335x/uart.h b/src/soc/ti/am335x/uart.h
index 664d57d42b..664d57d42b 100644
--- a/src/cpu/ti/am335x/uart.h
+++ b/src/soc/ti/am335x/uart.h