diff options
Diffstat (limited to 'drivers/net/ti')
| -rw-r--r-- | drivers/net/ti/davinci_emac.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/drivers/net/ti/davinci_emac.c b/drivers/net/ti/davinci_emac.c index 2dfadbd82d5..29d2fc9b54e 100644 --- a/drivers/net/ti/davinci_emac.c +++ b/drivers/net/ti/davinci_emac.c @@ -65,8 +65,8 @@ static inline unsigned long HW_TO_BD(unsigned long x) #define emac_gigabit_enable(phy_addr) /* no gigabit to enable */ #endif -#if !defined(CONFIG_SYS_EMAC_TI_CLKDIV) -#define CONFIG_SYS_EMAC_TI_CLKDIV ((EMAC_MDIO_BUS_FREQ / \ +#if !defined(CFG_SYS_EMAC_TI_CLKDIV) +#define CFG_SYS_EMAC_TI_CLKDIV ((EMAC_MDIO_BUS_FREQ / \ EMAC_MDIO_CLOCK_FREQ) - 1) #endif @@ -98,17 +98,17 @@ static int emac_rx_queue_active = 0; static unsigned char emac_rx_buffers[EMAC_MAX_RX_BUFFERS * EMAC_RXBUF_SIZE] __aligned(ARCH_DMA_MINALIGN); -#ifndef CONFIG_SYS_DAVINCI_EMAC_PHY_COUNT -#define CONFIG_SYS_DAVINCI_EMAC_PHY_COUNT 3 +#ifndef CFG_SYS_DAVINCI_EMAC_PHY_COUNT +#define CFG_SYS_DAVINCI_EMAC_PHY_COUNT 3 #endif /* PHY address for a discovered PHY (0xff - not found) */ -static u_int8_t active_phy_addr[CONFIG_SYS_DAVINCI_EMAC_PHY_COUNT]; +static u_int8_t active_phy_addr[CFG_SYS_DAVINCI_EMAC_PHY_COUNT]; /* number of PHY found active */ static u_int8_t num_phy; -phy_t phy[CONFIG_SYS_DAVINCI_EMAC_PHY_COUNT]; +phy_t phy[CFG_SYS_DAVINCI_EMAC_PHY_COUNT]; static int davinci_emac_write_hwaddr(struct udevice *dev) { @@ -152,7 +152,7 @@ static void davinci_eth_mdio_enable(void) { u_int32_t clkdiv; - clkdiv = CONFIG_SYS_EMAC_TI_CLKDIV; + clkdiv = CFG_SYS_EMAC_TI_CLKDIV; writel((clkdiv & 0xff) | MDIO_CONTROL_ENABLE | @@ -176,7 +176,7 @@ static int davinci_eth_phy_detect(void) int j; unsigned int count = 0; - for (i = 0; i < CONFIG_SYS_DAVINCI_EMAC_PHY_COUNT; i++) + for (i = 0; i < CFG_SYS_DAVINCI_EMAC_PHY_COUNT; i++) active_phy_addr[i] = 0xff; udelay(1000); @@ -190,7 +190,7 @@ static int davinci_eth_phy_detect(void) for (i = 0, j = 0; i < 32; i++) if (phy_act_state & (1 << i)) { count++; - if (count <= CONFIG_SYS_DAVINCI_EMAC_PHY_COUNT) { + if (count <= CFG_SYS_DAVINCI_EMAC_PHY_COUNT) { active_phy_addr[j++] = i; } else { printf("%s: to many PHYs detected.\n", @@ -501,7 +501,7 @@ static int davinci_emac_start(struct udevice *dev) writel(1, &adap_emac->RXUNICASTSET); /* Init MDIO & get link state */ - clkdiv = CONFIG_SYS_EMAC_TI_CLKDIV; + clkdiv = CFG_SYS_EMAC_TI_CLKDIV; writel((clkdiv & 0xff) | MDIO_CONTROL_ENABLE | MDIO_CONTROL_FAULT, &adap_mdio->CONTROL); |