michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: ethernet: e1000: convert to DT_INST defines

Browse source 
Convert driver to use DT_INST_ defines.

Signed-off-by: Kumar Gala <kumar.gala@linaro.org>
This commit is contained in:
Kumar Gala 2020-02-18 08:09:41 -06:00 • committed by Kumar Gala
commit 836b485377
3 changed files with 5 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

5
boards/x86/qemu_x86/dts_fixup.h
View file

@ -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

7
drivers/ethernet/eth_e1000.c
View file

@ -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 */

2
soc/x86/ia32/soc.c
View file

@ -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*/