summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelix Held <felix-coreboot@felixheld.de>2021-01-12 23:29:30 +0100
committerFelix Held <felix-coreboot@felixheld.de>2021-01-14 15:00:26 +0000
commit0ad97332e4febd75dbbe8e397334227ad7060573 (patch)
treef07dd9ac254970a7b746046632180c81d699090c
parente7382991ab449dacb762e515b0b3524754ffef9c (diff)
soc/amd/piasso/uart: move get_uart_base prototype to common code header
This will result in less code duplication when the common AMD SoC UART support gets used for more AMD SoCs. Change-Id: Id1786f32324de3e3947d792c599e2019705c5a85 Signed-off-by: Felix Held <felix-coreboot@felixheld.de> Reviewed-on: https://review.coreboot.org/c/coreboot/+/49373 Reviewed-by: Angel Pons <th3fanbus@gmail.com> Reviewed-by: Marshall Dawson <marshalldawson3rd@gmail.com> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
-rw-r--r--src/soc/amd/common/block/include/amdblocks/uart.h10
-rw-r--r--src/soc/amd/common/block/uart/uart_console.c2
-rw-r--r--src/soc/amd/picasso/include/soc/uart.h2
-rw-r--r--src/soc/amd/picasso/uart.c1
4 files changed, 12 insertions, 3 deletions
diff --git a/src/soc/amd/common/block/include/amdblocks/uart.h b/src/soc/amd/common/block/include/amdblocks/uart.h
new file mode 100644
index 0000000000..95d73237f7
--- /dev/null
+++ b/src/soc/amd/common/block/include/amdblocks/uart.h
@@ -0,0 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
+#ifndef AMD_BLOCK_UART_H
+#define AMD_BLOCK_UART_H
+
+#include <types.h>
+
+uintptr_t get_uart_base(unsigned int idx); /* get MMIO base address of FCH UART */
+
+#endif /* AMD_BLOCK_UART_H */
diff --git a/src/soc/amd/common/block/uart/uart_console.c b/src/soc/amd/common/block/uart/uart_console.c
index ff9122fbe4..9f37190d24 100644
--- a/src/soc/amd/common/block/uart/uart_console.c
+++ b/src/soc/amd/common/block/uart/uart_console.c
@@ -1,7 +1,7 @@
/* SPDX-License-Identifier: GPL-2.0-only */
+#include <amdblocks/uart.h>
#include <console/uart.h>
-#include <soc/uart.h>
/*
* uart_platform_base and uart_platform_refclk are used by the console UART driver and need to
diff --git a/src/soc/amd/picasso/include/soc/uart.h b/src/soc/amd/picasso/include/soc/uart.h
index 051c8bf4d5..9b99cd4b24 100644
--- a/src/soc/amd/picasso/include/soc/uart.h
+++ b/src/soc/amd/picasso/include/soc/uart.h
@@ -8,6 +8,4 @@
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 */
-uintptr_t get_uart_base(unsigned int idx); /* get MMIO base address of FCH UART */
-
#endif /* AMD_PICASSO_UART_H */
diff --git a/src/soc/amd/picasso/uart.c b/src/soc/amd/picasso/uart.c
index 472a0be7d5..f46daed4c2 100644
--- a/src/soc/amd/picasso/uart.c
+++ b/src/soc/amd/picasso/uart.c
@@ -6,6 +6,7 @@
#include <device/mmio.h>
#include <amdblocks/gpio_banks.h>
#include <amdblocks/aoac.h>
+#include <amdblocks/uart.h>
#include <soc/southbridge.h>
#include <soc/gpio.h>
#include <soc/uart.h>