From: Vipin KUMAR
SPEAr310 and SPEAr320 SoCs have an extra ethernet controller. The
driver for this device is already supported by u-boot, so configuring
board configuration file and defining base addresses etc to make use
of the common driver
Signed-off-by: Vipin Kumar
---
arch/arm/include/asm/arch-spear/clk.h | 27 +++
arch/arm/include/asm/arch-spear/hardware.h |7 +++
board/spear/spear310/spear310.c| 25 ++---
board/spear/spear320/spear320.c| 12 +---
include/configs/spear3xx.h | 13 +
5 files changed, 78 insertions(+), 6 deletions(-)
create mode 100644 arch/arm/include/asm/arch-spear/clk.h
diff --git a/arch/arm/include/asm/arch-spear/clk.h
b/arch/arm/include/asm/arch-spear/clk.h
new file mode 100644
index 000..a45ec18
--- /dev/null
+++ b/arch/arm/include/asm/arch-spear/clk.h
@@ -0,0 +1,27 @@
+/*
+ * (C) Copyright 2010
+ * Vipin Kumar, STMicroelectronics,
+ *
+ * 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., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+static inline unsigned long get_macb_pclk_rate(unsigned int dev_id)
+{
+ return 8300;
+}
diff --git a/arch/arm/include/asm/arch-spear/hardware.h
b/arch/arm/include/asm/arch-spear/hardware.h
index 39d64b6..9f1e154 100644
--- a/arch/arm/include/asm/arch-spear/hardware.h
+++ b/arch/arm/include/asm/arch-spear/hardware.h
@@ -56,6 +56,11 @@
#define CONFIG_SPEAR_EMIBASE (0x4F00)
#define CONFIG_SPEAR_RASBASE (0xB400)
+#define CONFIG_SYS_MACB0_BASE (0xB000)
+#define CONFIG_SYS_MACB1_BASE (0xB080)
+#define CONFIG_SYS_MACB2_BASE (0xB100)
+#define CONFIG_SYS_MACB3_BASE (0xB180)
+
#elif defined(CONFIG_SPEAR320)
#define CONFIG_SYS_I2C_BASE(0xD018)
#define CONFIG_SPEAR_FSMCBASE (0x4C00)
@@ -63,5 +68,7 @@
#define CONFIG_SPEAR_EMIBASE (0x4000)
#define CONFIG_SPEAR_RASBASE (0xB300)
+#define CONFIG_SYS_MACB0_BASE (0xAA00)
+
#endif
#endif /* _ASM_ARCH_HARDWARE_H */
diff --git a/board/spear/spear310/spear310.c b/board/spear/spear310/spear310.c
index f25eedf..96f1e00 100644
--- a/board/spear/spear310/spear310.c
+++ b/board/spear/spear310/spear310.c
@@ -61,9 +61,28 @@ int board_nand_init(struct nand_chip *nand)
int board_eth_init(bd_t *bis)
{
+ int ret = 0;
+
#if defined(CONFIG_DESIGNWARE_ETH)
- return designware_initialize(0, CONFIG_SPEAR_ETHBASE, CONFIG_DW0_PHY);
-#else
- return -1;
+ if (designware_initialize(0, CONFIG_SPEAR_ETHBASE, CONFIG_DW0_PHY) < 0)
+ ret += -1;
+#endif
+#if defined(CONFIG_MACB)
+ if (macb_eth_initialize(0, (void *)CONFIG_SYS_MACB0_BASE,
+ CONFIG_MACB0_PHY) < 0)
+ ret += -1;
+
+ if (macb_eth_initialize(1, (void *)CONFIG_SYS_MACB1_BASE,
+ CONFIG_MACB1_PHY) < 0)
+ ret += -1;
+
+ if (macb_eth_initialize(2, (void *)CONFIG_SYS_MACB2_BASE,
+ CONFIG_MACB2_PHY) < 0)
+ ret += -1;
+
+ if (macb_eth_initialize(3, (void *)CONFIG_SYS_MACB3_BASE,
+ CONFIG_MACB3_PHY) < 0)
+ ret += -1;
#endif
+ return ret;
}
diff --git a/board/spear/spear320/spear320.c b/board/spear/spear320/spear320.c
index 1ed05aa..c3208e2 100644
--- a/board/spear/spear320/spear320.c
+++ b/board/spear/spear320/spear320.c
@@ -61,9 +61,15 @@ int board_nand_init(struct nand_chip *nand)
int board_eth_init(bd_t *bis)
{
+ int ret = 0;
#if defined(CONFIG_DESIGNWARE_ETH)
- return designware_initialize(0, CONFIG_SPEAR_ETHBASE, CONFIG_DW0_PHY);
-#else
- return -1;
+ if (designware_initialize(0, CONFIG_SPEAR_ETHBASE, CONFIG_DW0_PHY) < 0)
+ ret += -1;
+#endif
+#if defined(CONFIG_MACB)
+ if (macb_eth_initialize(0, (void *)CONFIG_SYS_MACB0_BASE,
+ CONFIG_MACB0_PHY) < 0)
+ ret += -1;
#endif
+ return ret;
}
diff --git a/include/configs/spear3xx.h b/include/configs/spear3xx
