12 files changed, 6 insertions, 7 deletions

diff --git a/src/soc/amd/cezanne/early_fch.c b/src/soc/amd/cezanne/early_fch.c
index 0b8e9a0161..9e99da227d 100644
--- a/src/soc/amd/cezanne/early_fch.c
+++ b/src/soc/amd/cezanne/early_fch.c
@@ -7,6 +7,7 @@
 #include <amdblocks/lpc.h>
 #include <amdblocks/pmlib.h>
 #include <amdblocks/smbus.h>
+#include <amdblocks/uart.h>
 #include <soc/i2c.h>
 #include <soc/southbridge.h>
 #include <soc/uart.h>
diff --git a/src/soc/amd/cezanne/include/soc/uart.h b/src/soc/amd/cezanne/include/soc/uart.h
index 8affe10ce3..b9242d7e38 100644
--- a/src/soc/amd/cezanne/include/soc/uart.h
+++ b/src/soc/amd/cezanne/include/soc/uart.h
@@ -5,7 +5,6 @@
 
 #include <types.h>
 
-void set_uart_config(unsigned int idx); /* configure hardware of FCH UART selected by idx */
 void clear_uart_legacy_config(void); /* disable legacy I/O decode for FCH UART */
 
 #endif /* AMD_CEZANNE_UART_H */
diff --git a/src/soc/amd/common/block/include/amdblocks/uart.h b/src/soc/amd/common/block/include/amdblocks/uart.h
index 4e8ea8ca35..a613bbec83 100644
--- a/src/soc/amd/common/block/include/amdblocks/uart.h
+++ b/src/soc/amd/common/block/include/amdblocks/uart.h
@@ -16,5 +16,6 @@ struct soc_uart_ctrlr_info {
 
 uintptr_t get_uart_base(unsigned int idx); /* get MMIO base address of FCH UART */
 void uart_inject_ssdt(const struct device *dev);
+void set_uart_config(unsigned int idx); /* configure hardware of FCH UART selected by idx */
 
 #endif /* AMD_BLOCK_UART_H */
diff --git a/src/soc/amd/mendocino/early_fch.c b/src/soc/amd/mendocino/early_fch.c
index a1cf908a4d..fb359b33b3 100644
--- a/src/soc/amd/mendocino/early_fch.c
+++ b/src/soc/amd/mendocino/early_fch.c
@@ -9,6 +9,7 @@
 #include <amdblocks/lpc.h>
 #include <amdblocks/pmlib.h>
 #include <amdblocks/smbus.h>
+#include <amdblocks/uart.h>
 #include <soc/i2c.h>
 #include <soc/southbridge.h>
 #include <soc/uart.h>
diff --git a/src/soc/amd/mendocino/include/soc/uart.h b/src/soc/amd/mendocino/include/soc/uart.h
index 6e22ef758b..b7bd9774e3 100644
--- a/src/soc/amd/mendocino/include/soc/uart.h
+++ b/src/soc/amd/mendocino/include/soc/uart.h
@@ -5,7 +5,6 @@
 
 #include <types.h>
 
-void set_uart_config(unsigned int idx); /* configure hardware of FCH UART selected by idx */
 void clear_uart_legacy_config(void); /* disable legacy I/O decode for FCH UART */
 
 #endif /* AMD_MENDOCINO_UART_H */
diff --git a/src/soc/amd/morgana/early_fch.c b/src/soc/amd/morgana/early_fch.c
index f940deaf3b..f8954b59be 100644
--- a/src/soc/amd/morgana/early_fch.c
+++ b/src/soc/amd/morgana/early_fch.c
@@ -9,6 +9,7 @@
 #include <amdblocks/lpc.h>
 #include <amdblocks/pmlib.h>
 #include <amdblocks/smbus.h>
+#include <amdblocks/uart.h>
 #include <soc/i2c.h>
 #include <soc/southbridge.h>
 #include <soc/uart.h>
diff --git a/src/soc/amd/morgana/include/soc/uart.h b/src/soc/amd/morgana/include/soc/uart.h
index 45e0ed9560..ef911b5f5f 100644
--- a/src/soc/amd/morgana/include/soc/uart.h
+++ b/src/soc/amd/morgana/include/soc/uart.h
@@ -7,7 +7,6 @@
 
 #include <types.h>
 
-void set_uart_config(unsigned int idx); /* configure hardware of FCH UART selected by idx */
 void clear_uart_legacy_config(void); /* disable legacy I/O decode for FCH UART */
 
 #endif /* AMD_MORGANA_UART_H */
diff --git a/src/soc/amd/picasso/early_fch.c b/src/soc/amd/picasso/early_fch.c
index e77f2963fd..9716d13cec 100644
--- a/src/soc/amd/picasso/early_fch.c
+++ b/src/soc/amd/picasso/early_fch.c
@@ -8,6 +8,7 @@
 #include <amdblocks/pmlib.h>
 #include <amdblocks/smbus.h>
 #include <amdblocks/spi.h>
+#include <amdblocks/uart.h>
 #include <soc/i2c.h>
 #include <soc/southbridge.h>
 #include <soc/uart.h>
diff --git a/src/soc/amd/picasso/include/soc/uart.h b/src/soc/amd/picasso/include/soc/uart.h
index 9b99cd4b24..cdcfead49d 100644
--- a/src/soc/amd/picasso/include/soc/uart.h
+++ b/src/soc/amd/picasso/include/soc/uart.h
@@ -5,7 +5,6 @@
 
 #include <types.h>
 
-void set_uart_config(unsigned int idx); /* configure hardware of FCH UART selected by idx */
 void clear_uart_legacy_config(void); /* disable legacy I/O decode for FCH UART */
 
 #endif /* AMD_PICASSO_UART_H */
diff --git a/src/soc/amd/stoneyridge/early_fch.c b/src/soc/amd/stoneyridge/early_fch.c
index 5e2be614e0..4cc4729bdd 100644
--- a/src/soc/amd/stoneyridge/early_fch.c
+++ b/src/soc/amd/stoneyridge/early_fch.c
@@ -8,6 +8,7 @@
 #include <amdblocks/reset.h>
 #include <amdblocks/smbus.h>
 #include <amdblocks/spi.h>
+#include <amdblocks/uart.h>
 #include <soc/southbridge.h>
 #include <types.h>
 
diff --git a/src/soc/amd/stoneyridge/include/soc/southbridge.h b/src/soc/amd/stoneyridge/include/soc/southbridge.h
index 26500efd04..616a6afe79 100644
--- a/src/soc/amd/stoneyridge/include/soc/southbridge.h
+++ b/src/soc/amd/stoneyridge/include/soc/southbridge.h
@@ -183,8 +183,6 @@ void fch_final(void *chip_info);
 
 void fch_clk_output_48Mhz(u32 osc);
 
-void set_uart_config(unsigned int idx);
-
 /*
  * Call the mainboard to get the USB Over Current Map. The mainboard
  * returns the map and 0 on Success or -1 on error or no map. There is
diff --git a/src/soc/amd/stoneyridge/uart.c b/src/soc/amd/stoneyridge/uart.c
index 9a8add077b..837a1bff7e 100644
--- a/src/soc/amd/stoneyridge/uart.c
+++ b/src/soc/amd/stoneyridge/uart.c
@@ -6,7 +6,6 @@
 #include <soc/aoac_defs.h>
 #include <soc/gpio.h>
 #include <soc/iomap.h>
-#include <soc/southbridge.h>
 #include <types.h>
 
 static const struct soc_uart_ctrlr_info uart_info[] = {