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>

1 files changed, 5 insertions, 12 deletions

diff --git a/src/mainboard/pcengines/apu1/gpio_ftns.c b/src/mainboard/pcengines/apu1/gpio_ftns.c
index 7a988e7ec6..bedd15a514 100644
--- a/src/mainboard/pcengines/apu1/gpio_ftns.c
+++ b/src/mainboard/pcengines/apu1/gpio_ftns.c
@@ -14,25 +14,18 @@
  */
 
 #include <stdint.h>
+#include <amdblocks/acpimmio.h>
 #include <arch/io.h>
 #include <southbridge/amd/cimx/sb800/SBPLATFORM.h>
-#include <southbridge/amd/cimx/cimx_util.h>
 #include "gpio_ftns.h"
 
 uintptr_t find_gpio_base(void)
 {
-	u8 pm_index, pm_data;
-	uintptr_t base_addr = 0;
-
-	/* Find the ACPImmioAddr base address */
-	for (pm_index = 0x27; pm_index > 0x23; pm_index--) {
-		outb(pm_index, PM_INDEX);
-		pm_data = inb(PM_DATA);
-		base_addr <<= 8;
-		base_addr |= (u32)pm_data;
-	}
+	uintptr_t base_addr;
+	/* Get the ACPIMMIO base address */
+	base_addr = pm_read32(0x24);
 	base_addr &= 0xFFFFF000;
-	return (base_addr);
+	return base_addr;
 }
 
 void configure_gpio(uintptr_t base_addr, u32 gpio, u8 iomux_ftn, u8 setting)