diff options
| author | Michał Żygowski <michal.zygowski@3mdeb.com> | 2018-07-27 15:59:51 +0200 |
|---|---|---|
| committer | Felix Held <felix-coreboot@felixheld.de> | 2018-08-04 15:19:01 +0000 |
| commit | a4432f469a97b4279cb53b79acd5c835e0880981 (patch) | |
| tree | b2fd8eda0e9028aac9325aee6ba3c569a7cfbf46 /src/mainboard/pcengines/apu2/gpio_ftns.c | |
| parent | 6838aaebf9ec836a13d57bd85bc0e7e396834e8b (diff) | |
mb/pcengines/apu2: change GPIO setting
Change GPIO setting to use IOMUX to refer to GPIO by
IOMUX register as in BKDG for Family 16h Models 30h-3fh
Processor Rev 3.06.
Change-Id: Icf4a60acabe65cd7f9985bb3af8bd577764d4196
Signed-off-by: Michał Żygowski <michal.zygowski@3mdeb.com>
Reviewed-on: https://review.coreboot.org/27665
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Felix Held <felix-coreboot@felixheld.de>
Diffstat (limited to 'src/mainboard/pcengines/apu2/gpio_ftns.c')
| -rw-r--r-- | src/mainboard/pcengines/apu2/gpio_ftns.c | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/src/mainboard/pcengines/apu2/gpio_ftns.c b/src/mainboard/pcengines/apu2/gpio_ftns.c index 12b8f9464b..58dedffe9d 100644 --- a/src/mainboard/pcengines/apu2/gpio_ftns.c +++ b/src/mainboard/pcengines/apu2/gpio_ftns.c @@ -19,19 +19,23 @@ #include "FchPlatform.h" #include "gpio_ftns.h" -void configure_gpio(uintptr_t base_addr, u32 iomux_gpio, u8 iomux_ftn, u32 gpio, u32 setting) +void configure_gpio(u32 iomux_gpio, u8 iomux_ftn, u32 gpio, u32 setting) { - u8 bdata; - u8 *memptr; + u32 bdata; - memptr = (u8 *)(base_addr + IOMUX_OFFSET + iomux_gpio); - *memptr = iomux_ftn; + bdata = read32((const volatile void *)(ACPI_MMIO_BASE + GPIO_OFFSET + + gpio)); + /* out the data value to prevent glitches */ + bdata |= (setting & GPIO_OUTPUT_ENABLE); + write32((volatile void *)(ACPI_MMIO_BASE + GPIO_OFFSET + gpio), bdata); - memptr = (u8 *)(base_addr + GPIO_OFFSET + gpio); - bdata = *memptr; - bdata &= 0x07; - bdata |= setting; /* set direction and data value */ - *memptr = bdata; + /* set direction and data value */ + bdata |= (setting & (GPIO_OUTPUT_ENABLE | GPIO_OUTPUT_VALUE + | GPIO_PULL_UP_ENABLE | GPIO_PULL_DOWN_ENABLE)); + write32((volatile void *)(ACPI_MMIO_BASE + GPIO_OFFSET + gpio), bdata); + + write8((volatile void *)(ACPI_MMIO_BASE + IOMUX_OFFSET + iomux_gpio), + iomux_ftn & 0x3); } int get_spd_offset(void) |