From 040d6b6e997f99821060901993360d9424e7e58f Mon Sep 17 00:00:00 2001 From: Kumar Gala Date: Fri, 8 Feb 2019 13:04:47 -0600 Subject: [PATCH] eth: eth_mcux: Convert to use DT_ prefixed defines The eth mcux driver has been using non DT_ prefixed defines for DT generated defines. Switch to use DT_ prefixed ones as we want to deprecated the non DT_ prefixed defines. Signed-off-by: Kumar Gala --- drivers/ethernet/eth_mcux.c | 16 ++++++++-------- soc/arm/nxp_kinetis/k6x/dts_fixup.h | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/ethernet/eth_mcux.c b/drivers/ethernet/eth_mcux.c index 79fb01816a4..3fb7fe34fef 100644 --- a/drivers/ethernet/eth_mcux.c +++ b/drivers/ethernet/eth_mcux.c @@ -937,7 +937,7 @@ static void eth_mcux_ptp_isr(void *p) } #endif -#if defined(ETH_IRQ_COMMON) +#if defined(DT_ETH_IRQ_COMMON) static void eth_mcux_dispacher_isr(void *p) { struct device *dev = p; @@ -960,7 +960,7 @@ static void eth_mcux_dispacher_isr(void *p) } #endif -#if defined(ETH_IRQ_RX) +#if defined(DT_ETH_IRQ_RX) static void eth_mcux_rx_isr(void *p) { struct device *dev = p; @@ -970,7 +970,7 @@ static void eth_mcux_rx_isr(void *p) } #endif -#if defined(ETH_IRQ_TX) +#if defined(DT_ETH_IRQ_TX) static void eth_mcux_tx_isr(void *p) { struct device *dev = p; @@ -980,7 +980,7 @@ static void eth_mcux_tx_isr(void *p) } #endif -#if defined(ETH_IRQ_ERR_MISC) +#if defined(DT_ETH_IRQ_ERR_MISC) static void eth_mcux_error_isr(void *p) { struct device *dev = p; @@ -1016,25 +1016,25 @@ ETH_NET_DEVICE_INIT(eth_mcux_0, DT_ETH_MCUX_0_NAME, eth_0_init, static void eth_0_config_func(void) { -#if defined(ETH_IRQ_RX) +#if defined(DT_ETH_IRQ_RX) IRQ_CONNECT(DT_IRQ_ETH_RX, DT_ETH_MCUX_0_IRQ_PRI, eth_mcux_rx_isr, DEVICE_GET(eth_mcux_0), 0); irq_enable(DT_IRQ_ETH_RX); #endif -#if defined(ETH_IRQ_TX) +#if defined(DT_ETH_IRQ_TX) IRQ_CONNECT(DT_IRQ_ETH_TX, DT_ETH_MCUX_0_IRQ_PRI, eth_mcux_tx_isr, DEVICE_GET(eth_mcux_0), 0); irq_enable(DT_IRQ_ETH_TX); #endif -#if defined(ETH_IRQ_ERR_MISC) +#if defined(DT_ETH_IRQ_ERR_MISC) IRQ_CONNECT(DT_IRQ_ETH_ERR_MISC, DT_ETH_MCUX_0_IRQ_PRI, eth_mcux_error_isr, DEVICE_GET(eth_mcux_0), 0); irq_enable(DT_IRQ_ETH_ERR_MISC); #endif -#if defined(ETH_IRQ_COMMON) +#if defined(DT_ETH_IRQ_COMMON) IRQ_CONNECT(DT_IRQ_ETH_COMMON, DT_ETH_MCUX_0_IRQ_PRI, eth_mcux_dispacher_isr, DEVICE_GET(eth_mcux_0), 0); irq_enable(DT_IRQ_ETH_COMMON); diff --git a/soc/arm/nxp_kinetis/k6x/dts_fixup.h b/soc/arm/nxp_kinetis/k6x/dts_fixup.h index 66c979940a7..a664ec32beb 100644 --- a/soc/arm/nxp_kinetis/k6x/dts_fixup.h +++ b/soc/arm/nxp_kinetis/k6x/dts_fixup.h @@ -128,7 +128,7 @@ #define DT_USBD_KINETIS_BASE_ADDRESS DT_NXP_KINETIS_USBD_40072000_BASE_ADDRESS #define DT_USBD_KINETIS_NUM_BIDIR_EP DT_NXP_KINETIS_USBD_40072000_NUM_BIDIR_ENDPOINTS -#define DT_ETH_MCUX_0_NAME ETH_LABEL +#define DT_ETH_MCUX_0_NAME DT_NXP_KINETIS_ETHERNET_400C0004_LABEL #define DT_ETH_MCUX_0_MAC3 DT_NXP_KINETIS_ETHERNET_400C0004_LOCAL_MAC_ADDRESS_3 #define DT_ETH_MCUX_0_MAC4 DT_NXP_KINETIS_ETHERNET_400C0004_LOCAL_MAC_ADDRESS_4