From 405f2296892c10a48db50cd66c2eb364cde0806e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20Niew=C3=B6hner?= <foss@mniewoehner.de>
Date: Mon, 21 Dec 2020 03:46:58 +0100
Subject: soc/intel/*: drop UART pad configuration from common code
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

UART pad configuration should not be done in common code, because that
may cause short circuits, when the user sets a wrong UART index.

Since all boards do pad setup on their own now, finally drop the pad
configuration from SoC common code.

Change-Id: Id03719eb8bd0414083148471ed05dea62a895126
Signed-off-by: Michael Niewöhner <foss@mniewoehner.de>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/48829
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Lance Zhao
---
 src/soc/intel/cannonlake/bootblock/bootblock.c |  1 +
 src/soc/intel/cannonlake/uart.c                | 40 ++++----------------------
 2 files changed, 7 insertions(+), 34 deletions(-)

(limited to 'src/soc/intel/cannonlake')

diff --git a/src/soc/intel/cannonlake/bootblock/bootblock.c b/src/soc/intel/cannonlake/bootblock/bootblock.c
index 1354c43a22..01329bf9b1 100644
--- a/src/soc/intel/cannonlake/bootblock/bootblock.c
+++ b/src/soc/intel/cannonlake/bootblock/bootblock.c
@@ -3,6 +3,7 @@
 #include <bootblock_common.h>
 #include <cpu/x86/mtrr.h>
 #include <intelblocks/fast_spi.h>
+#include <intelblocks/gpio.h>
 #include <intelblocks/gspi.h>
 #include <intelblocks/systemagent.h>
 #include <intelblocks/tco.h>
diff --git a/src/soc/intel/cannonlake/uart.c b/src/soc/intel/cannonlake/uart.c
index da0306c9fa..9946880263 100644
--- a/src/soc/intel/cannonlake/uart.c
+++ b/src/soc/intel/cannonlake/uart.c
@@ -1,40 +1,12 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
-#include <device/pci_def.h>
-#include <intelblocks/gpio.h>
-#include <intelblocks/lpss.h>
-#include <intelblocks/pcr.h>
-#include <intelblocks/uart.h>
-#include <soc/iomap.h>
-#include <soc/pch.h>
+#include <commonlib/helpers.h>
 #include <soc/pci_devs.h>
-#include <soc/pcr_ids.h>
 
-const struct uart_controller_config uart_ctrlr_config[] = {
-	{
-		.console_index = 0,
-		.devfn = PCH_DEVFN_UART0,
-		.gpios = {
-			PAD_CFG_NF(GPP_C8, NONE, DEEP, NF1), /* UART0 RX */
-			PAD_CFG_NF(GPP_C9, NONE, DEEP, NF1), /* UART0 TX */
-		},
-	},
-	{
-		.console_index = 1,
-		.devfn = PCH_DEVFN_UART1,
-		.gpios = {
-			PAD_CFG_NF(GPP_C12, NONE, DEEP, NF1), /* UART1 RX */
-			PAD_CFG_NF(GPP_C13, NONE, DEEP, NF1), /* UART1 TX */
-		},
-	},
-	{
-		.console_index = 2,
-		.devfn = PCH_DEVFN_UART2,
-		.gpios = {
-			PAD_CFG_NF(GPP_C20, NONE, DEEP, NF1), /* UART2 RX */
-			PAD_CFG_NF(GPP_C21, NONE, DEEP, NF1), /* UART2 TX */
-		},
-	}
+const unsigned int uart_devices[] = {
+	PCH_DEVFN_UART0,
+	PCH_DEVFN_UART1,
+	PCH_DEVFN_UART2,
 };
 
-const int uart_ctrlr_config_size = ARRAY_SIZE(uart_ctrlr_config);
+const int uart_devices_size = ARRAY_SIZE(uart_devices);
-- 
cgit v1.2.3