summaryrefslogtreecommitdiff
path: root/src/mainboard/amd
diff options
context:
space:
mode:
authorMichał Żygowski <michal.zygowski@3mdeb.com>2019-11-28 12:59:44 +0100
committerPatrick Georgi <pgeorgi@google.com>2019-12-02 12:59:45 +0000
commit2317b4f1140821051d8688a95fcfd7e0eedaa773 (patch)
tree500c2cb36d49213f0b038c0737affeb9a6e4e232 /src/mainboard/amd
parent00517b687a03d6c9a760669c8fe1e89af2fc3884 (diff)
downloadcoreboot-2317b4f1140821051d8688a95fcfd7e0eedaa773.tar.xz
sb/amd/cimx: replace cimx_util with common ACPIMMIO AMD block
Drop the redundant cimx_util, remove the includes when appropriate and replace the implementation with amdblocks/acpimmio where needed. TEST=boot PC Engines apu1 and launch Debian with Linux kernel 4.14.50 Signed-off-by: Michał Żygowski <michal.zygowski@3mdeb.com> Change-Id: I66b1f82926372b6ebb570893b6eb73c7f2935b9d Reviewed-on: https://review.coreboot.org/c/coreboot/+/37328 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Diffstat (limited to 'src/mainboard/amd')
-rw-r--r--src/mainboard/amd/inagua/mainboard.c6
-rw-r--r--src/mainboard/amd/persimmon/mainboard.c6
-rw-r--r--src/mainboard/amd/south_station/mainboard.c6
-rw-r--r--src/mainboard/amd/union_station/mainboard.c6
4 files changed, 12 insertions, 12 deletions
diff --git a/src/mainboard/amd/inagua/mainboard.c b/src/mainboard/amd/inagua/mainboard.c
index cf40e262aa..83fe394be7 100644
--- a/src/mainboard/amd/inagua/mainboard.c
+++ b/src/mainboard/amd/inagua/mainboard.c
@@ -13,9 +13,9 @@
* GNU General Public License for more details.
*/
+#include <amdblocks/acpimmio.h>
#include <console/console.h>
#include <device/device.h>
-#include <southbridge/amd/cimx/cimx_util.h>
#include <southbridge/amd/cimx/sb800/SBPLATFORM.h> /* Platform Specific Definitions */
static void init_gpios(void)
@@ -63,8 +63,8 @@ static void mainboard_enable(struct device *dev)
* SPD read code has been made generic and moved out of the board
* directory, so the ASF init is being done here.
*/
- pm_iowrite(0x29, 0x80);
- pm_iowrite(0x28, 0x61);
+ pm_write8(0x29, 0x80);
+ pm_write8(0x28, 0x61);
}
struct chip_operations mainboard_ops = {
diff --git a/src/mainboard/amd/persimmon/mainboard.c b/src/mainboard/amd/persimmon/mainboard.c
index 43be863f4d..0e89ffde05 100644
--- a/src/mainboard/amd/persimmon/mainboard.c
+++ b/src/mainboard/amd/persimmon/mainboard.c
@@ -14,11 +14,11 @@
* GNU General Public License for more details.
*/
+#include <amdblocks/acpimmio.h>
#include <console/console.h>
#include <device/device.h>
#include <device/mmio.h>
#include <southbridge/amd/common/amd_pci_util.h>
-#include <southbridge/amd/cimx/cimx_util.h>
#include <southbridge/amd/cimx/sb800/SBPLATFORM.h>
#include <southbridge/amd/cimx/sb800/pci_devs.h>
#include <northbridge/amd/agesa/family14/pci_devs.h>
@@ -139,8 +139,8 @@ static void mainboard_enable(struct device *dev)
* SPD read code has been made generic and moved out of the board
* directory, so the ASF init is being done here.
*/
- pm_iowrite(0x29, 0x80);
- pm_iowrite(0x28, 0x61);
+ pm_write8(0x29, 0x80);
+ pm_write8(0x28, 0x61);
/* Initialize the PIRQ data structures for consumption */
pirq_setup();
diff --git a/src/mainboard/amd/south_station/mainboard.c b/src/mainboard/amd/south_station/mainboard.c
index c6f219662f..9b041e0111 100644
--- a/src/mainboard/amd/south_station/mainboard.c
+++ b/src/mainboard/amd/south_station/mainboard.c
@@ -13,10 +13,10 @@
* GNU General Public License for more details.
*/
+#include <amdblocks/acpimmio.h>
#include <console/console.h>
#include <delay.h>
#include <device/device.h>
-#include <southbridge/amd/cimx/cimx_util.h>
#include <southbridge/amd/cimx/sb800/SBPLATFORM.h> /* Platform Specific Definitions */
/**
@@ -59,8 +59,8 @@ static void mainboard_enable(struct device *dev)
* SPD read code has been made generic and moved out of the board
* directory, so the ASF init is being done here.
*/
- pm_iowrite(0x29, 0x80);
- pm_iowrite(0x28, 0x61);
+ pm_write8(0x29, 0x80);
+ pm_write8(0x28, 0x61);
}
struct chip_operations mainboard_ops = {
diff --git a/src/mainboard/amd/union_station/mainboard.c b/src/mainboard/amd/union_station/mainboard.c
index e2c0ac7370..d680520d47 100644
--- a/src/mainboard/amd/union_station/mainboard.c
+++ b/src/mainboard/amd/union_station/mainboard.c
@@ -13,9 +13,9 @@
* GNU General Public License for more details.
*/
+#include <amdblocks/acpimmio.h>
#include <console/console.h>
#include <device/device.h>
-#include <southbridge/amd/cimx/cimx_util.h>
#include <southbridge/amd/cimx/sb800/SBPLATFORM.h> /* Platform Specific Definitions */
/**********************************************
@@ -31,8 +31,8 @@ static void mainboard_enable(struct device *dev)
* SPD read code has been made generic and moved out of the board
* directory, so the ASF init is being done here.
*/
- pm_iowrite(0x29, 0x80);
- pm_iowrite(0x28, 0x61);
+ pm_write8(0x29, 0x80);
+ pm_write8(0x28, 0x61);
}
struct chip_operations mainboard_ops = {