From c8cfe7c8ff875bbb4059d86bf0af70ab8b777ec8 Mon Sep 17 00:00:00 2001
From: Raul E Rangel <rrangel@chromium.org>
Date: Tue, 4 May 2021 14:52:05 -0600
Subject: [PATCH] soc/amd/{picasso/common}: Move populate_pirq_data prototype
 to common

This method signature will also be used by cezanne, so move it to
common.

BUG=b:184766519
TEST=Build picasso

Signed-off-by: Raul E Rangel <rrangel@chromium.org>
Change-Id: I421bdad51776278f83148174e6f72bdc38249e54
Reviewed-on: https://review.coreboot.org/c/coreboot/+/52912
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Felix Held <felix-coreboot@felixheld.de>
Reviewed-by: Karthik Ramasubramanian <kramasub@google.com>
---
 src/soc/amd/common/block/include/amdblocks/amd_pci_util.h | 3 +++
 src/soc/amd/picasso/fch.c                                 | 1 -
 src/soc/amd/picasso/include/soc/pci.h                     | 8 --------
 src/soc/amd/picasso/pcie_gpp.c                            | 1 -
 4 files changed, 3 insertions(+), 10 deletions(-)
 delete mode 100644 src/soc/amd/picasso/include/soc/pci.h

diff --git a/src/soc/amd/common/block/include/amdblocks/amd_pci_util.h b/src/soc/amd/common/block/include/amdblocks/amd_pci_util.h
index a14aecff51..081741ad28 100644
--- a/src/soc/amd/common/block/include/amdblocks/amd_pci_util.h
+++ b/src/soc/amd/common/block/include/amdblocks/amd_pci_util.h
@@ -31,4 +31,7 @@ void write_pci_cfg_irqs(void);
 void write_pci_int_table(void);
 const struct irq_idx_name *sb_get_apic_reg_association(size_t *size);
 
+/* Implemented by the SoC */
+void populate_pirq_data(void);
+
 #endif /* AMD_BLOCK_PCI_UTIL_H */
diff --git a/src/soc/amd/picasso/fch.c b/src/soc/amd/picasso/fch.c
index e1c0eba9b5..dcae1adff6 100644
--- a/src/soc/amd/picasso/fch.c
+++ b/src/soc/amd/picasso/fch.c
@@ -23,7 +23,6 @@
 #include <soc/southbridge.h>
 #include <soc/smi.h>
 #include <soc/amd_pci_int_defs.h>
-#include <soc/pci.h>
 #include <soc/pci_devs.h>
 #include <types.h>
 #include "chip.h"
diff --git a/src/soc/amd/picasso/include/soc/pci.h b/src/soc/amd/picasso/include/soc/pci.h
deleted file mode 100644
index b6ff3496c5..0000000000
--- a/src/soc/amd/picasso/include/soc/pci.h
+++ /dev/null
@@ -1,8 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-
-#ifndef AMD_PICASSO_PCI_H
-#define AMD_PICASSO_PCI_H
-
-void populate_pirq_data(void);
-
-#endif /* AMD_PICASSO_PCI_H */
diff --git a/src/soc/amd/picasso/pcie_gpp.c b/src/soc/amd/picasso/pcie_gpp.c
index 582e1287b7..29dfe681fb 100644
--- a/src/soc/amd/picasso/pcie_gpp.c
+++ b/src/soc/amd/picasso/pcie_gpp.c
@@ -9,7 +9,6 @@
 #include <device/pci.h>
 #include <device/pciexp.h>
 #include <device/pci_ids.h>
-#include <soc/pci.h>
 #include <soc/pci_devs.h>
 #include <stdio.h>