diff --git a/src/mainboard/getac/p470/early_init.c b/src/mainboard/getac/p470/early_init.c index 1f206acd3a..b2e8a25240 100644 --- a/src/mainboard/getac/p470/early_init.c +++ b/src/mainboard/getac/p470/early_init.c @@ -1,33 +1,25 @@ /* SPDX-License-Identifier: GPL-2.0-only */ -#include -#include #include +#include +#include #include #include -#include -#include +#include #include +#include +#include #include void mainboard_pre_raminit_config(int s3_resume) { - u32 gpios; - printk(BIOS_SPEW, "\n Initializing drive bay...\n"); - gpios = inl(DEFAULT_GPIOBASE + 0x38); // GPIO Level 2 - gpios |= (1 << 0); // GPIO33 = ODD - gpios |= (1 << 1); // GPIO34 = IDE_RST# - outl(gpios, DEFAULT_GPIOBASE + 0x38); /* GP_LVL2 */ - - gpios = inl(DEFAULT_GPIOBASE + 0x0c); // GPIO Level - gpios &= ~(1 << 13); // ?? - outl(gpios, DEFAULT_GPIOBASE + 0x0c); /* GP_LVL */ + gpio_set(33, 1); // GPIO33 = ODD + gpio_set(34, 1); // GPIO34 = IDE_RST# + gpio_set(13, 0); // ?? printk(BIOS_SPEW, "\n Initializing Ethernet NIC...\n"); - gpios = inl(DEFAULT_GPIOBASE + 0x0c); // GPIO Level - gpios &= ~(1 << 24); // Enable LAN Power - outl(gpios, DEFAULT_GPIOBASE + 0x0c); /* GP_LVL */ + gpio_set(24, 0); // Enable LAN Power } /* Override the default lpc decode ranges */ diff --git a/src/mainboard/getac/p470/smihandler.c b/src/mainboard/getac/p470/smihandler.c index e69627af5d..6fd1484332 100644 --- a/src/mainboard/getac/p470/smihandler.c +++ b/src/mainboard/getac/p470/smihandler.c @@ -3,10 +3,11 @@ #include #include #include +#include +#include #include #include #include -#include #include "ec_oem.c" #define MAX_LCD_BRIGHTNESS 0xd8 @@ -14,7 +15,6 @@ int mainboard_io_trap_handler(int smif) { u8 reg8; - u32 reg32; switch (smif) { case 0x2b: @@ -95,9 +95,7 @@ int mainboard_io_trap_handler(int smif) break; case 0xde: printk(BIOS_DEBUG, "LAN power off\n"); - reg32 = inl(DEFAULT_GPIOBASE + GP_LVL); - reg32 |= (1 << 24); // Disable LAN Power - outl(reg32, DEFAULT_GPIOBASE + GP_LVL); + gpio_set(24, 0); // Disable LAN Power break; case 0xdf: printk(BIOS_DEBUG, "RF enable\n");