diff --git a/drivers/ethernet/eth_e1000.c b/drivers/ethernet/eth_e1000.c index 8f4faaf2900..2ad6f2e18e0 100644 --- a/drivers/ethernet/eth_e1000.c +++ b/drivers/ethernet/eth_e1000.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier: Apache-2.0 */ +#define DT_DRV_COMPAT intel_e1000 + #define LOG_MODULE_NAME eth_e1000 #define LOG_LEVEL CONFIG_ETHERNET_LOG_LEVEL #include @@ -225,12 +227,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_INST_0_INTEL_E1000_IRQ_0, - DT_INST_0_INTEL_E1000_IRQ_0_PRIORITY, + IRQ_CONNECT(DT_INST_IRQN(0), + DT_INST_IRQ(0, priority), e1000_isr, DEVICE_GET(eth_e1000), - DT_INST_0_INTEL_E1000_IRQ_0_SENSE); + DT_INST_IRQ(0, sense)); - irq_enable(DT_INST_0_INTEL_E1000_IRQ_0); + irq_enable(DT_INST_IRQN(0)); iow32(dev, CTRL, CTRL_SLU); /* Set link up */ diff --git a/drivers/ethernet/eth_enc28j60.c b/drivers/ethernet/eth_enc28j60.c index 37553082497..7ae67b52616 100644 --- a/drivers/ethernet/eth_enc28j60.c +++ b/drivers/ethernet/eth_enc28j60.c @@ -5,6 +5,8 @@ * SPDX-License-Identifier: Apache-2.0 */ +#define DT_DRV_COMPAT microchip_enc28j60 + #define LOG_MODULE_NAME eth_enc28j60 #define LOG_LEVEL CONFIG_ETHERNET_LOG_LEVEL @@ -807,7 +809,7 @@ static int eth_enc28j60_init(struct device *dev) #ifdef CONFIG_ETH_ENC28J60_0 static struct eth_enc28j60_runtime eth_enc28j60_0_runtime = { - .mac_address = DT_INST_0_MICROCHIP_ENC28J60_LOCAL_MAC_ADDRESS, + .mac_address = DT_INST_PROP(0, local_mac_address), .tx_rx_sem = Z_SEM_INITIALIZER(eth_enc28j60_0_runtime.tx_rx_sem, 1, UINT_MAX), .int_sem = Z_SEM_INITIALIZER(eth_enc28j60_0_runtime.int_sem, @@ -815,21 +817,21 @@ static struct eth_enc28j60_runtime eth_enc28j60_0_runtime = { }; static const struct eth_enc28j60_config eth_enc28j60_0_config = { - .gpio_port = DT_INST_0_MICROCHIP_ENC28J60_INT_GPIOS_CONTROLLER, - .gpio_pin = DT_INST_0_MICROCHIP_ENC28J60_INT_GPIOS_PIN, - .gpio_flags = DT_INST_0_MICROCHIP_ENC28J60_INT_GPIOS_FLAGS, - .spi_port = DT_INST_0_MICROCHIP_ENC28J60_BUS_NAME, - .spi_freq = DT_INST_0_MICROCHIP_ENC28J60_SPI_MAX_FREQUENCY, - .spi_slave = DT_INST_0_MICROCHIP_ENC28J60_BASE_ADDRESS, + .gpio_port = DT_INST_GPIO_LABEL(0, int_gpios), + .gpio_pin = DT_INST_GPIO_PIN(0, int_gpios), + .gpio_flags = DT_INST_GPIO_FLAGS(0, int_gpios), + .spi_port = DT_INST_BUS_LABEL(0), + .spi_freq = DT_INST_PROP(0, spi_max_frequency), + .spi_slave = DT_INST_REG_ADDR(0), #ifdef CONFIG_ETH_ENC28J60_0_GPIO_SPI_CS - .spi_cs_port = DT_INST_0_MICROCHIP_ENC28J60_CS_GPIOS_CONTROLLER, - .spi_cs_pin = DT_INST_0_MICROCHIP_ENC28J60_CS_GPIOS_PIN, + .spi_cs_port = DT_INST_SPI_DEV_CS_GPIOS_LABEL(0), + .spi_cs_pin = DT_INST_SPI_DEV_CS_GPIOS_PIN(0), #endif /* CONFIG_ETH_ENC28J60_0_GPIO_SPI_CS */ .full_duplex = IS_ENABLED(CONFIG_ETH_ENC28J60_0_FULL_DUPLEX), .timeout = CONFIG_ETH_ENC28J60_TIMEOUT, }; -ETH_NET_DEVICE_INIT(enc28j60_0, DT_INST_0_MICROCHIP_ENC28J60_LABEL, +ETH_NET_DEVICE_INIT(enc28j60_0, DT_INST_LABEL(0), eth_enc28j60_init, device_pm_control_nop, ð_enc28j60_0_runtime, ð_enc28j60_0_config, CONFIG_ETH_INIT_PRIORITY, &api_funcs, NET_ETH_MTU); diff --git a/drivers/ethernet/eth_enc424j600.c b/drivers/ethernet/eth_enc424j600.c index b212f5e36b9..d33ac2e2e72 100644 --- a/drivers/ethernet/eth_enc424j600.c +++ b/drivers/ethernet/eth_enc424j600.c @@ -6,6 +6,8 @@ * SPDX-License-Identifier: Apache-2.0 */ +#define DT_DRV_COMPAT microchip_enc424j600 + #include #include #include @@ -752,20 +754,20 @@ static struct enc424j600_runtime enc424j600_0_runtime = { }; static const struct enc424j600_config enc424j600_0_config = { - .gpio_port = DT_INST_0_MICROCHIP_ENC424J600_INT_GPIOS_CONTROLLER, - .gpio_pin = DT_INST_0_MICROCHIP_ENC424J600_INT_GPIOS_PIN, - .gpio_flags = DT_INST_0_MICROCHIP_ENC424J600_INT_GPIOS_FLAGS, - .spi_port = DT_INST_0_MICROCHIP_ENC424J600_BUS_NAME, - .spi_freq = DT_INST_0_MICROCHIP_ENC424J600_SPI_MAX_FREQUENCY, - .spi_slave = DT_INST_0_MICROCHIP_ENC424J600_BASE_ADDRESS, + .gpio_port = DT_INST_GPIO_LABEL(0, int_gpios), + .gpio_pin = DT_INST_GPIO_PIN(0, int_gpios), + .gpio_flags = DT_INST_GPIO_FLAGS(0, int_gpios), + .spi_port = DT_INST_BUS_LABEL(0), + .spi_freq = DT_INST_PROP(0, spi_max_frequency), + .spi_slave = DT_INST_REG_ADDR(0), #ifdef CONFIG_ETH_ENC424J600_0_GPIO_SPI_CS - .spi_cs_port = DT_INST_0_MICROCHIP_ENC424J600_CS_GPIOS_CONTROLLER, - .spi_cs_pin = DT_INST_0_MICROCHIP_ENC424J600_CS_GPIOS_PIN, + .spi_cs_port = DT_INST_SPI_DEV_CS_GPIOS_LABEL(0), + .spi_cs_pin = DT_INST_SPI_DEV_CS_GPIOS_PIN(0), #endif /* CONFIG_ETH_ENC424J600_0_GPIO_SPI_CS */ .timeout = CONFIG_ETH_ENC424J600_TIMEOUT, }; -ETH_NET_DEVICE_INIT(enc424j600_0, DT_INST_0_MICROCHIP_ENC424J600_LABEL, +ETH_NET_DEVICE_INIT(enc424j600_0, DT_INST_LABEL(0), enc424j600_init, device_pm_control_nop, &enc424j600_0_runtime, &enc424j600_0_config, CONFIG_ETH_INIT_PRIORITY, &api_funcs, NET_ETH_MTU); diff --git a/drivers/ethernet/eth_mcux.c b/drivers/ethernet/eth_mcux.c index fcefb550d47..98850d0a3e9 100644 --- a/drivers/ethernet/eth_mcux.c +++ b/drivers/ethernet/eth_mcux.c @@ -7,6 +7,8 @@ * SPDX-License-Identifier: Apache-2.0 */ +#define DT_DRV_COMPAT nxp_kinetis_ethernet + /* Driver Limitations: * * There is no statistics collection for either normal operation or @@ -1198,7 +1200,7 @@ static void eth_0_config_func(void); static struct eth_context eth_0_context = { .base = ENET, #if defined(CONFIG_NET_POWER_MANAGEMENT) - .clock_name = DT_INST_0_NXP_KINETIS_ETHERNET_CLOCK_CONTROLLER, + .clock_name = DT_INST_CLOCKS_LABEL(0), .clock = kCLOCK_Enet0, #endif .config_func = eth_0_config_func, @@ -1260,7 +1262,7 @@ static void eth_1_config_func(void); static struct eth_context eth_1_context = { .base = ENET2, #if defined(CONFIG_NET_POWER_MANAGEMENT) - .clock_name = DT_INST_1_NXP_KINETIS_ETHERNET_CLOCK_CONTROLLER, + .clock_name = DT_INST_CLOCKS_LABEL(1), .clock = kCLOCK_Enet2, #endif .config_func = eth_1_config_func, diff --git a/drivers/ethernet/eth_smsc911x.c b/drivers/ethernet/eth_smsc911x.c index b1a3a0f677b..b10a13042d5 100644 --- a/drivers/ethernet/eth_smsc911x.c +++ b/drivers/ethernet/eth_smsc911x.c @@ -5,6 +5,8 @@ * SPDX-License-Identifier: Apache-2.0 */ +#define DT_DRV_COMPAT smsc_lan9220 + /* SMSC911x/SMSC9220 driver. Partly based on mbedOS driver. */ #define LOG_MODULE_NAME eth_smsc911x @@ -659,8 +661,8 @@ static struct device DEVICE_NAME_GET(eth_smsc911x_0); int eth_init(struct device *dev) { - IRQ_CONNECT(DT_INST_0_SMSC_LAN9220_IRQ_0, - DT_INST_0_SMSC_LAN9220_IRQ_0_PRIORITY, + IRQ_CONNECT(DT_INST_IRQN(0), + DT_INST_IRQ(0, priority), eth_smsc911x_isr, DEVICE_GET(eth_smsc911x_0), 0); int ret = smsc_init(); @@ -670,7 +672,7 @@ int eth_init(struct device *dev) return -ENODEV; } - irq_enable(DT_INST_0_SMSC_LAN9220_IRQ_0); + irq_enable(DT_INST_IRQN(0)); return ret; } diff --git a/drivers/ethernet/eth_smsc911x_priv.h b/drivers/ethernet/eth_smsc911x_priv.h index 755facdf7a3..6aeeefcecbc 100644 --- a/drivers/ethernet/eth_smsc911x_priv.h +++ b/drivers/ethernet/eth_smsc911x_priv.h @@ -176,7 +176,7 @@ __IO uint32_t E2P_DATA; #define SMSC9220_PHY_CS 31 #ifndef SMSC9220_BASE -#define SMSC9220_BASE DT_INST_0_SMSC_LAN9220_BASE_ADDRESS +#define SMSC9220_BASE DT_INST_REG_ADDR(0) #endif #define SMSC9220 ((volatile SMSC9220_TypeDef *)SMSC9220_BASE)