mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-20 03:38:43 +00:00
7b37a27e14
This patch proposes to migrate the davinci_emac driver to using the eth_device->write_hwaddr function pointer as suggested by Ben Warren. All the davinci boards had the behaviour, prior to this patch, of sync'ing the environment variable enetaddr with the MAC address read from non-volatile storage on boot -- when the two locations disagreed, the environment variable value took precendence. This patch keeps the same behaviour but lets eth_initialize take care of it. This patch refactors davinci_emac setup in the boards so that the MAC address is read from non-volatile storage into the environment variable and then the environment variable value is use in eth_intialize. The only exception is the direct call to davinci_eth_set_mac_addr made by the da830evm board init which was changed into an assignment of the enetaddr field. Signed-off-by: Ben Gardiner <bengardiner@nanometrics.ca> Tested-by: Nick Thompson <nick.thompson@ge.com> Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
103 lines
2.6 KiB
C
103 lines
2.6 KiB
C
/*
|
|
* Copyright (C) 2009 Texas Instruments Incorporated
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
|
*/
|
|
|
|
#include <common.h>
|
|
#include <nand.h>
|
|
#include <asm/io.h>
|
|
#include <asm/arch/hardware.h>
|
|
#include <asm/arch/emif_defs.h>
|
|
#include <asm/arch/nand_defs.h>
|
|
#include <asm/arch/gpio_defs.h>
|
|
#include <netdev.h>
|
|
#include "../common/misc.h"
|
|
|
|
DECLARE_GLOBAL_DATA_PTR;
|
|
|
|
int board_init(void)
|
|
{
|
|
gd->bd->bi_arch_number = MACH_TYPE_DAVINCI_DM365_EVM;
|
|
gd->bd->bi_boot_params = PHYS_SDRAM_1 + 0x100;
|
|
|
|
return 0;
|
|
}
|
|
|
|
#ifdef CONFIG_DRIVER_TI_EMAC
|
|
int board_eth_init(bd_t *bis)
|
|
{
|
|
uint8_t eeprom_enetaddr[6];
|
|
int i;
|
|
struct davinci_gpio *gpio1_base =
|
|
(struct davinci_gpio *)DAVINCI_GPIO_BANK01;
|
|
|
|
/* Configure PINMUX 3 to enable EMAC pins */
|
|
writel((readl(PINMUX3) | 0x1affff), PINMUX3);
|
|
|
|
/* Configure GPIO20 as output */
|
|
writel((readl(&gpio1_base->dir) & ~(1 << 20)), &gpio1_base->dir);
|
|
|
|
/* Toggle GPIO 20 */
|
|
for (i = 0; i < 20; i++) {
|
|
/* GPIO 20 low */
|
|
writel((readl(&gpio1_base->out_data) & ~(1 << 20)),
|
|
&gpio1_base->out_data);
|
|
|
|
udelay(1000);
|
|
|
|
/* GPIO 20 high */
|
|
writel((readl(&gpio1_base->out_data) | (1 << 20)),
|
|
&gpio1_base->out_data);
|
|
}
|
|
|
|
/* Configure I2C pins so that EEPROM can be read */
|
|
writel((readl(PINMUX3) | 0x01400000), PINMUX3);
|
|
|
|
/* Read Ethernet MAC address from EEPROM */
|
|
if (dvevm_read_mac_address(eeprom_enetaddr))
|
|
davinci_sync_env_enetaddr(eeprom_enetaddr);
|
|
|
|
davinci_emac_initialize();
|
|
|
|
return 0;
|
|
}
|
|
#endif
|
|
|
|
#ifdef CONFIG_NAND_DAVINCI
|
|
static void nand_dm365evm_select_chip(struct mtd_info *mtd, int chip)
|
|
{
|
|
struct nand_chip *this = mtd->priv;
|
|
unsigned long wbase = (unsigned long) this->IO_ADDR_W;
|
|
unsigned long rbase = (unsigned long) this->IO_ADDR_R;
|
|
|
|
if (chip == 1) {
|
|
__set_bit(14, &wbase);
|
|
__set_bit(14, &rbase);
|
|
} else {
|
|
__clear_bit(14, &wbase);
|
|
__clear_bit(14, &rbase);
|
|
}
|
|
this->IO_ADDR_W = (void *)wbase;
|
|
this->IO_ADDR_R = (void *)rbase;
|
|
}
|
|
|
|
int board_nand_init(struct nand_chip *nand)
|
|
{
|
|
davinci_nand_init(nand);
|
|
nand->select_chip = nand_dm365evm_select_chip;
|
|
return 0;
|
|
}
|
|
#endif
|