From 01065043ad9deec894dcd76b1ac44eb9e502f6e0 Mon Sep 17 00:00:00 2001
From: Thomas Fitzsimmons <fitzsim@fitzsim.org>
Date: Sat, 4 Feb 2023 20:36:57 -0500
Subject: [PATCH] arm: bcm7xxx: Convert to DM_SERIAL

Remove ns16550 configuration from header files.  Document
DM_SERIAL-required prior stage device tree configuration.
---
 configs/bcm7260_defconfig |  4 ++--
 configs/bcm7445_defconfig |  4 ++--
 doc/README.bcm7xxx        |  6 ++++++
 include/configs/bcm7260.h |  2 --
 include/configs/bcm7445.h |  2 --
 include/configs/bcmstb.h  | 13 -------------
 6 files changed, 10 insertions(+), 21 deletions(-)

diff --git a/configs/bcm7260_defconfig b/configs/bcm7260_defconfig
index f8e0327d8f..51e0a5ddd7 100644
--- a/configs/bcm7260_defconfig
+++ b/configs/bcm7260_defconfig
@@ -40,6 +40,6 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_BCMSTB=y
 CONFIG_MTD=y
-CONFIG_SYS_NS16550_SERIAL=y
-CONFIG_SYS_NS16550_REG_SIZE=-4
+CONFIG_DM_SERIAL=y
+CONFIG_SYS_NS16550=y
 # CONFIG_EFI_LOADER is not set
diff --git a/configs/bcm7445_defconfig b/configs/bcm7445_defconfig
index 81433b02cb..f5f1e8d397 100644
--- a/configs/bcm7445_defconfig
+++ b/configs/bcm7445_defconfig
@@ -44,8 +44,8 @@ CONFIG_MTD=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_SPI_FLASH_STMICRO=y
-CONFIG_SYS_NS16550_SERIAL=y
-CONFIG_SYS_NS16550_REG_SIZE=-4
+CONFIG_DM_SERIAL=y
+CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_BCMSTB_SPI=y
diff --git a/doc/README.bcm7xxx b/doc/README.bcm7xxx
index 9b5eae4741..6839da5f97 100644
--- a/doc/README.bcm7xxx
+++ b/doc/README.bcm7xxx
@@ -31,6 +31,12 @@ ${CROSS_COMPILE}strip u-boot
 Run
 ===
 
+To tell U-Boot which serial port to use for its console, set the
+"stdout-path" property in the "/chosen" node of the BOLT-generated
+device tree.  For example:
+
+BOLT> dt add prop chosen stdout-path s serial0:115200n8
+
 Flash the u-boot binary into board storage, then invoke it from BOLT.
 For example:
 
diff --git a/include/configs/bcm7260.h b/include/configs/bcm7260.h
index 43edc91b10..dbe545c175 100644
--- a/include/configs/bcm7260.h
+++ b/include/configs/bcm7260.h
@@ -10,8 +10,6 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#define CFG_SYS_NS16550_COM1	0xf040c000
-
 #define CFG_SYS_INIT_RAM_ADDR	0x10200000
 
 #include "bcmstb.h"
diff --git a/include/configs/bcm7445.h b/include/configs/bcm7445.h
index 114337294e..b59048d175 100644
--- a/include/configs/bcm7445.h
+++ b/include/configs/bcm7445.h
@@ -10,8 +10,6 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#define CFG_SYS_NS16550_COM1	0xf040ab00
-
 #define CFG_SYS_INIT_RAM_ADDR	0x80200000
 
 #include "bcmstb.h"
diff --git a/include/configs/bcmstb.h b/include/configs/bcmstb.h
index d1de3561af..c9280927b3 100644
--- a/include/configs/bcmstb.h
+++ b/include/configs/bcmstb.h
@@ -92,19 +92,6 @@ extern phys_addr_t prior_stage_fdt_address;
  * Large kernel image bootm configuration.
  */
 
-/*
- * NS16550 configuration.
- */
-#define V_NS16550_CLK			81000000
-
-#define CFG_SYS_NS16550_CLK		V_NS16550_CLK
-
-/*
- * Serial console configuration.
- */
-#define CFG_SYS_BAUDRATE_TABLE	{4800, 9600, 19200, 38400, 57600, \
-					 115200}
-
 /*
  * Informational display configuration.
  */
-- 
2.39.5