From 836b485377e15579883ebaa3223f196dbd23832a Mon Sep 17 00:00:00 2001 From: Kumar Gala Date: Tue, 18 Feb 2020 08:09:41 -0600 Subject: [PATCH] drivers: ethernet: e1000: convert to DT_INST defines Convert driver to use DT_INST_ defines. Signed-off-by: Kumar Gala --- boards/x86/qemu_x86/dts_fixup.h | 5 ----- drivers/ethernet/eth_e1000.c | 7 ++++--- soc/x86/ia32/soc.c | 2 +- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/boards/x86/qemu_x86/dts_fixup.h b/boards/x86/qemu_x86/dts_fixup.h index 6e7c62f855a..50f894d0057 100644 --- a/boards/x86/qemu_x86/dts_fixup.h +++ b/boards/x86/qemu_x86/dts_fixup.h @@ -2,11 +2,6 @@ /* Board level DTS fixup file */ -#define DT_ETH_E1000_BASE_ADDRESS DT_INTEL_E1000_FEBC0000_BASE_ADDRESS -#define DT_ETH_E1000_IRQ DT_INTEL_E1000_FEBC0000_IRQ_0 -#define DT_ETH_E1000_IRQ_PRIORITY DT_INTEL_E1000_FEBC0000_IRQ_0_PRIORITY -#define DT_ETH_E1000_IRQ_FLAGS DT_INTEL_E1000_FEBC0000_IRQ_0_SENSE - #define DT_FLASH_DEV_NAME DT_ZEPHYR_SIM_FLASH_SIM_FLASH_LABEL #define DT_FLASH_SIM_BASE_ADDRESS DT_SOC_NV_FLASH_0_BASE_ADDRESS diff --git a/drivers/ethernet/eth_e1000.c b/drivers/ethernet/eth_e1000.c index 819b8939b7e..7c1818efb41 100644 --- a/drivers/ethernet/eth_e1000.c +++ b/drivers/ethernet/eth_e1000.c @@ -225,11 +225,12 @@ static void e1000_init(struct net_if *iface) net_if_set_link_addr(iface, dev->mac, sizeof(dev->mac), NET_LINK_ETHERNET); - IRQ_CONNECT(DT_ETH_E1000_IRQ, DT_ETH_E1000_IRQ_PRIORITY, + IRQ_CONNECT(DT_INST_0_INTEL_E1000_IRQ_0, + DT_INST_0_INTEL_E1000_IRQ_0_PRIORITY, e1000_isr, DEVICE_GET(eth_e1000), - DT_ETH_E1000_IRQ_FLAGS); + DT_INST_0_INTEL_E1000_IRQ_0_SENSE); - irq_enable(DT_ETH_E1000_IRQ); + irq_enable(DT_INST_0_INTEL_E1000_IRQ_0); iow32(dev, CTRL, CTRL_SLU); /* Set link up */ diff --git a/soc/x86/ia32/soc.c b/soc/x86/ia32/soc.c index 9513d73bea2..7b28f4b101f 100644 --- a/soc/x86/ia32/soc.c +++ b/soc/x86/ia32/soc.c @@ -29,7 +29,7 @@ MMU_BOOT_REGION(DT_INST_0_INTEL_HPET_BASE_ADDRESS, KB(4), MMU_ENTRY_WRITE); #endif #ifdef CONFIG_ETH_E1000 -MMU_BOOT_REGION(DT_ETH_E1000_BASE_ADDRESS, KB(128), MMU_ENTRY_WRITE); +MMU_BOOT_REGION(DT_INST_0_INTEL_E1000_BASE_ADDRESS, KB(128), MMU_ENTRY_WRITE); #endif #endif /* CONFIG_X86_MMU*/