From 87f9fc8584c980dc4c73667f4c88d71d0e447a0c Mon Sep 17 00:00:00 2001 From: Martin Roth Date: Wed, 17 Jun 2020 13:44:59 -0600 Subject: mb/pcengines/apu2: Update GPIO Reads & writes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The APU2 was using the soc/amd/common functions to do GPIO reads and writes. The functions that were being used are getting eliminated in the SOC directory, but since the APU isn't using the rest of that code (as it's not using the rest of the SOC codebase), it proved to be problematic to use the updated functions. The solution I've put in place here is to pull everything needed for the GPIO reads & writes into the gpio_ftns.c & h files. Signed-off-by: Martin Roth Change-Id: Ied39c114bdf3637977d21f56fd7db428c52e4706 Reviewed-on: https://review.coreboot.org/c/coreboot/+/42484 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin Reviewed-by: Michał Żygowski --- src/mainboard/pcengines/apu2/gpio_ftns.c | 16 ++++++++-------- src/mainboard/pcengines/apu2/gpio_ftns.h | 3 +++ 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/mainboard/pcengines/apu2/gpio_ftns.c b/src/mainboard/pcengines/apu2/gpio_ftns.c index c249c2da5c..7bf0bc9a53 100644 --- a/src/mainboard/pcengines/apu2/gpio_ftns.c +++ b/src/mainboard/pcengines/apu2/gpio_ftns.c @@ -12,11 +12,11 @@ static u32 gpio_read_wrapper(u32 iomux_gpio) u32 gpio = iomux_gpio << 2; if (gpio < 0x100) - return gpio0_read32(gpio & 0xff); + return read32((void *)(ACPIMMIO_GPIO0_BASE + (gpio & 0xff))); else if (gpio >= 0x100 && gpio < 0x200) - return gpio1_read32(gpio & 0xff); + return read32((void *)(ACPIMMIO_GPIO1_BASE + (gpio & 0xff))); else if (gpio >= 0x200 && gpio < 0x300) - return gpio2_read32(gpio & 0xff); + return read32((void *)(ACPIMMIO_GPIO2_BASE + (gpio & 0xff))); die("Invalid GPIO"); } @@ -26,11 +26,11 @@ static void gpio_write_wrapper(u32 iomux_gpio, u32 setting) u32 gpio = iomux_gpio << 2; if (gpio < 0x100) - gpio0_write32(gpio & 0xff, setting); + write32((void *)(ACPIMMIO_GPIO0_BASE + (gpio & 0xff)), setting); else if (gpio >= 0x100 && gpio < 0x200) - gpio1_write32(gpio & 0xff, setting); + write32((void *)(ACPIMMIO_GPIO1_BASE + (gpio & 0xff)), setting); else if (gpio >= 0x200 && gpio < 0x300) - gpio2_write32(gpio & 0xff, setting); + write32((void *)(ACPIMMIO_GPIO2_BASE + (gpio & 0xff)), setting); } void configure_gpio(u32 gpio, u8 iomux_ftn, u32 setting) @@ -70,9 +70,9 @@ int get_spd_offset(void) * One SPD file contains all 4 options, determine which index to * read here, then call into the standard routines. */ - if (gpio1_read8(0x02) & BIT0) + if (read32((void *)(ACPIMMIO_GPIO1_BASE + 0x02)) & BIT0) index |= BIT0; - if (gpio1_read8(0x06) & BIT0) + if (read32((void *)(ACPIMMIO_GPIO1_BASE + 0x06)) & BIT0) index |= BIT1; return index; diff --git a/src/mainboard/pcengines/apu2/gpio_ftns.h b/src/mainboard/pcengines/apu2/gpio_ftns.h index d1e76de029..a0ce03c672 100644 --- a/src/mainboard/pcengines/apu2/gpio_ftns.h +++ b/src/mainboard/pcengines/apu2/gpio_ftns.h @@ -8,6 +8,9 @@ u8 read_gpio(u32 gpio); void write_gpio(u32 gpio, u8 value); int get_spd_offset(void); +#define ACPIMMIO_GPIO0_BASE 0xfed81500 +#define ACPIMMIO_GPIO1_BASE 0xfed81600 +#define ACPIMMIO_GPIO2_BASE 0xfed81700 // // Based on PC Engines APU2C and APU3A schematics // http://www.pcengines.ch/schema/apu2c.pdf -- cgit v1.2.3