This patch groups together all the common functions for LaCie boards: Ethernet PHY and MAC address initializations. Moreover the configurations for LaCie Kirkwood boards are merged into a single file: include/configs/lacie_kw.h Signed-off-by: Simon Guinot <simon.guinot@sequanux.org>master
Simon Guinot
14 years ago
committed by
Albert ARIBAUD
parent
5628fb75d1
commit
77ea071fef
@ -0,0 +1,87 @@ |
||||
/*
|
||||
* Copyright (C) 2011 Simon Guinot <sguinot@lacie.com> |
||||
* |
||||
* 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. |
||||
*/ |
||||
|
||||
#include <common.h> |
||||
#include <i2c.h> |
||||
#include <miiphy.h> |
||||
|
||||
#if defined(CONFIG_CMD_NET) && defined(CONFIG_RESET_PHY_R) |
||||
|
||||
#define MV88E1116_LED_FCTRL_REG 10 |
||||
#define MV88E1116_CPRSP_CR3_REG 21 |
||||
#define MV88E1116_MAC_CTRL_REG 21 |
||||
#define MV88E1116_PGADR_REG 22 |
||||
#define MV88E1116_RGMII_TXTM_CTRL (1 << 4) |
||||
#define MV88E1116_RGMII_RXTM_CTRL (1 << 5) |
||||
|
||||
void mv_phy_88e1116_init(const char *name) |
||||
{ |
||||
u16 reg; |
||||
u16 devadr; |
||||
|
||||
if (miiphy_set_current_dev(name)) |
||||
return; |
||||
|
||||
/* command to read PHY dev address */ |
||||
if (miiphy_read(name, 0xEE, 0xEE, (u16 *) &devadr)) { |
||||
printf("Err..(%s) could not read PHY dev address\n", __func__); |
||||
return; |
||||
} |
||||
|
||||
/*
|
||||
* Enable RGMII delay on Tx and Rx for CPU port |
||||
* Ref: sec 4.7.2 of chip datasheet |
||||
*/ |
||||
miiphy_write(name, devadr, MV88E1116_PGADR_REG, 2); |
||||
miiphy_read(name, devadr, MV88E1116_MAC_CTRL_REG, ®); |
||||
reg |= (MV88E1116_RGMII_RXTM_CTRL | MV88E1116_RGMII_TXTM_CTRL); |
||||
miiphy_write(name, devadr, MV88E1116_MAC_CTRL_REG, reg); |
||||
miiphy_write(name, devadr, MV88E1116_PGADR_REG, 0); |
||||
|
||||
/* reset the phy */ |
||||
miiphy_reset(name, devadr); |
||||
|
||||
printf("88E1116 Initialized on %s\n", name); |
||||
} |
||||
#endif /* CONFIG_CMD_NET && CONFIG_RESET_PHY_R */ |
||||
|
||||
#if defined(CONFIG_CMD_I2C) && defined(CONFIG_SYS_I2C_EEPROM_ADDR) |
||||
int lacie_read_mac_address(uchar *mac_addr) |
||||
{ |
||||
int ret; |
||||
ushort version; |
||||
|
||||
/* I2C-0 for on-board EEPROM */ |
||||
i2c_set_bus_num(0); |
||||
|
||||
/* Check layout version for EEPROM data */ |
||||
ret = i2c_read(CONFIG_SYS_I2C_EEPROM_ADDR, 0, |
||||
CONFIG_SYS_I2C_EEPROM_ADDR_LEN, |
||||
(uchar *) &version, 2); |
||||
if (ret != 0) { |
||||
printf("Error: failed to read I2C EEPROM @%02x\n", |
||||
CONFIG_SYS_I2C_EEPROM_ADDR); |
||||
return ret; |
||||
} |
||||
version = be16_to_cpu(version); |
||||
if (version < 1 || version > 3) { |
||||
printf("Error: unknown version %d for EEPROM data\n", |
||||
version); |
||||
return -1; |
||||
} |
||||
|
||||
/* Read Ethernet MAC address from EEPROM */ |
||||
ret = i2c_read(CONFIG_SYS_I2C_EEPROM_ADDR, 2, |
||||
CONFIG_SYS_I2C_EEPROM_ADDR_LEN, mac_addr, 6); |
||||
if (ret != 0) |
||||
printf("Error: failed to read I2C EEPROM @%02x\n", |
||||
CONFIG_SYS_I2C_EEPROM_ADDR); |
||||
return ret; |
||||
} |
||||
#endif /* CONFIG_CMD_I2C && CONFIG_SYS_I2C_EEPROM_ADDR */ |
||||
@ -0,0 +1,20 @@ |
||||
/*
|
||||
* Copyright (C) 2011 Simon Guinot <sguinot@lacie.com> |
||||
* |
||||
* 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. |
||||
*/ |
||||
|
||||
#ifndef _LACIE_COMMON_H |
||||
#define _LACIE_COMMON_H |
||||
|
||||
#if defined(CONFIG_CMD_NET) && defined(CONFIG_RESET_PHY_R) |
||||
void mv_phy_88e1116_init(const char *name); |
||||
#endif |
||||
#if defined(CONFIG_CMD_I2C) && defined(CONFIG_SYS_I2C_EEPROM_ADDR) |
||||
int lacie_read_mac_address(uchar *mac); |
||||
#endif |
||||
|
||||
#endif /* _LACIE_COMMON_H */ |
||||
@ -1,41 +0,0 @@ |
||||
/*
|
||||
* (C) Copyright 2009 |
||||
* Net Insight <www.netinsight.net> |
||||
* Written-by: Simon Kagstrom <simon.kagstrom@netinsight.net> |
||||
* |
||||
* Based on sheevaplug.h: |
||||
* (C) Copyright 2009 |
||||
* Marvell Semiconductor <www.marvell.com> |
||||
* Written-by: Prafulla Wadaskar <prafulla@marvell.com> |
||||
* |
||||
* See file CREDITS for list of people who contributed to this |
||||
* project. |
||||
* |
||||
* 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., 51 Franklin Street, Fifth Floor, Boston, |
||||
* MA 02110-1301 USA |
||||
*/ |
||||
|
||||
#ifndef __EDMINIV2_BASE_H |
||||
#define __EDMINIV2_BASE_H |
||||
|
||||
/* PHY related */ |
||||
#define MV88E1116_LED_FCTRL_REG 10 |
||||
#define MV88E1116_CPRSP_CR3_REG 21 |
||||
#define MV88E1116_MAC_CTRL_REG 21 |
||||
#define MV88E1116_PGADR_REG 22 |
||||
#define MV88E1116_RGMII_TXTM_CTRL (1 << 4) |
||||
#define MV88E1116_RGMII_RXTM_CTRL (1 << 5) |
||||
|
||||
#endif /* __EDMINIV2_BASE_H */ |
||||
@ -1,161 +0,0 @@ |
||||
/*
|
||||
* Copyright (C) 2011 Simon Guinot <sguinot@lacie.com> |
||||
* |
||||
* See file CREDITS for list of people who contributed to this |
||||
* project. |
||||
* |
||||
* 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. |
||||
*/ |
||||
|
||||
#ifndef _CONFIG_NET2BIG_V2_H |
||||
#define _CONFIG_NET2BIG_V2_H |
||||
|
||||
/*
|
||||
* Machine number information |
||||
*/ |
||||
#define CONFIG_IDENT_STRING " 2Big v2" |
||||
|
||||
/*
|
||||
* High Level Configuration Options (easy to change) |
||||
*/ |
||||
#define CONFIG_FEROCEON_88FR131 /* CPU Core subversion */ |
||||
#define CONFIG_KIRKWOOD /* SOC Family Name */ |
||||
#define CONFIG_KW88F6281 /* SOC Name */ |
||||
#define CONFIG_MACH_NET2BIG_V2 /* Machine type */ |
||||
#define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */ |
||||
|
||||
/*
|
||||
* Commands configuration |
||||
*/ |
||||
#define CONFIG_SYS_NO_FLASH /* Declare no flash (NOR/SPI) */ |
||||
#include <config_cmd_default.h> |
||||
#define CONFIG_CMD_ENV |
||||
#define CONFIG_CMD_DHCP |
||||
#define CONFIG_CMD_PING |
||||
#define CONFIG_CMD_SF |
||||
#define CONFIG_CMD_I2C |
||||
#define CONFIG_CMD_IDE |
||||
#define CONFIG_CMD_USB |
||||
|
||||
/*
|
||||
* Core clock definition. |
||||
*/ |
||||
#define CONFIG_SYS_TCLK 166000000 /* 166MHz */ |
||||
|
||||
/*
|
||||
* mv-common.h should be defined after CMD configs since it used them |
||||
* to enable certain macros |
||||
*/ |
||||
#define CONFIG_NR_DRAM_BANKS 2 |
||||
#include "mv-common.h" |
||||
|
||||
/* Remove or override few declarations from mv-common.h */ |
||||
#undef CONFIG_RBTREE |
||||
#undef CONFIG_ENV_SPI_MAX_HZ |
||||
#undef CONFIG_SYS_IDE_MAXBUS |
||||
#undef CONFIG_SYS_IDE_MAXDEVICE |
||||
#undef CONFIG_SYS_PROMPT |
||||
#define CONFIG_ENV_SPI_MAX_HZ 20000000 /* 20Mhz */ |
||||
#define CONFIG_SYS_IDE_MAXBUS 1 |
||||
#define CONFIG_SYS_IDE_MAXDEVICE 1 |
||||
#define CONFIG_SYS_PROMPT "2big2> " |
||||
|
||||
/*
|
||||
* Ethernet Driver configuration |
||||
*/ |
||||
#ifdef CONFIG_CMD_NET |
||||
#define CONFIG_MISC_INIT_R /* Call misc_init_r() to initialize MAC address */ |
||||
#define CONFIG_MVGBE_PORTS {1, 0} /* enable port 0 only */ |
||||
#define CONFIG_NETCONSOLE |
||||
#endif |
||||
|
||||
/*
|
||||
* SATA Driver configuration |
||||
*/ |
||||
#ifdef CONFIG_MVSATA_IDE |
||||
#define CONFIG_SYS_ATA_IDE0_OFFSET MV_SATA_PORT0_OFFSET |
||||
#define CONFIG_SYS_ATA_IDE1_OFFSET MV_SATA_PORT1_OFFSET |
||||
#endif |
||||
|
||||
/*
|
||||
* Enable GPI0 support |
||||
*/ |
||||
#define CONFIG_KIRKWOOD_GPIO |
||||
|
||||
/*
|
||||
* Enable I2C support |
||||
*/ |
||||
#ifdef CONFIG_CMD_I2C |
||||
/* I2C EEPROM HT24LC04 (512B - 32 pages of 16 Bytes) */ |
||||
#define CONFIG_CMD_EEPROM |
||||
#define CONFIG_SYS_I2C_EEPROM_ADDR 0x50 |
||||
#define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS 4 /* 16-byte page size */ |
||||
#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1 /* 8-bit device address */ |
||||
#endif /* CONFIG_CMD_I2C */ |
||||
|
||||
/*
|
||||
* File systems support |
||||
*/ |
||||
#define CONFIG_CMD_EXT2 |
||||
#define CONFIG_CMD_FAT |
||||
|
||||
/*
|
||||
* Use the HUSH parser |
||||
*/ |
||||
#define CONFIG_SYS_HUSH_PARSER |
||||
#define CONFIG_SYS_PROMPT_HUSH_PS2 "> " |
||||
|
||||
/*
|
||||
* Console configuration |
||||
*/ |
||||
#define CONFIG_CONSOLE_MUX |
||||
#define CONFIG_SYS_CONSOLE_IS_IN_ENV |
||||
|
||||
/*
|
||||
* Enable device tree support |
||||
*/ |
||||
#define CONFIG_OF_LIBFDT |
||||
|
||||
/*
|
||||
* Environment variables configurations |
||||
*/ |
||||
#define CONFIG_ENV_IS_IN_SPI_FLASH |
||||
#define CONFIG_ENV_SECT_SIZE 0x10000 /* 64KB */ |
||||
#define CONFIG_ENV_SIZE 0x1000 /* 4KB */ |
||||
#define CONFIG_ENV_ADDR 0x70000 |
||||
#define CONFIG_ENV_OFFSET 0x70000 /* env starts here */ |
||||
|
||||
/*
|
||||
* Default environment variables |
||||
*/ |
||||
#define CONFIG_BOOTARGS "console=ttyS0,115200" |
||||
|
||||
#define CONFIG_BOOTCOMMAND \ |
||||
"dhcp && run netconsole; " \
|
||||
"if run usbload || run diskload; then bootm; fi" |
||||
|
||||
#define CONFIG_EXTRA_ENV_SETTINGS \ |
||||
"stdin=serial\0" \
|
||||
"stdout=serial\0" \
|
||||
"stderr=serial\0" \
|
||||
"bootfile=uImage\0" \
|
||||
"loadaddr=0x800000\0" \
|
||||
"autoload=no\0" \
|
||||
"netconsole=" \
|
||||
"set stdin $stdin,nc; " \
|
||||
"set stdout $stdout,nc; " \
|
||||
"set stderr $stderr,nc;\0" \
|
||||
"diskload=ide reset && " \
|
||||
"ext2load ide 0:1 $loadaddr /boot/$bootfile\0" \
|
||||
"usbload=usb start && " \
|
||||
"fatload usb 0:1 $loadaddr /boot/$bootfile\0" |
||||
|
||||
#endif /* _CONFIG_NET2BIG_V2_H */ |
||||
Loading…
Reference in new issue