From 6fc13b08f882bd6bb989892d22b3bf8e49690f9d Mon Sep 17 00:00:00 2001 From: Felix Singer Date: Tue, 20 Aug 2024 06:36:31 +0200 Subject: [PATCH] mb/acer/g43t-am3: Remove duplicated files With commit 26b1a5f62b ("mb/acer/g43t-am3: Rework mainboard for variant mechanism"), the files related to the G43T-AM3 mainboard were supposed to be moved into its own variant directory. However, it seems it was forgotten to delete the old ones and thus remove the duplicates. Change-Id: I450fab074621d21e80216e4667eaf2510b0e14ad Signed-off-by: Felix Singer Reviewed-on: https://review.coreboot.org/c/coreboot/+/83985 Reviewed-by: Nico Huber Reviewed-by: Elyes Haouas Tested-by: build bot (Jenkins) --- src/mainboard/acer/g43t-am3/acpi/superio.asl | 18 ---- src/mainboard/acer/g43t-am3/data.vbt | Bin 1899 -> 0 bytes src/mainboard/acer/g43t-am3/early_init.c | 33 ------ src/mainboard/acer/g43t-am3/gpio.c | 101 ------------------- 4 files changed, 152 deletions(-) delete mode 100644 src/mainboard/acer/g43t-am3/acpi/superio.asl delete mode 100644 src/mainboard/acer/g43t-am3/data.vbt delete mode 100644 src/mainboard/acer/g43t-am3/early_init.c delete mode 100644 src/mainboard/acer/g43t-am3/gpio.c diff --git a/src/mainboard/acer/g43t-am3/acpi/superio.asl b/src/mainboard/acer/g43t-am3/acpi/superio.asl deleted file mode 100644 index 9f3900b86c..0000000000 --- a/src/mainboard/acer/g43t-am3/acpi/superio.asl +++ /dev/null @@ -1,18 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -#undef SUPERIO_DEV -#undef SUPERIO_PNP_BASE -#undef IT8720F_SHOW_SP1 -#undef IT8720F_SHOW_SP2 -#undef IT8720F_SHOW_EC -#undef IT8720F_SHOW_KBCK -#undef IT8720F_SHOW_KBCM -#undef IT8720F_SHOW_GPIO -#undef IT8720F_SHOW_CIR -#define SUPERIO_DEV SIO0 -#define SUPERIO_PNP_BASE 0x2e -#define IT8720F_SHOW_EC 1 -#define IT8720F_SHOW_KBCK 1 -#define IT8720F_SHOW_KBCM 1 -#define IT8720F_SHOW_GPIO 1 -#include diff --git a/src/mainboard/acer/g43t-am3/data.vbt b/src/mainboard/acer/g43t-am3/data.vbt deleted file mode 100644 index 646adbae1bae7ebb0b569802fb07882cafd13c06..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1899 zcmd6nO>7%Q6vzLwvmdT&yLK^+69P<7Rk^51H%??i2x8YCt+(CQu5F@HRcexYRjL{q zxhaBE3`C*_C_U!T0}>KKoH%gg&?8c%swcz&2_y~(5aNi0Am+{NCQ)fngy6s%zxlnH zdGqGY?062&m)fH09`~!hd$KB&bYSC(^%&I;OUbLZE>zsMd!gjl%O}N69Kdtd#*aV; zETvBti$(9%m7tsN9j-23>IU7#D}iW~J>g!w7<7Z);!4mFt@-1wkdcz{()G*TjyQe& zm8GCJE97+Y7L(HxQ`17&&m5&+!M10}F3j4`&Q4Dzt*!NnCk* zyU=uCOvjfC5Zn1Mz)-C;1lfS|7l#-?^GF1Qri`$$W$tW`Y4f;StH7M ze#9J6jtin3r-Kbew^XAKNubXnW)xX}ENmmI*k6mrZ*Ma6qnRdFwI{hwd`BDNG2;8$ zFIs~54NGWg;`dC~vcw*s`izjm6*xDmZXi?l=tn& zX|G}a{a8B8Q|5bm0?p?ZIlGI#?h$T4~-Z5$ICWC=xVPkMFhruBBJm|}$X$5(A zv*F1g7jaaPa}l)<5~W{0Y7YkS4=LUMz3lx6WAX*$EpL2ss#q9zWy;H>ayN*n+98Vz zsk--W2k~}uImQ}%D1X2drXT~|~JC8j(yo1W^Kd3U> z-*JB;JeMeHwgEm8+Sc6Pt@O`E4h&HouC8}@_%f`$mI8)q=nTVgamdcyD2A)$?5DAQ z2DW1_KN9vl@$u2uzdbW@$T_>d*;9MLv6ntAIL@8To?ITqRUU37QCv0XsUabY-BQm6 fS!VdRNet&PjNhmX;}#PL%NKB>a)fPLBQnaL7z(%S diff --git a/src/mainboard/acer/g43t-am3/early_init.c b/src/mainboard/acer/g43t-am3/early_init.c deleted file mode 100644 index b34ab4651b..0000000000 --- a/src/mainboard/acer/g43t-am3/early_init.c +++ /dev/null @@ -1,33 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-or-later */ - -#include -#include -#include -#include -#include - -#define GPIO_DEV PNP_DEV(0x2e, IT8720F_GPIO) - -void bootblock_mainboard_early_init(void) -{ - /* Set up GPIOs on Super I/O. */ - ite_reg_write(GPIO_DEV, 0x25, 0x00); // GPIO set 1 - ite_reg_write(GPIO_DEV, 0x26, 0x0c); // GPIO set 2 - ite_reg_write(GPIO_DEV, 0x27, 0x70); // GPIO set 3 - ite_reg_write(GPIO_DEV, 0x28, 0x40); // GPIO set 4 - ite_reg_write(GPIO_DEV, 0x29, 0x00); // GPIO set 5 - - /* Enable 3VSB during Suspend-to-RAM */ - ite_enable_3vsbsw(GPIO_DEV); - - /* Delay PWROK2 after 3VSBSW# during resume from Suspend-to-RAM */ - ite_delay_pwrgd3(GPIO_DEV); -} - -void mb_get_spd_map(u8 spd_map[4]) -{ - spd_map[0] = 0x50; - spd_map[1] = 0x51; - spd_map[2] = 0x52; - spd_map[3] = 0x53; -} diff --git a/src/mainboard/acer/g43t-am3/gpio.c b/src/mainboard/acer/g43t-am3/gpio.c deleted file mode 100644 index 38239baf79..0000000000 --- a/src/mainboard/acer/g43t-am3/gpio.c +++ /dev/null @@ -1,101 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -#include - -static const struct pch_gpio_set1 pch_gpio_set1_mode = { - .gpio0 = GPIO_MODE_GPIO, - .gpio1 = GPIO_MODE_GPIO, - .gpio6 = GPIO_MODE_GPIO, - .gpio7 = GPIO_MODE_GPIO, - .gpio8 = GPIO_MODE_GPIO, - .gpio9 = GPIO_MODE_GPIO, - .gpio13 = GPIO_MODE_GPIO, - .gpio14 = GPIO_MODE_GPIO, - .gpio17 = GPIO_MODE_GPIO, - .gpio18 = GPIO_MODE_GPIO, - .gpio20 = GPIO_MODE_GPIO, - .gpio27 = GPIO_MODE_GPIO, - .gpio28 = GPIO_MODE_GPIO, -}; - -static const struct pch_gpio_set1 pch_gpio_set1_direction = { - .gpio0 = GPIO_DIR_INPUT, - .gpio1 = GPIO_DIR_INPUT, - .gpio6 = GPIO_DIR_INPUT, - .gpio7 = GPIO_DIR_INPUT, - .gpio8 = GPIO_DIR_INPUT, - .gpio9 = GPIO_DIR_OUTPUT, - .gpio13 = GPIO_DIR_INPUT, - .gpio14 = GPIO_DIR_INPUT, - .gpio17 = GPIO_DIR_INPUT, - .gpio18 = GPIO_DIR_OUTPUT, - .gpio20 = GPIO_DIR_OUTPUT, - .gpio27 = GPIO_DIR_OUTPUT, - .gpio28 = GPIO_DIR_INPUT, -}; - -static const struct pch_gpio_set1 pch_gpio_set1_level = { - .gpio9 = GPIO_LEVEL_HIGH, - .gpio18 = GPIO_LEVEL_HIGH, - .gpio20 = GPIO_LEVEL_LOW, - .gpio27 = GPIO_LEVEL_LOW, -}; - -static const struct pch_gpio_set1 pch_gpio_set1_invert = { - .gpio6 = GPIO_INVERT, - .gpio13 = GPIO_INVERT, -}; - -static const struct pch_gpio_set1 pch_gpio_set1_blink = { - .gpio18 = GPIO_BLINK, - -}; - -static const struct pch_gpio_set2 pch_gpio_set2_mode = { - .gpio32 = GPIO_MODE_GPIO, - .gpio33 = GPIO_MODE_GPIO, - .gpio34 = GPIO_MODE_GPIO, - .gpio35 = GPIO_MODE_NATIVE, - .gpio36 = GPIO_MODE_NATIVE, - .gpio37 = GPIO_MODE_NATIVE, - .gpio38 = GPIO_MODE_NATIVE, - .gpio39 = GPIO_MODE_NATIVE, - .gpio48 = GPIO_MODE_NATIVE, - .gpio49 = GPIO_MODE_GPIO, - .gpio56 = GPIO_MODE_GPIO, - .gpio57 = GPIO_MODE_GPIO, - .gpio58 = GPIO_MODE_NATIVE, - .gpio60 = GPIO_MODE_GPIO, -}; - -static const struct pch_gpio_set2 pch_gpio_set2_direction = { - .gpio32 = GPIO_DIR_OUTPUT, - .gpio33 = GPIO_DIR_INPUT, - .gpio34 = GPIO_DIR_INPUT, - .gpio49 = GPIO_DIR_OUTPUT, - .gpio56 = GPIO_DIR_INPUT, - .gpio57 = GPIO_DIR_INPUT, - .gpio60 = GPIO_DIR_OUTPUT, -}; - -static const struct pch_gpio_set2 pch_gpio_set2_level = { - .gpio32 = GPIO_LEVEL_HIGH, - .gpio49 = GPIO_LEVEL_HIGH, - .gpio60 = GPIO_LEVEL_LOW, -}; - -const struct pch_gpio_map mainboard_gpio_map = { - .set1 = { - .mode = &pch_gpio_set1_mode, - .direction = &pch_gpio_set1_direction, - .level = &pch_gpio_set1_level, - .blink = &pch_gpio_set1_blink, - .invert = &pch_gpio_set1_invert, - }, - .set2 = { - .mode = &pch_gpio_set2_mode, - .direction = &pch_gpio_set2_direction, - .level = &pch_gpio_set2_level, - }, - -};