From e6946c626a8170ce25831371abd496418556606e Mon Sep 17 00:00:00 2001 From: Stefan Reinauer Date: Fri, 19 Jun 2015 15:54:00 -0700 Subject: pcengines/apu1: 64bit fixes Change-Id: Iacad070f43534a8b27a2473a6a2854bc2f6e607a Signed-off-by: Stefan Reinauer Reviewed-on: http://review.coreboot.org/10598 Tested-by: build bot (Jenkins) Reviewed-by: Marc Jones --- src/mainboard/pcengines/apu1/gpio_ftns.c | 10 +++++----- src/mainboard/pcengines/apu1/gpio_ftns.h | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'src/mainboard/pcengines/apu1') diff --git a/src/mainboard/pcengines/apu1/gpio_ftns.c b/src/mainboard/pcengines/apu1/gpio_ftns.c index 4bae3871bb..c0fcd35e34 100644 --- a/src/mainboard/pcengines/apu1/gpio_ftns.c +++ b/src/mainboard/pcengines/apu1/gpio_ftns.c @@ -23,10 +23,10 @@ #include #include "gpio_ftns.h" -u32 find_gpio_base(void) +uintptr_t find_gpio_base(void) { u8 pm_index, pm_data; - u32 base_addr = 0; + uintptr_t base_addr = 0; /* Find the ACPImmioAddr base address */ for ( pm_index = 0x27; pm_index > 0x23; pm_index-- ) { @@ -39,7 +39,7 @@ u32 find_gpio_base(void) return (base_addr); } -void configure_gpio(u32 base_addr, u32 gpio, u8 iomux_ftn, u8 setting) +void configure_gpio(uintptr_t base_addr, u32 gpio, u8 iomux_ftn, u8 setting) { u8 bdata; u8 *memptr; @@ -54,7 +54,7 @@ void configure_gpio(u32 base_addr, u32 gpio, u8 iomux_ftn, u8 setting) *memptr = bdata; } -u8 read_gpio(u32 base_addr, u32 gpio) +u8 read_gpio(uintptr_t base_addr, u32 gpio) { u8 *memptr = (u8 *)(base_addr + GPIO_OFFSET + gpio); return (*memptr & GPIO_DATA_IN) ? 1 : 0; @@ -62,7 +62,7 @@ u8 read_gpio(u32 base_addr, u32 gpio) int get_spd_offset(void) { - u32 base_addr = find_gpio_base(); + uintptr_t base_addr = find_gpio_base(); u8 spd_offset = read_gpio(base_addr, GPIO_16); return spd_offset; } diff --git a/src/mainboard/pcengines/apu1/gpio_ftns.h b/src/mainboard/pcengines/apu1/gpio_ftns.h index 497b105375..c74fb62d91 100644 --- a/src/mainboard/pcengines/apu1/gpio_ftns.h +++ b/src/mainboard/pcengines/apu1/gpio_ftns.h @@ -20,9 +20,9 @@ #ifndef GPIO_FTNS_H #define GPIO_FTNS_H -u32 find_gpio_base(void); -void configure_gpio(u32 base_addr, u32 gpio, u8 iomux_ftn, u8 setting); -u8 read_gpio(u32 base_addr, u32 gpio); +uintptr_t find_gpio_base(void); +void configure_gpio(uintptr_t base_addr, u32 gpio, u8 iomux_ftn, u8 setting); +u8 read_gpio(uintptr_t base_addr, u32 gpio); int get_spd_offset(void); #define IOMUX_OFFSET 0xD00 -- cgit v1.2.3