diff options
| author | Elyes HAOUAS <ehaouas@noos.fr> | 2018-06-12 22:06:09 +0200 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2018-06-14 09:30:24 +0000 |
| commit | 68c851bcd702e7816cdb6e504f7386ec404ecf13 (patch) | |
| tree | 4f54fa935d738ff5e6fc473ba37bfc03a8ecb2ef /src/soc/intel/cannonlake | |
| parent | c8a649c08f92d4d2255626da4e1cd7a6d71469e7 (diff) | |
src: Get rid of device_t
Use of device_t is deprecated.
Change-Id: I6adc0429ae9ecc8f726d6167a6458d9333dc515f
Signed-off-by: Elyes HAOUAS <ehaouas@noos.fr>
Reviewed-on: https://review.coreboot.org/27036
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Diffstat (limited to 'src/soc/intel/cannonlake')
| -rw-r--r-- | src/soc/intel/cannonlake/lpc.c | 7 | ||||
| -rw-r--r-- | src/soc/intel/cannonlake/uart.c | 6 |
2 files changed, 10 insertions, 3 deletions
diff --git a/src/soc/intel/cannonlake/lpc.c b/src/soc/intel/cannonlake/lpc.c index 69a921feaf..d399d1bcaf 100644 --- a/src/soc/intel/cannonlake/lpc.c +++ b/src/soc/intel/cannonlake/lpc.c @@ -140,8 +140,11 @@ void soc_pch_pirq_init(const struct device *dev) pch_interrupt_routing[7] = config->pirqh_routing; itss_irq_init(pch_interrupt_routing); - - device_t irq_dev; +#if defined(__SIMPLE_DEVICE__) + pci_devfn_t irq_dev; +#else + struct device *irq_dev; +#endif for (irq_dev = all_devices; irq_dev; irq_dev = irq_dev->next) { u8 int_pin = 0, int_line = 0; diff --git a/src/soc/intel/cannonlake/uart.c b/src/soc/intel/cannonlake/uart.c index 6aad68541f..80404100fe 100644 --- a/src/soc/intel/cannonlake/uart.c +++ b/src/soc/intel/cannonlake/uart.c @@ -35,7 +35,11 @@ static const struct port { struct pad_config pads[2]; /* just TX and RX */ - device_t dev; +#if defined(__SIMPLE_DEVICE__) + pci_devfn_t dev; +#else + struct device *dev; +#endif } uart_ports[] = { {.dev = PCH_DEV_UART0, .pads = { PAD_CFG_NF(GPP_C8, NONE, DEEP, NF1), /* RX */ |