Shelley Chen submitted this change.

View Change

Approvals:
  build bot (Jenkins): Verified
  Shelley Chen: Looks good to me, approved

soc/qualcomm: move uart_bitbang UART w/gpio code to common

BUG=b:182963902
TEST=Validated on qualcomm sc7280 development board

Change-Id: Ic6c70f917a59e233f6ea518d9c39f73fe84991c3
Signed-off-by: Ravi Kumar Bokka <rbokka@codeaurora.org>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/47284
Reviewed-by: Shelley Chen <shchen@google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
---
R src/soc/qualcomm/common/uart_bitbang.c
M src/soc/qualcomm/sc7180/Makefile.inc
A src/soc/qualcomm/sc7180/include/soc/uart.h
M src/soc/qualcomm/sc7280/Makefile.inc
A src/soc/qualcomm/sc7280/include/soc/uart.h
5 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/src/soc/qualcomm/sc7180/uart_bitbang.c b/src/soc/qualcomm/common/uart_bitbang.c
similarity index 94%
rename from src/soc/qualcomm/sc7180/uart_bitbang.c
rename to src/soc/qualcomm/common/uart_bitbang.c
index 7d88a20..943dcf8 100644
--- a/src/soc/qualcomm/sc7180/uart_bitbang.c
+++ b/src/soc/qualcomm/common/uart_bitbang.c
@@ -3,8 +3,7 @@
 #include <console/uart.h>
 #include <gpio.h>
 #include <boot/coreboot_tables.h>
-
-#define UART_TX_PIN GPIO(44)
+#include <soc/uart.h>
 
 void uart_fill_lb(void *data)
 {
diff --git a/src/soc/qualcomm/sc7180/Makefile.inc b/src/soc/qualcomm/sc7180/Makefile.inc
index e84dcc8..5ac1f3f 100644
--- a/src/soc/qualcomm/sc7180/Makefile.inc
+++ b/src/soc/qualcomm/sc7180/Makefile.inc
@@ -17,7 +17,7 @@
 ################################################################################
 bootblock-y += bootblock.c
 bootblock-y += mmu.c
-bootblock-$(CONFIG_DRIVERS_UART) += uart_bitbang.c
+bootblock-$(CONFIG_DRIVERS_UART) += ../common/uart_bitbang.c
 
 ################################################################################
 verstage-$(CONFIG_DRIVERS_UART) += qupv3_uart.c
diff --git a/src/soc/qualcomm/sc7180/include/soc/uart.h b/src/soc/qualcomm/sc7180/include/soc/uart.h
new file mode 100644
index 0000000..e6b2e62
--- /dev/null
+++ b/src/soc/qualcomm/sc7180/include/soc/uart.h
@@ -0,0 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
+#ifndef _SOC_QUALCOMM_SC7180_UART_TX_H_
+#define _SOC_QUALCOMM_SC7180_UART_TX_H_
+
+#define UART_TX_PIN GPIO(44)
+
+#endif /* _SOC_QUALCOMM_SC7180_UART_TX_H_ */
diff --git a/src/soc/qualcomm/sc7280/Makefile.inc b/src/soc/qualcomm/sc7280/Makefile.inc
index abcc3fb..3c34be0 100644
--- a/src/soc/qualcomm/sc7280/Makefile.inc
+++ b/src/soc/qualcomm/sc7280/Makefile.inc
@@ -7,6 +7,7 @@
 ################################################################################
 bootblock-y += bootblock.c
 bootblock-y += mmu.c
+bootblock-$(CONFIG_DRIVERS_UART) += ../common/uart_bitbang.c
 
 ################################################################################
 romstage-y += cbmem.c
diff --git a/src/soc/qualcomm/sc7280/include/soc/uart.h b/src/soc/qualcomm/sc7280/include/soc/uart.h
new file mode 100644
index 0000000..2b2f280
--- /dev/null
+++ b/src/soc/qualcomm/sc7280/include/soc/uart.h
@@ -0,0 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
+#ifndef _SOC_QUALCOMM_SC7280_UART_TX_H_
+#define _SOC_QUALCOMM_SC7280_UART_TX_H_
+
+#define UART_TX_PIN GPIO(22)
+
+#endif /* _SOC_QUALCOMM_SC7280_UART_TX_H_ */

To view, visit change 47284. To unsubscribe, or for help writing mail filters, visit settings.