diff options
| author | Dinesh Gehlot <digehlot@google.com> | 2023-01-17 05:15:55 +0000 |
|---|---|---|
| committer | Felix Held <felix-coreboot@felixheld.de> | 2023-01-23 12:38:51 +0000 |
| commit | d83cd8bd85ade36f098f36b0aa220db6ab4d10ff (patch) | |
| tree | 230c0fb59cb6f166c9e3ebc60c0ce8a7b89ef5f8 /src/soc/intel | |
| parent | 9561cec2410d797b3b9f76419355e2a4b0242ec0 (diff) | |
soc/intel/denverton_ns: Use common gpio.h include
Replace the intelblocks/gpio.h, soc/gpio.h and soc/gpio_defs.h includes
with the common gpio.h which includes soc/gpio.h which includes
intelblocks/gpio.h which includes soc/gpio_defs.h. This patch also fixes
alphabetic ordering of included headers.
BUG=b:261778357
TEST=Able to build and boot.
Signed-off-by: Dinesh Gehlot <digehlot@google.com>
Change-Id: I3138edd8125601b6c9dff5f9252a4bba8385146d
Reviewed-on: https://review.coreboot.org/c/coreboot/+/72034
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Elyes Haouas <ehaouas@noos.fr>
Diffstat (limited to 'src/soc/intel')
| -rw-r--r-- | src/soc/intel/denverton_ns/bootblock/uart.c | 5 | ||||
| -rw-r--r-- | src/soc/intel/denverton_ns/chip.c | 2 | ||||
| -rw-r--r-- | src/soc/intel/denverton_ns/gpio.c | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/src/soc/intel/denverton_ns/bootblock/uart.c b/src/soc/intel/denverton_ns/bootblock/uart.c index 7514feebf8..ea99051fb6 100644 --- a/src/soc/intel/denverton_ns/bootblock/uart.c +++ b/src/soc/intel/denverton_ns/bootblock/uart.c @@ -1,13 +1,12 @@ /* SPDX-License-Identifier: GPL-2.0-or-later */ +#include <commonlib/helpers.h> #include <device/mmio.h> #include <device/pci_ops.h> #include <device/pci_def.h> #include <fsp/soc_binding.h> -#include <commonlib/helpers.h> - +#include <gpio.h> #include <soc/bootblock.h> -#include <soc/gpio_defs.h> #include <soc/uart.h> static uint16_t legacy_uart_ioadr_tab[] = {0x3F8, 0x2F8, 0x3E8, 0x2E8}; diff --git a/src/soc/intel/denverton_ns/chip.c b/src/soc/intel/denverton_ns/chip.c index 39a6c80d64..3d974a2214 100644 --- a/src/soc/intel/denverton_ns/chip.c +++ b/src/soc/intel/denverton_ns/chip.c @@ -8,9 +8,9 @@ #include <device/pci.h> #include <fsp/api.h> #include <fsp/util.h> +#include <gpio.h> #include <intelblocks/fast_spi.h> #include <intelblocks/acpi.h> -#include <intelblocks/gpio.h> #include <soc/iomap.h> #include <soc/intel/common/vbt.h> #include <soc/pci_devs.h> diff --git a/src/soc/intel/denverton_ns/gpio.c b/src/soc/intel/denverton_ns/gpio.c index 4e42f80a92..1e715da99b 100644 --- a/src/soc/intel/denverton_ns/gpio.c +++ b/src/soc/intel/denverton_ns/gpio.c @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-or-later */ -#include <intelblocks/gpio.h> +#include <gpio.h> #include <intelblocks/pcr.h> #include <soc/pcr.h> #include <soc/pm.h> |