From dbcd856dc13be423d419cdc7d1dab5e13ad526d3 Mon Sep 17 00:00:00 2001 From: Kumar Gala Date: Fri, 14 Feb 2020 11:21:52 -0600 Subject: [PATCH] drivers: ethernet: stellaris: convert to DT_INST defines Convert driver to use DT_INST_ defines. Signed-off-by: Kumar Gala --- drivers/ethernet/eth_stellaris.c | 14 +++++++------- soc/arm/ti_lm3s6965/dts_fixup.h | 5 ----- 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/drivers/ethernet/eth_stellaris.c b/drivers/ethernet/eth_stellaris.c index 01a70d2dd35..4c2e8419ca9 100644 --- a/drivers/ethernet/eth_stellaris.c +++ b/drivers/ethernet/eth_stellaris.c @@ -20,7 +20,7 @@ LOG_MODULE_REGISTER(LOG_MODULE_NAME); static void eth_stellaris_assign_mac(struct device *dev) { - u8_t mac_addr[6] = DT_ETH_MAC_ADDR; + u8_t mac_addr[6] = DT_INST_0_TI_STELLARIS_ETHERNET_LOCAL_MAC_ADDRESS; u32_t value = 0x0; value |= mac_addr[0]; @@ -323,19 +323,19 @@ static struct device DEVICE_NAME_GET(eth_stellaris); static void eth_stellaris_irq_config(struct device *dev) { /* Enable Interrupt. */ - IRQ_CONNECT(DT_ETH_IRQ, - DT_ETH_IRQ_PRIO, + IRQ_CONNECT(DT_INST_0_TI_STELLARIS_ETHERNET_IRQ_0, + DT_INST_0_TI_STELLARIS_ETHERNET_IRQ_0_PRIORITY, eth_stellaris_isr, DEVICE_GET(eth_stellaris), 0); - irq_enable(DT_ETH_IRQ); + irq_enable(DT_INST_0_TI_STELLARIS_ETHERNET_IRQ_0); } struct eth_stellaris_config eth_cfg = { - .mac_base = DT_ETH_BASE_ADDR, + .mac_base = DT_INST_0_TI_STELLARIS_ETHERNET_BASE_ADDRESS, .config_func = eth_stellaris_irq_config, }; struct eth_stellaris_runtime eth_data = { - .mac_addr = DT_ETH_MAC_ADDR, + .mac_addr = DT_INST_0_TI_STELLARIS_ETHERNET_LOCAL_MAC_ADDRESS, .tx_err = false, .tx_word = 0, .tx_pos = 0, @@ -349,7 +349,7 @@ static const struct ethernet_api eth_stellaris_apis = { #endif }; -NET_DEVICE_INIT(eth_stellaris, DT_ETH_DRV_NAME, +NET_DEVICE_INIT(eth_stellaris, DT_INST_0_TI_STELLARIS_ETHERNET_LABEL, eth_stellaris_dev_init, ð_data, ð_cfg, CONFIG_ETH_INIT_PRIORITY, ð_stellaris_apis, ETHERNET_L2, diff --git a/soc/arm/ti_lm3s6965/dts_fixup.h b/soc/arm/ti_lm3s6965/dts_fixup.h index 23e08fe3049..666bace8fa0 100644 --- a/soc/arm/ti_lm3s6965/dts_fixup.h +++ b/soc/arm/ti_lm3s6965/dts_fixup.h @@ -3,11 +3,6 @@ /* SoC level DTS fixup file */ #define DT_NUM_IRQ_PRIO_BITS DT_ARM_V7M_NVIC_E000E100_ARM_NUM_IRQ_PRIORITY_BITS -#define DT_ETH_BASE_ADDR DT_TI_STELLARIS_ETHERNET_40048000_BASE_ADDRESS -#define DT_ETH_DRV_NAME DT_TI_STELLARIS_ETHERNET_40048000_LABEL -#define DT_ETH_IRQ DT_TI_STELLARIS_ETHERNET_40048000_IRQ_0 -#define DT_ETH_IRQ_PRIO DT_TI_STELLARIS_ETHERNET_40048000_IRQ_0_PRIORITY -#define DT_ETH_MAC_ADDR DT_TI_STELLARIS_ETHERNET_40048000_LOCAL_MAC_ADDRESS #define DT_GPIO_A_BASE_ADDRESS DT_TI_STELLARIS_GPIO_40004000_BASE_ADDRESS #define DT_GPIO_A_LABEL DT_TI_STELLARIS_GPIO_40004000_LABEL