Skip to contentSkip to conversation

ARM: Add support for EP93xx SoCs

PATCH New Matthias Kaehlcke 3 participants 7 messages Jan 24, 2010 – Feb 1, 2010 1 message not in the archive

Subsystems (3)
lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

#1 lore raw

PATCH 1/3 ARM: Add support for EP93xx SoCs

Add support for the Cirrus EP93xx platform

---
 cpu/arm920t/ep93xx/Makefile          |   56 ++++
 cpu/arm920t/ep93xx/cpu.c             |   51 +++
 cpu/arm920t/ep93xx/led.c             |  101 ++++++
 cpu/arm920t/ep93xx/lowlevel_init.S   |   65 ++++
 cpu/arm920t/ep93xx/speed.c           |  110 +++++++
 cpu/arm920t/ep93xx/timer.c           |  168 ++++++++++
 cpu/arm920t/ep93xx/u-boot.lds        |   59 ++++
 include/asm-arm/arch-ep93xx/ep93xx.h |  595 ++++++++++++++++++++++++++++++++++
 include/common.h                     |    3 +-
 9 files changed, 1207 insertions(+), 1 deletions(-)
 create mode 100644 cpu/arm920t/ep93xx/Makefile
 create mode 100644 cpu/arm920t/ep93xx/cpu.c
 create mode 100644 cpu/arm920t/ep93xx/led.c
 create mode 100644 cpu/arm920t/ep93xx/lowlevel_init.S
 create mode 100644 cpu/arm920t/ep93xx/speed.c
 create mode 100644 cpu/arm920t/ep93xx/timer.c
 create mode 100644 cpu/arm920t/ep93xx/u-boot.lds
 create mode 100644 include/asm-arm/arch-ep93xx/ep93xx.h
cpu/arm920t/ep93xx/Makefile new file +56 -0
new file mode 100644
index 0000000..30e12af
@@ -0,0 +1,56 @@
+#
+# Cirrus Logic EP93xx CPU-specific Makefile
+#
+# Copyright (C) 2009 Matthias Kaehlcke <[email protected]>
+#
+# Copyright (C) 2004, 2005
+# Cory T. Tusar, Videon Central, Inc., <[email protected]>
+#
+# Copyright (C) 2006
+# Dominic Rath <[email protected]>
+#
+# Based on an original Makefile, which is
+#
+# (C) Copyright 2000, 2001, 2002
+# Wolfgang Denk, DENX Software Engineering, wd at denx.de.
+#
+# 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.,
+# 675 Mass Ave, Cambridge, MA 02139, USA.
+#
+include $(TOPDIR)/config.mk
+
+LIB = $(obj)lib$(SOC).a
+
+COBJS   = cpu.o led.o speed.o timer.o
+SOBJS   = lowlevel_init.o
+
+SRCS    := $(SOBJS:.o=.S) $(COBJS:.o=.c)
+OBJS    := $(addprefix $(obj),$(SOBJS) $(COBJS))
+
+all:    $(obj).depend $(LIB)
+
+$(LIB): $(OBJS)
+	$(AR) $(ARFLAGS) $@ $(OBJS)
+
+#########################################################################
+
+# defines $(obj).depend target
+include $(SRCTREE)/rules.mk
+
+sinclude $(obj).depend
+
+#########################################################################
+
cpu/arm920t/ep93xx/cpu.c new file +51 -0

51 lines not on this page · raw message

cpu/arm920t/ep93xx/led.c new file +101 -0

101 lines not on this page · raw message

cpu/arm920t/ep93xx/lowlevel_init.S new file +65 -0

65 lines not on this page · raw message

cpu/arm920t/ep93xx/speed.c new file +110 -0

110 lines not on this page · raw message

cpu/arm920t/ep93xx/timer.c new file +168 -0

168 lines not on this page · raw message

cpu/arm920t/ep93xx/u-boot.lds new file +59 -0

59 lines not on this page · raw message

include/asm-arm/arch-ep93xx/ep93xx.h new file +595 -0

595 lines not on this page · raw message

include/common.h +2 -1
index 391790a..f2a7067 100644
@@ -502,7 +502,8 @@ ulong	get_PCI_freq (void);
 #endif
 #if defined(CONFIG_S3C24X0) || \
     defined(CONFIG_LH7A40X) || \
-    defined(CONFIG_S3C6400)
+    defined(CONFIG_S3C6400) || \
+    defined(CONFIG_EP93XX)
 ulong	get_FCLK (void);
 ulong	get_HCLK (void);
 ulong	get_PCLK (void);
Signature · 1 line
1.6.3.1
#2 lore raw

PATCH 1/3 ARM: Add support for EP93xx SoCs

Quoted 14 lines · Matthias Kaehlcke

Add support for the Cirrus EP93xx platform

---
 cpu/arm920t/ep93xx/Makefile          |   56 ++++
 cpu/arm920t/ep93xx/cpu.c             |   51 +++
 cpu/arm920t/ep93xx/led.c             |  101 ++++++
 cpu/arm920t/ep93xx/lowlevel_init.S   |   65 ++++
 cpu/arm920t/ep93xx/speed.c           |  110 +++++++
 cpu/arm920t/ep93xx/timer.c           |  168 ++++++++++
 cpu/arm920t/ep93xx/u-boot.lds        |   59 ++++
 include/asm-arm/arch-ep93xx/ep93xx.h |  595 ++++++++++++++++++++++++++++++++++
 include/common.h                     |    3 +-
 9 files changed, 1207 insertions(+), 1 deletions(-)
Quoted 8 lines
 create mode 100644 cpu/arm920t/ep93xx/Makefile
 create mode 100644 cpu/arm920t/ep93xx/cpu.c
 create mode 100644 cpu/arm920t/ep93xx/led.c
 create mode 100644 cpu/arm920t/ep93xx/lowlevel_init.S
 create mode 100644 cpu/arm920t/ep93xx/speed.c
 create mode 100644 cpu/arm920t/ep93xx/timer.c
 create mode 100644 cpu/arm920t/ep93xx/u-boot.lds
 create mode 100644 include/asm-arm/arch-ep93xx/ep93xx.h

This looks good.
Ack-ed.
Tom

#3 lore raw

PATCH 1/3 ARM: Add support for EP93xx SoCs

El Sun, Jan 31, 2010 at 12:53:37PM -0600 Tom ha dit:

Quoted 24 lines
Quoted 14 lines · Matthias Kaehlcke

Add support for the Cirrus EP93xx platform

---

cpu/arm920t/ep93xx/Makefile          |   56 ++++
cpu/arm920t/ep93xx/cpu.c             |   51 +++
cpu/arm920t/ep93xx/led.c             |  101 ++++++
cpu/arm920t/ep93xx/lowlevel_init.S   |   65 ++++
cpu/arm920t/ep93xx/speed.c           |  110 +++++++
cpu/arm920t/ep93xx/timer.c           |  168 ++++++++++
cpu/arm920t/ep93xx/u-boot.lds        |   59 ++++
include/asm-arm/arch-ep93xx/ep93xx.h |  595 ++++++++++++++++++++++++++++++++++
include/common.h                     |    3 +-
9 files changed, 1207 insertions(+), 1 deletions(-)
Quoted 8 lines

create mode 100644 cpu/arm920t/ep93xx/Makefile create mode 100644 cpu/arm920t/ep93xx/cpu.c create mode 100644 cpu/arm920t/ep93xx/led.c create mode 100644 cpu/arm920t/ep93xx/lowlevel_init.S create mode 100644 cpu/arm920t/ep93xx/speed.c create mode 100644 cpu/arm920t/ep93xx/timer.c create mode 100644 cpu/arm920t/ep93xx/u-boot.lds create mode 100644 include/asm-arm/arch-ep93xx/ep93xx.h

Quoted 2 lines

This looks good.
Ack-ed.

great :)

thanks for reviewing all these patches!

this week i'll respond with a patch to the issues you raised about the board patch

Signature · 11 lines
Matthias Kaehlcke
Embedded Linux Developer
Barcelona

          We can't solve problems by using the same kind
             of thinking we used when we created them
                         (Albert Einstein)
                                                                 .''`.
    using free software / Debian GNU/Linux | http://debian.org  : :'  :
                                                                `. `'`
gpg --keyserver pgp.mit.edu --recv-keys 47D8E5D4                  `-
#4 lore raw

PATCH 2/3 Add EP93xx ethernet driver

In reply to a message not in the archive

Added ethernet driver for EP93xx SoCs

---
 drivers/net/Makefile     |    1 +
 drivers/net/ep93xx_eth.c |  654 ++++++++++++++++++++++++++++++++++++++++++++++
 drivers/net/ep93xx_eth.h |  144 ++++++++++
 include/common.h         |    5 +
 include/netdev.h         |    1 +
 5 files changed, 805 insertions(+), 0 deletions(-)
 create mode 100644 drivers/net/ep93xx_eth.c
 create mode 100644 drivers/net/ep93xx_eth.h
drivers/net/Makefile +1 -0
index 904727e..dc3107c 100644
@@ -37,6 +37,7 @@ COBJS-$(CONFIG_DNET) += dnet.o
 COBJS-$(CONFIG_E1000) += e1000.o
 COBJS-$(CONFIG_EEPRO100) += eepro100.o
 COBJS-$(CONFIG_ENC28J60) += enc28j60.o
+COBJS-$(CONFIG_EP93XX) += ep93xx_eth.o
 COBJS-$(CONFIG_FEC_MXC) += fec_mxc.o
 COBJS-$(CONFIG_FSLDMAFEC) += fsl_mcdmafec.o mcfmii.o
 COBJS-$(CONFIG_FTMAC100) += ftmac100.o
drivers/net/ep93xx_eth.c new file +654 -0

654 lines not on this page · raw message

drivers/net/ep93xx_eth.h new file +144 -0

144 lines not on this page · raw message

include/common.h +5 -0
index f2a7067..c0dfc45 100644
@@ -123,6 +123,11 @@ typedef volatile unsigned char	vu_char;
 #define debugX(level,fmt,args...)
 #endif	/* DEBUG */
 
+#define error(fmt, args...) do {					\
+		printf("ERROR: " fmt "\nat %s:%d/%s()\n",		\
+			##args, __FILE__, __LINE__, __func__);		\
+} while (0)
+
 #ifndef BUG
 #define BUG() do { \
 	printf("BUG: failure at %s:%d/%s()!\n", __FILE__, __LINE__, __FUNCTION__); \
include/netdev.h +1 -0
index a9d5ec9..1e0484f 100644
@@ -49,6 +49,7 @@ int davinci_emac_initialize(void);
 int dnet_eth_initialize(int id, void *regs, unsigned int phy_addr);
 int e1000_initialize(bd_t *bis);
 int eepro100_initialize(bd_t *bis);
+int ep93xx_eth_initialize(u8 dev_num, int base_addr);
 int eth_3com_initialize (bd_t * bis);
 int fec_initialize (bd_t *bis);
 int fecmxc_initialize (bd_t *bis);
Signature · 1 line
1.6.3.1
#5 lore raw

PATCH 2/3 Add EP93xx ethernet driver

Hi Matthias,

Quoted 68 lines · Matthias Kaehlcke

Added ethernet driver for EP93xx SoCs

---
 drivers/net/Makefile     |    1 +
 drivers/net/ep93xx_eth.c |  654
++++++++++++++++++++++++++++++++++++++++++++++
 drivers/net/ep93xx_eth.h |  144 ++++++++++
 include/common.h         |    5 +
 include/netdev.h         |    1 +
 5 files changed, 805 insertions(+), 0 deletions(-)
 create mode 100644 drivers/net/ep93xx_eth.c
 create mode 100644 drivers/net/ep93xx_eth.h
drivers/net/Makefile +1 -0
index 904727e..dc3107c 100644
@@ -37,6 +37,7 @@ COBJS-$(CONFIG_DNET) += dnet.o
 COBJS-$(CONFIG_E1000) += e1000.o
 COBJS-$(CONFIG_EEPRO100) += eepro100.o
 COBJS-$(CONFIG_ENC28J60) += enc28j60.o
+COBJS-$(CONFIG_EP93XX) += ep93xx_eth.o
 COBJS-$(CONFIG_FEC_MXC) += fec_mxc.o
 COBJS-$(CONFIG_FSLDMAFEC) += fsl_mcdmafec.o mcfmii.o
 COBJS-$(CONFIG_FTMAC100) += ftmac100.o
drivers/net/ep93xx_eth.c new file +10 -0
new file mode 100644
index 0000000..33d14df
@@ -0,0 +1,654 @@
+/*
+ * Cirrus Logic EP93xx ethernet MAC / MII driver.
+ *
+ * Copyright (C) 2010, 2009
+ * Matthias Kaehlcke <[email protected]>
+ *
+ * Copyright (C) 2004, 2005
+ * Cory T. Tusar, Videon Central, Inc., <[email protected]>
+ *
+ * Based on the original eth.[ch] Cirrus Logic EP93xx Rev D. Ethernet

Driver,
+ * which is
+ *
+ * (C) Copyright 2002 2003
+ * Adam Bezanson, Network Audio Technologies, Inc.
+ * <[email protected]>
+ *
+ * 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.,
+ * 675 Mass Ave, Cambridge, MA 02139, USA.
+ */

drivers/net/ep93xx_eth.c new file +1 -0
+

drivers/net/ep93xx_eth.c line 43

Quoted 10 lines
drivers/net/ep93xx_eth.c new file +10 -0
+#include <command.h>
+#include <common.h>
+#include <asm/arch/ep93xx.h>
+#include <asm/io.h>
+#include <malloc.h>
+#include <miiphy.h>
+#include <linux/types.h>
+#include "ep93xx_eth.h"
+
+#define GET_PRIV(eth_dev)      ((struct ep93xx_priv *)eth_dev->priv)

You should probably have parens around "eth_dev", although problems would be found at compile time.

Quoted 10 lines
drivers/net/ep93xx_eth.c new file +5 -0
+#define GET_REGS(eth_dev)      (GET_PRIV(eth_dev)->regs)
+
+/* ep93xx_miiphy ops forward declarations */
+static int ep93xx_miiphy_read(char * const dev, unsigned char const addr,
+                       unsigned char const reg, unsigned short * const

value);

drivers/net/ep93xx_eth.c new file +2 -0
+static int ep93xx_miiphy_write(char * const dev, unsigned char const addr,
+                       unsigned char const reg, unsigned short const

value);

drivers/net/ep93xx_eth.c line 56

Quoted 6 lines
drivers/net/ep93xx_eth.c new file +6 -0
+
+#if defined(EP93XX_MAC_DEBUG)
+/**
+ * Dump ep93xx_mac values to the terminal.
+ */
+inline void dump_dev(struct eth_device *dev)

All of these local functions should be static. inline is probably pointless, especially since they're only compiled in when you're debugging.

drivers/net/ep93xx_eth.c line 62

Quoted 7 lines
drivers/net/ep93xx_eth.c new file +6 -0
+{
+       struct ep93xx_priv *priv = GET_PRIV(dev);
+       int i;
+
+       printf("\ndump_dev()\n");
+       printf("  rx_dq.base         %08X\n", (uint32_t)priv->rx_dq.base);

If these are pointers, why not use %p instead of all this casting?

Quoted 28 lines

+ printf(" rx_dq.current %08X\n",
(uint32_t)priv->rx_dq.current);

drivers/net/ep93xx_eth.c new file +3 -0
+       printf("  rx_dq.end          %08X\n", (uint32_t)priv->rx_dq.end);
+       printf("  rx_sq.base         %08X\n", (uint32_t)priv->rx_sq.base);
+       printf("  rx_sq.current      %08X\n",

(uint32_t)priv->rx_sq.current);

drivers/net/ep93xx_eth.c new file +8 -0
+       printf("  rx_sq.end          %08X\n", (uint32_t)priv->rx_sq.end);
+
+       for (i = 0; i < NUMRXDESC; i++)
+               printf("  rx_buffer[%2.d]      %08X\n", i,
+                       (uint32_t)NetRxPackets[i]);
+
+       printf("  tx_dq.base         %08X\n", (uint32_t)priv->tx_dq.base);
+       printf("  tx_dq.current      %08X\n",

(uint32_t)priv->tx_dq.current);

drivers/net/ep93xx_eth.c new file +3 -0
+       printf("  tx_dq.end          %08X\n", (uint32_t)priv->tx_dq.end);
+       printf("  tx_sq.base         %08X\n", (uint32_t)priv->tx_sq.base);
+       printf("  tx_sq.current      %08X\n",

(uint32_t)priv->tx_sq.current);

drivers/net/ep93xx_eth.c new file +8 -0
+       printf("  tx_sq.end          %08X\n", (uint32_t)priv->tx_sq.end);
+}
+
+/**
+ * Dump all RX status queue entries to the terminal.
+ */
+inline void dump_rx_status_queue(struct eth_device *dev)
+{

drivers/net/ep93xx_eth.c line 95

Quoted 10 lines
drivers/net/ep93xx_eth.c new file +10 -0
+       struct ep93xx_priv *priv = GET_PRIV(dev);
+       int i;
+
+       printf("\ndump_rx_status_queue()\n");
+       printf("  descriptor address     word1           word2\n");
+       for (i = 0; i < NUMRXDESC; i++) {
+               printf("  [ %08X ]           %08X        %08X\n",
+                       (uint32_t)(priv->rx_sq.base + i),
+                       (uint32_t)(priv->rx_sq.base + i)->word1,
+                       (uint32_t)(priv->rx_sq.base + i)->word2);

word1 and word2 are defined as uint32_t, so no cast required.

Quoted 329 lines
drivers/net/ep93xx_eth.c new file +154 -0
+       }
+}
+
+/**
+ * Dump all RX descriptor queue entries to the terminal.
+ */
+inline void dump_rx_descriptor_queue(struct eth_device *dev)
+{
+       struct ep93xx_priv *priv = GET_PRIV(dev);
+       int i;
+
+       printf("\ndump_rx_descriptor_queue()\n");
+       printf("  descriptor address     word1           word2\n");
+       for (i = 0; i < NUMRXDESC; i++) {
+               printf("  [ %08X ]           %08X        %08X\n",
+                       (uint32_t)(priv->rx_dq.base + i),
+                       (uint32_t)(priv->rx_dq.base + i)->word1,
+                       (uint32_t)(priv->rx_dq.base + i)->word2);
+       }
+}
+
+/**
+ * Dump all TX descriptor queue entries to the terminal.
+ */
+inline void dump_tx_descriptor_queue(struct eth_device *dev)
+{
+       struct ep93xx_priv *priv = GET_PRIV(dev);
+       int i;
+
+       printf("\ndump_tx_descriptor_queue()\n");
+       printf("  descriptor address     word1           word2\n");
+       for (i = 0; i < NUMTXDESC; i++) {
+               printf("  [ %08X ]           %08X        %08X\n",
+                       (uint32_t)(priv->tx_dq.base + i),
+                       (uint32_t)(priv->tx_dq.base + i)->word1,
+                       (uint32_t)(priv->tx_dq.base + i)->word2);
+       }
+}
+
+/**
+ * Dump all TX status queue entries to the terminal.
+ */
+inline void dump_tx_status_queue(struct eth_device *dev)
+{
+       struct ep93xx_priv *priv = GET_PRIV(dev);
+       int i;
+
+       printf("\ndump_tx_status_queue()\n");
+       printf("  descriptor address     word1\n");
+       for (i = 0; i < NUMTXDESC; i++) {
+               printf("  [ %08X ]           %08X\n",
+                       (uint32_t)(priv->rx_sq.base + i),
+                       (uint32_t)(priv->rx_sq.base + i)->word1);
+       }
+}
+#else
+#define dump_dev(x)
+#define dump_rx_descriptor_queue(x)
+#define dump_rx_status_queue(x)
+#define dump_tx_descriptor_queue(x)
+#define dump_tx_status_queue(x)
+#endif /* defined(EP93XX_MAC_DEBUG) */
+
+/**
+ * Reset the EP93xx MAC by twiddling the soft reset bit and spinning until
+ * it's cleared.
+ */
+static void ep93xx_mac_reset(struct eth_device *dev)
+{
+       struct mac_regs *mac = GET_REGS(dev);
+       uint32_t value;
+
+       debug("+ep93xx_mac_reset");
+
+       value = readl(&mac->selfctl);
+       value |= SELFCTL_RESET;
+       writel(value, &mac->selfctl);
+
+       while (readl(&mac->selfctl) & SELFCTL_RESET)
+               ; /* noop */
+
+       debug("-ep93xx_mac_reset");
+}
+
+/* Eth device open */
+static int ep93xx_eth_open(struct eth_device *dev, bd_t *bd)
+{
+       struct ep93xx_priv *priv = GET_PRIV(dev);
+       struct mac_regs *mac = GET_REGS(dev);
+       uchar *mac_addr = dev->enetaddr;
+       int i;
+
+       debug("+ep93xx_eth_open");
+
+       /* Reset the MAC */
+       ep93xx_mac_reset(dev);
+
+       /* Reset the descriptor queues' current and end address values */
+       priv->tx_dq.current = priv->tx_dq.base;
+       priv->tx_dq.end = (priv->tx_dq.base + NUMTXDESC);
+
+       priv->tx_sq.current = priv->tx_sq.base;
+       priv->tx_sq.end = (priv->tx_sq.base + NUMTXDESC);
+
+       priv->rx_dq.current = priv->rx_dq.base;
+       priv->rx_dq.end = (priv->rx_dq.base + NUMRXDESC);
+
+       priv->rx_sq.current = priv->rx_sq.base;
+       priv->rx_sq.end = (priv->rx_sq.base + NUMRXDESC);
+
+       /*
+        * Set the transmit descriptor and status queues' base address,
+        * current address, and length registers.  Set the maximum frame
+        * length and threshold. Enable the transmit descriptor processor.
+        */
+       writel((uint32_t)priv->tx_dq.base, &mac->txdq.badd);
+       writel((uint32_t)priv->tx_dq.base, &mac->txdq.curadd);
+       writel(sizeof(struct tx_descriptor) * NUMTXDESC, &mac->txdq.blen);
+
+       writel((uint32_t)priv->tx_sq.base, &mac->txstsq.badd);
+       writel((uint32_t)priv->tx_sq.base, &mac->txstsq.curadd);
+       writel(sizeof(struct tx_status) * NUMTXDESC, &mac->txstsq.blen);
+
+       writel(0x00040000, &mac->txdthrshld);
+       writel(0x00040000, &mac->txststhrshld);
+
+       writel((TXSTARTMAX << 0) | (PKTSIZE_ALIGN << 16), &mac->maxfrmlen);
+       writel(BMCTL_TXEN, &mac->bmctl);
+
+       /*
+        * Set the receive descriptor and status queues' base address,
+        * current address, and length registers.  Enable the receive
+        * descriptor processor.
+        */
+       writel((uint32_t)priv->rx_dq.base, &mac->rxdq.badd);
+       writel((uint32_t)priv->rx_dq.base, &mac->rxdq.curadd);
+       writel(sizeof(struct rx_descriptor) * NUMRXDESC, &mac->rxdq.blen);
+
+       writel((uint32_t)priv->rx_sq.base, &mac->rxstsq.badd);
+       writel((uint32_t)priv->rx_sq.base, &mac->rxstsq.curadd);
+       writel(sizeof(struct rx_status) * NUMRXDESC, &mac->rxstsq.blen);
+
+       writel(0x00040000, &mac->rxdthrshld);
+
+       writel(BMCTL_RXEN, &mac->bmctl);
+
+       writel(0x00040000, &mac->rxststhrshld);
+
+       /* Wait until the receive descriptor processor is active */
+       while (!(readl(&mac->bmsts) & BMSTS_RXACT))
+               ; /* noop */
+
+       /*
+        * Initialize the RX descriptor queue. Clear the TX descriptor

queue.

drivers/net/ep93xx_eth.c new file +87 -0
+        * Clear the RX and TX status queues. Enqueue the RX descriptor and
+        * status entries to the MAC.
+        */
+       for (i = 0; i < NUMRXDESC; i++) {
+               /* set buffer address */
+               (priv->rx_dq.base + i)->word1 = (uint32_t)NetRxPackets[i];
+
+               /* set buffer length, clear buffer index and NSOF */
+               (priv->rx_dq.base + i)->word2 = PKTSIZE_ALIGN;
+       }
+
+       memset(priv->tx_dq.base, 0,
+               (sizeof(struct tx_descriptor) * NUMTXDESC));
+       memset(priv->rx_sq.base, 0,
+               (sizeof(struct rx_status) * NUMRXDESC));
+       memset(priv->tx_sq.base, 0,
+               (sizeof(struct tx_status) * NUMTXDESC));
+
+       writel(NUMRXDESC, &mac->rxdqenq);
+       writel(NUMRXDESC, &mac->rxstsqenq);
+
+       /* Set the primary MAC address */
+       writel(AFP_IAPRIMARY, &mac->afp);
+       writel(mac_addr[0] | (mac_addr[1] << 8) |
+               (mac_addr[2] << 16) | (mac_addr[3] << 24),
+               &mac->indad);
+       writel(mac_addr[4] | (mac_addr[5] << 8), &mac->indad_upper);
+
+       /* Turn on RX and TX */
+       writel(RXCTL_IA0 | RXCTL_BA | RXCTL_SRXON |
+               RXCTL_RCRCA | RXCTL_MA, &mac->rxctl);
+       writel(TXCTL_STXON, &mac->txctl);
+
+       /* Dump data structures if we're debugging */
+       dump_dev(dev);
+       dump_rx_descriptor_queue(dev);
+       dump_rx_status_queue(dev);
+       dump_tx_descriptor_queue(dev);
+       dump_tx_status_queue(dev);
+
+       debug("-ep93xx_eth_open");
+
+       return 1;
+}
+
+/**
+ * Halt EP93xx MAC transmit and receive by clearing the TxCTL and RxCTL
+ * registers.
+ */
+static void ep93xx_eth_close(struct eth_device *dev)
+{
+       struct mac_regs *mac = GET_REGS(dev);
+
+       debug("+ep93xx_eth_close");
+
+       writel(0x00000000, &mac->rxctl);
+       writel(0x00000000, &mac->txctl);
+
+       debug("-ep93xx_eth_close");
+}
+
+/**
+ * Copy a frame of data from the MAC into the protocol layer for further
+ * processing.
+ */
+static int ep93xx_eth_rcv_packet(struct eth_device *dev)
+{
+       struct mac_regs *mac = GET_REGS(dev);
+       struct ep93xx_priv *priv = GET_PRIV(dev);
+       int len = -1;
+
+       debug("+ep93xx_eth_rcv_packet");
+
+       if (RX_STATUS_RFP(priv->rx_sq.current)) {
+               if (RX_STATUS_RWE(priv->rx_sq.current)) {
+                       /*
+                        * We have a good frame. Extract the frame's length
+                        * from the current rx_status_queue entry, and copy
+                        * the frame's data into NetRxPackets[] of the
+                        * protocol stack. We track the total number of
+                        * bytes in the frame (nbytes_frame) which will be
+                        * used when we pass the data off to the protocol
+                        * layer via NetReceive().
+                        */
+                       len = RX_STATUS_FRAME_LEN(priv->rx_sq.current);
+
+                       NetReceive((uchar *)priv->rx_dq.current->word1,

len);

drivers/net/ep93xx_eth.c new file +48 -0
+
+                       debug("reporting %d bytes...\n", len);
+               } else {
+                       /* Do we have an erroneous packet? */
+                       error("packet rx error, status %08X %08X",
+                               priv->rx_sq.current->word1,
+                               priv->rx_sq.current->word2);
+                       dump_rx_descriptor_queue(dev);
+                       dump_rx_status_queue(dev);
+               }
+
+               /*
+                * Clear the associated status queue entry, and
+                * increment our current pointers to the next RX
+                * descriptor and status queue entries (making sure
+                * we wrap properly).
+                */
+               memset((void *)priv->rx_sq.current, 0,
+                       sizeof(struct rx_status));
+
+               priv->rx_sq.current++;
+               if (priv->rx_sq.current >= priv->rx_sq.end)
+                       priv->rx_sq.current = priv->rx_sq.base;
+
+               priv->rx_dq.current++;
+               if (priv->rx_dq.current >= priv->rx_dq.end)
+                       priv->rx_dq.current = priv->rx_dq.base;
+
+               /*
+                * Finally, return the RX descriptor and status entries
+                * back to the MAC engine, and loop again, checking for
+                * more descriptors to process.
+                */
+               writel(1, &mac->rxdqenq);
+               writel(1, &mac->rxstsqenq);
+       } else {
+               len = 0;
+       }
+
+       debug("-ep93xx_eth_rcv_packet %d", len);
+       return len;
+}
+
+/**
+ * Send a block of data via ethernet.
+ */
+static int ep93xx_eth_send_packet(struct eth_device *dev,
+                               volatile void * const packet, int const

length)

drivers/net/ep93xx_eth.c new file +36 -0
+{
+       struct mac_regs *mac = GET_REGS(dev);
+       struct ep93xx_priv *priv = GET_PRIV(dev);
+       int ret = -1;
+
+       debug("+ep93xx_eth_send_packet");
+
+       /* Parameter check */
+       BUG_ON(packet == NULL);
+
+       /*
+        * Initialize the TX descriptor queue with the new packet's info.
+        * Clear the associated status queue entry. Enqueue the packet
+        * to the MAC for transmission.
+        */
+
+       /* set buffer address */
+       priv->tx_dq.current->word1 = (uint32_t)packet;
+
+       /* set buffer length and EOF bit */
+       priv->tx_dq.current->word2 = length | TX_DESC_EOF;
+
+       /* clear tx status */
+       priv->tx_sq.current->word1 = 0;
+
+       /* enqueue the TX descriptor */
+       writel(1, &mac->txdqenq);
+
+       /* wait for the frame to become processed */
+       while (!TX_STATUS_TXFP(priv->tx_sq.current))
+               ; /* noop */
+
+       if (!TX_STATUS_TXWE(priv->tx_sq.current)) {
+               error("packet tx error, status %08X",
+                       priv->tx_sq.current->word1);
+               dump_tx_descriptor_queue(dev);

drivers/net/ep93xx_eth.c line 430

Quoted 10 lines
drivers/net/ep93xx_eth.c new file +10 -0
+               dump_tx_status_queue(dev);
+
+               /* TODO: Add better error handling? */
+               goto eth_send_failed_0;
+       }
+
+       ret = 0;
+       /* Fall through */
+
+eth_send_failed_0:

Strange label here. This isn't just a fail path.

Quoted 77 lines
drivers/net/ep93xx_eth.c new file +8 -0
+       debug("-ep93xx_eth_send_packet %d", ret);
+       return ret;
+}
+
+#if defined(CONFIG_MII)
+int ep93xx_miiphy_initialize(bd_t * const bd)
+{
+       miiphy_register("ep93xx_eth0", ep93xx_miiphy_read,

ep93xx_miiphy_write);

drivers/net/ep93xx_eth.c new file +7 -0
+       return 0;
+}
+#endif
+
+/**
+ * Initialize the EP93xx MAC.  The MAC hardware is reset.  Buffers are
+ * allocated, if necessary, for the TX and RX descriptor and status

queues,
+ * as well as for received packets. The EP93XX MAC hardware is initialized.
+ * Transmit and receive operations are enabled.
+ */

drivers/net/ep93xx_eth.c new file +55 -0
+int ep93xx_eth_initialize(u8 dev_num, int base_addr)
+{
+       int ret = -1;
+       struct eth_device *dev;
+       struct ep93xx_priv *priv;
+
+       debug("+ep93xx_eth_initialize");
+
+       priv = malloc(sizeof(*priv));
+       if (!priv) {
+               error("malloc() failed");
+               goto eth_init_failed_0;
+       }
+       memset(priv, 0, sizeof(*priv));
+
+       priv->regs = (struct mac_regs *)base_addr;
+
+       priv->tx_dq.base = calloc(NUMTXDESC,
+                               sizeof(struct tx_descriptor));
+       if (priv->tx_dq.base == NULL) {
+               error("calloc() failed");
+               goto eth_init_failed_1;
+       }
+
+       priv->tx_sq.base = calloc(NUMTXDESC,
+                               sizeof(struct tx_status));
+       if (priv->tx_sq.base == NULL) {
+               error("calloc() failed");
+               goto eth_init_failed_2;
+       }
+
+       priv->rx_dq.base = calloc(NUMRXDESC,
+                               sizeof(struct rx_descriptor));
+       if (priv->rx_dq.base == NULL) {
+               error("calloc() failed");
+               goto eth_init_failed_3;
+       }
+
+       priv->rx_sq.base = calloc(NUMRXDESC,
+                               sizeof(struct rx_status));
+       if (priv->rx_sq.base == NULL) {
+               error("calloc() failed");
+               goto eth_init_failed_4;
+       }
+
+       dev = malloc(sizeof *dev);
+       if (dev == NULL) {
+               error("malloc() failed");
+               goto eth_init_failed_5;
+       }
+       memset(dev, 0, sizeof *dev);
+
+       dev->iobase = base_addr;
+       dev->priv = priv;
+       dev->init = ep93xx_eth_open;

drivers/net/ep93xx_eth.c line 513

Quoted 10 lines
drivers/net/ep93xx_eth.c new file +10 -0
+       dev->halt = ep93xx_eth_close;
+       dev->send = ep93xx_eth_send_packet;
+       dev->recv = ep93xx_eth_rcv_packet;
+
+       sprintf(dev->name, "ep93xx_eth-%hu", dev_num);
+
+       eth_register(dev);
+
+       /* Done! */
+       ret = 0;

Remember, -1 means critical error, 0 means non-critical error and >0 means # of devices initialized. I expect you want this to be '1'.

Quoted 169 lines
drivers/net/ep93xx_eth.c new file +47 -0
+       goto eth_init_done;
+
+eth_init_failed_5:
+       free(priv->rx_sq.base);
+       /* Fall through */
+
+eth_init_failed_4:
+       free(priv->rx_dq.base);
+       /* Fall through */
+
+eth_init_failed_3:
+       free(priv->tx_sq.base);
+       /* Fall through */
+
+eth_init_failed_2:
+       free(priv->tx_dq.base);
+       /* Fall through */
+
+eth_init_failed_1:
+       free(priv);
+       /* Fall through */
+
+eth_init_failed_0:
+       /* Fall through */
+
+eth_init_done:
+       debug("-ep93xx_eth_initialize %d", ret);
+       return ret;
+}
+
+#if defined(CONFIG_MII)
+
+/**
+ * Maximum MII address we support
+ */
+#define MII_ADDRESS_MAX                        31
+
+/**
+ * Maximum MII register address we support
+ */
+#define MII_REGISTER_MAX               31
+
+/**
+ * Read a 16-bit value from an MII register.
+ */
+static int ep93xx_miiphy_read(char * const dev, unsigned char const addr,
+                       unsigned char const reg, unsigned short * const

value)

drivers/net/ep93xx_eth.c new file +52 -0
+{
+       struct mac_regs *mac = (struct mac_regs *)MAC_BASE;
+       int ret = -1;
+       uint32_t self_ctl;
+
+       debug("+ep93xx_miiphy_read");
+
+       /* Parameter checks */
+       BUG_ON(dev == NULL);
+       BUG_ON(addr > MII_ADDRESS_MAX);
+       BUG_ON(reg > MII_REGISTER_MAX);
+       BUG_ON(value == NULL);
+
+       /*
+        * Save the current SelfCTL register value.  Set MAC to suppress
+        * preamble bits.  Wait for any previous MII command to complete
+        * before issuing the new command.
+        */
+       self_ctl = readl(&mac->selfctl);
+#if defined(CONFIG_MII_SUPPRESS_PREAMBLE)
+       writel(self_ctl & ~(1 << 8), &mac->selfctl);
+#endif /* defined(CONFIG_MII_SUPPRESS_PREAMBLE) */
+
+       while (readl(&mac->miists) & MIISTS_BUSY)
+               ; /* noop */
+
+       /*
+        * Issue the MII 'read' command.  Wait for the command to complete.
+        * Read the MII data value.
+        */
+       writel(MIICMD_OPCODE_READ | ((uint32_t)addr << 5) | (uint32_t)reg,
+               &mac->miicmd);
+       while (readl(&mac->miists) & MIISTS_BUSY)
+               ; /* noop */
+
+       *value = (unsigned short)readl(&mac->miidata);
+
+       /* Restore the saved SelfCTL value and return. */
+       writel(self_ctl, &mac->selfctl);
+
+       ret = 0;
+       /* Fall through */
+
+       debug("-ep93xx_miiphy_read");
+       return ret;
+}
+
+/**
+ * Write a 16-bit value to an MII register.
+ */
+static int ep93xx_miiphy_write(char * const dev, unsigned char const addr,
+                       unsigned char const reg, unsigned short const

value)

drivers/net/ep93xx_eth.c new file +26 -0
+{
+       struct mac_regs *mac = (struct mac_regs *)MAC_BASE;
+       int ret = -1;
+       uint32_t self_ctl;
+
+       debug("+ep93xx_miiphy_write");
+
+       /* Parameter checks */
+       BUG_ON(dev == NULL);
+       BUG_ON(addr > MII_ADDRESS_MAX);
+       BUG_ON(reg > MII_REGISTER_MAX);
+
+       /*
+        * Save the current SelfCTL register value.  Set MAC to suppress
+        * preamble bits.  Wait for any previous MII command to complete
+        * before issuing the new command.
+        */
+       self_ctl = readl(&mac->selfctl);
+#if defined(CONFIG_MII_SUPPRESS_PREAMBLE)
+       writel(self_ctl & ~(1 << 8), &mac->selfctl);
+#endif /* defined(CONFIG_MII_SUPPRESS_PREAMBLE) */
+
+       while (readl(&mac->miists) & MIISTS_BUSY)
+               ; /* noop */
+
+       /* Issue the MII 'write' command.  Wait for the command to

complete. */

drivers/net/ep93xx_eth.c new file +16 -0
+       writel((uint32_t)value, &mac->miidata);
+       writel(MIICMD_OPCODE_WRITE | ((uint32_t)addr << 5) | (uint32_t)reg,
+               &mac->miicmd);
+       while (readl(&mac->miists) & MIISTS_BUSY)
+               ; /* noop */
+
+       /* Restore the saved SelfCTL value and return. */
+       writel(self_ctl, &mac->selfctl);
+
+       ret = 0;
+       /* Fall through */
+
+       debug("-ep93xx_miiphy_write");
+       return ret;
+}
+#endif /* defined(CONFIG_MII) */
drivers/net/ep93xx_eth.h new file +18 -0
new file mode 100644
index 0000000..5f7bf13
@@ -0,0 +1,144 @@
+/*
+ * Copyright (C) 2009 Matthias Kaehlcke <[email protected]>
+ *
+ * Copyright (C) 2004, 2005
+ * Cory T. Tusar, Videon Central, Inc., <[email protected]>
+ *
+ * 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.

drivers/net/ep93xx_eth.h line 28

Quoted 10 lines
drivers/net/ep93xx_eth.h new file +10 -0
+ *
+ * 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
+ *
+ */
+
+#ifndef _ETH_H
+#define _ETH_H

This should have a more specific namespace

Quoted 140 lines
drivers/net/ep93xx_eth.h new file +5 -0
+
+#include <net.h>
+
+/**
+ * #define this to dump device status and queue info during initialization

and
+ * following errors.
+ */

drivers/net/ep93xx_eth.h new file +109 -0
+#undef EP93XX_MAC_DEBUG
+
+/**
+ * Number of descriptor and status entries in our RX queues.
+ * It must be power of 2 !
+ */
+#define NUMRXDESC              PKTBUFSRX
+
+/**
+ * Number of descriptor and status entries in our TX queues.
+ */
+#define NUMTXDESC              1
+
+/**
+ * 944 = (1024 - 64) - 16, Fifo size - Minframesize - 16 (Chip FACT)
+ */
+#define TXSTARTMAX             944
+
+/**
+ * Receive descriptor queue entry
+ */
+struct rx_descriptor {
+       uint32_t word1;
+       uint32_t word2;
+};
+
+/**
+ * Receive status queue entry
+ */
+struct rx_status {
+       uint32_t word1;
+       uint32_t word2;
+};
+
+#define RX_STATUS_RWE(rx_status) ((rx_status->word1 >> 30) & 0x01)
+#define RX_STATUS_RFP(rx_status) ((rx_status->word1 >> 31) & 0x01)
+#define RX_STATUS_FRAME_LEN(rx_status) (rx_status->word2 & 0xFFFF)
+
+/**
+ * Transmit descriptor queue entry
+ */
+struct tx_descriptor {
+       uint32_t word1;
+       uint32_t word2;
+};
+
+#define TX_DESC_EOF (1 << 31)
+
+/**
+ * Transmit status queue entry
+ */
+struct tx_status {
+       uint32_t word1;
+};
+
+#define TX_STATUS_TXWE(tx_status) (((tx_status)->word1 >> 30) & 0x01)
+#define TX_STATUS_TXFP(tx_status) (((tx_status)->word1 >> 31) & 0x01)
+
+/**
+ * Transmit descriptor queue
+ */
+struct tx_descriptor_queue {
+       struct tx_descriptor *base;
+       struct tx_descriptor *current;
+       struct tx_descriptor *end;
+};
+
+/**
+ * Transmit status queue
+ */
+struct tx_status_queue {
+       struct tx_status *base;
+       volatile struct tx_status *current;
+       struct tx_status *end;
+};
+
+/**
+ * Receive descriptor queue
+ */
+struct rx_descriptor_queue {
+       struct rx_descriptor *base;
+       struct rx_descriptor *current;
+       struct rx_descriptor *end;
+};
+
+/**
+ * Receive status queue
+ */
+struct rx_status_queue {
+       struct rx_status *base;
+       volatile struct rx_status *current;
+       struct rx_status *end;
+};
+
+/**
+ * EP93xx MAC private data structure
+ */
+struct ep93xx_priv {
+       struct rx_descriptor_queue      rx_dq;
+       struct rx_status_queue          rx_sq;
+       void                            *rx_buffer[NUMRXDESC];
+
+       struct tx_descriptor_queue      tx_dq;
+       struct tx_status_queue          tx_sq;
+
+       struct mac_regs                 *regs;
+};
+
+#endif
include/common.h +5 -0
index f2a7067..c0dfc45 100644
@@ -123,6 +123,11 @@ typedef volatile unsigned char     vu_char;
 #define debugX(level,fmt,args...)
 #endif /* DEBUG */
 
+#define error(fmt, args...) do {                                       \
+               printf("ERROR: " fmt "\nat %s:%d/%s()\n",               \
+                       ##args, __FILE__, __LINE__, __func__);          \
+} while (0)
+
 #ifndef BUG
 #define BUG() do { \
       printf("BUG: failure at %s:%d/%s()!\n", __FILE__, __LINE__,

__FUNCTION__); \

include/netdev.h +0 -0
index a9d5ec9..1e0484f 100644

include/netdev.h int davinci_emac_initialize(void); · line 55

Quoted 7 lines
include/netdev.h +1 -0
@@ -49,6 +49,7 @@ int davinci_emac_initialize(void);
 int dnet_eth_initialize(int id, void *regs, unsigned int phy_addr);
 int e1000_initialize(bd_t *bis);
 int eepro100_initialize(bd_t *bis);
+int ep93xx_eth_initialize(u8 dev_num, int base_addr);
 int eth_3com_initialize (bd_t * bis);
 int fec_initialize (bd_t *bis);
 int fecmxc_initialize (bd_t *bis);

regards,
Ben

#6 lore raw

PATCH 3/3 Add support for EDB93xx boards

In reply to a message not in the archive

Added support for the following EDB93xx boards:

EDB9301
EDB9302
EDB9302A
EDB9307
EDB9307A
EDB93012
EDB9315
EDB9315A

---
 MAINTAINERS                  |   10 ++
 MAKEALL                      |    8 ++
 Makefile                     |   10 ++
 board/edb93xx/Makefile       |   50 ++++++++
 board/edb93xx/config.mk      |   33 +++++
 board/edb93xx/early_udelay.h |   34 +++++
 board/edb93xx/edb93xx.c      |  109 +++++++++++++++++
 board/edb93xx/flash_cfg.c    |   38 ++++++
 board/edb93xx/pll_cfg.c      |   58 +++++++++
 board/edb93xx/pll_cfg.h      |   72 +++++++++++
 board/edb93xx/sdram_cfg.c    |  117 ++++++++++++++++++
 board/edb93xx/sdram_cfg.h    |  144 ++++++++++++++++++++++
 include/configs/edb93xx.h    |  273 ++++++++++++++++++++++++++++++++++++++++++
 13 files changed, 956 insertions(+), 0 deletions(-)
 create mode 100644 board/edb93xx/Makefile
 create mode 100644 board/edb93xx/config.mk
 create mode 100644 board/edb93xx/early_udelay.h
 create mode 100644 board/edb93xx/edb93xx.c
 create mode 100644 board/edb93xx/flash_cfg.c
 create mode 100644 board/edb93xx/pll_cfg.c
 create mode 100644 board/edb93xx/pll_cfg.h
 create mode 100644 board/edb93xx/sdram_cfg.c
 create mode 100644 board/edb93xx/sdram_cfg.h
 create mode 100644 include/configs/edb93xx.h
MAINTAINERS +10 -0
index 3879fde..23523f3 100644
@@ -598,6 +598,16 @@ Gary Jennejohn <[email protected]>
 	smdk2400	ARM920T
 	trab		ARM920T
 
+Matthias Kaehlcke <[email protected]>
+	edb9301			ARM920T (EP9301)
+	edb9302			ARM920T (EP9302)
+	edb9302a		ARM920T (EP9302)
+	edb9307			ARM920T (EP9307)
+	edb9307a		ARM920T (EP9307)
+	edb9312			ARM920T (EP9312)
+	edb9315			ARM920T (EP9315)
+	edb9315a		ARM920T (EP9315)
+
 Konstantin Kletschke <[email protected]>
 	scb9328		ARM920T
 
MAKEALL +8 -0
index dd635bd..c3ef638 100755
@@ -554,6 +554,14 @@ LIST_ARM9="			\
 	cp946es			\
 	cp966			\
 	da830evm		\
+	edb9301			\
+	edb9302			\
+	edb9302a		\
+	edb9307			\
+	edb9307a 		\
+	edb9312			\
+	edb9315			\
+	edb9315a		\
 	imx27lite		\
 	lpd7a400		\
 	mv88f6281gtw_ge		\
Makefile +10 -0
index 793fcec..a1db2f9 100644
@@ -2404,6 +2404,16 @@ caddy2_config \
 vme8349_config:		unconfig
 	@$(MKCONFIG) -t $(@:_config=) vme8349 ppc mpc83xx vme8349 esd
 
+edb9301_config \
+edb9302_config \
+edb9302a_config \
+edb9307_config \
+edb9307a_config \
+edb9312_config \
+edb9315_config \
+edb9315a_config: unconfig
+	@$(MKCONFIG) -t $(@:_config=) edb93xx arm arm920t edb93xx NULL ep93xx
+
 #########################################################################
 ## MPC85xx Systems
 #########################################################################
board/edb93xx/Makefile new file +50 -0

50 lines not on this page · raw message

board/edb93xx/config.mk new file +33 -0
new file mode 100644
index 0000000..b2fc6fa
@@ -0,0 +1,33 @@
+LDSCRIPT := $(SRCTREE)/cpu/arm920t/ep93xx/u-boot.lds
+
+ifdef CONFIG_EDB9301
+TEXT_BASE = 0x05700000
+endif
+
+ifdef CONFIG_EDB9302
+TEXT_BASE = 0x05700000
+endif
+
+ifdef CONFIG_EDB9302A
+TEXT_BASE = 0xc5700000
+endif
+
+ifdef CONFIG_EDB9307
+TEXT_BASE = 0x01f00000
+endif
+
+ifdef CONFIG_EDB9307A
+TEXT_BASE = 0xc1f00000
+endif
+
+ifdef CONFIG_EDB9312
+TEXT_BASE = 0x01f00000
+endif
+
+ifdef CONFIG_EDB9315
+TEXT_BASE = 0x01f00000
+endif
+
+ifdef CONFIG_EDB9315A
+TEXT_BASE = 0xc1f00000
+endif
board/edb93xx/early_udelay.h new file +34 -0
new file mode 100644
index 0000000..3b26b3f
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2009 Matthias Kaehlcke <[email protected]>
+ *
+ * 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
+ */
+
+#include <common.h>
+
+/* delay execution before timers are initialized */
+static inline void early_udelay(uint32_t usecs)
+{
+	/* loop takes 4 cycles at 5.0ns (fastest case, running at 200MHz) */
+	register uint32_t loops = (usecs * 1000) / 20;
+
+	__asm__ volatile ("1:\n"
+			"subs %0, %1, #1\n"
+			"bne 1b":"=r" (loops):"0" (loops));
+}
board/edb93xx/edb93xx.c new file +109 -0

109 lines not on this page · raw message

board/edb93xx/flash_cfg.c new file +38 -0
new file mode 100644
index 0000000..24ea210
@@ -0,0 +1,38 @@
+/*
+ * Flash setup for Cirrus edb93xx boards
+ *
+ * Copyright (C) 2009 Matthias Kaehlcke <[email protected]>
+ *
+ * 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
+ */
+
+#include <common.h>
+#include <asm/arch/ep93xx.h>
+#include <asm/io.h>
+
+#define SMC_BCR6_VALUE	(2 << SMC_BCR_IDCY_SHIFT | 5 << SMC_BCR_WST1_SHIFT | \
+				SMC_BCR_BLE | 2 << SMC_BCR_WST2_SHIFT | \
+				1 << SMC_BCR_MW_SHIFT)
+
+void flash_cfg(void)
+{
+	struct smc_regs *smc = (struct smc_regs *)SMC_BASE;
+
+	writel(SMC_BCR6_VALUE, &smc->bcr6);
+}
board/edb93xx/pll_cfg.c new file +58 -0

58 lines not on this page · raw message

board/edb93xx/pll_cfg.h new file +72 -0

72 lines not on this page · raw message

board/edb93xx/sdram_cfg.c new file +117 -0

117 lines not on this page · raw message

board/edb93xx/sdram_cfg.h new file +144 -0

144 lines not on this page · raw message

include/configs/edb93xx.h new file +273 -0

273 lines not on this page · raw message

Signature · 1 line
1.6.3.1
#7 lore raw

PATCH 3/3 Add support for EDB93xx boards

Quoted 38 lines · Matthias Kaehlcke

Added support for the following EDB93xx boards:

EDB9301
EDB9302
EDB9302A
EDB9307
EDB9307A
EDB93012
EDB9315
EDB9315A

---
 MAINTAINERS                  |   10 ++
 MAKEALL                      |    8 ++
 Makefile                     |   10 ++
 board/edb93xx/Makefile       |   50 ++++++++
 board/edb93xx/config.mk      |   33 +++++
 board/edb93xx/early_udelay.h |   34 +++++
 board/edb93xx/edb93xx.c      |  109 +++++++++++++++++
 board/edb93xx/flash_cfg.c    |   38 ++++++
 board/edb93xx/pll_cfg.c      |   58 +++++++++
 board/edb93xx/pll_cfg.h      |   72 +++++++++++
 board/edb93xx/sdram_cfg.c    |  117 ++++++++++++++++++
 board/edb93xx/sdram_cfg.h    |  144 ++++++++++++++++++++++
 include/configs/edb93xx.h    |  273 ++++++++++++++++++++++++++++++++++++++++++
 13 files changed, 956 insertions(+), 0 deletions(-)
 create mode 100644 board/edb93xx/Makefile
 create mode 100644 board/edb93xx/config.mk
 create mode 100644 board/edb93xx/early_udelay.h
 create mode 100644 board/edb93xx/edb93xx.c
 create mode 100644 board/edb93xx/flash_cfg.c
 create mode 100644 board/edb93xx/pll_cfg.c
 create mode 100644 board/edb93xx/pll_cfg.h
 create mode 100644 board/edb93xx/sdram_cfg.c
 create mode 100644 board/edb93xx/sdram_cfg.h
 create mode 100644 include/configs/edb93xx.h

<snip>

MAKEALL LIST_ARM9=" \ · line 561

Quoted 11 lines
MAKEALL +5 -0
@@ -554,6 +554,14 @@ LIST_ARM9="			\
 	cp946es			\
 	cp966			\
 	da830evm		\
+	edb9301			\
+	edb9302			\
+	edb9302a		\
+	edb9307			\
+	edb9307a 		\

ws trailing space

Quoted 3 lines
MAKEALL +3 -0
+	edb9312			\
+	edb9315			\
+	edb9315a		\

<snip>

Quoted 13 lines
MAKEALL +13 -0
+
+int dram_init(void)
+{
+	unsigned int *src, *dst;
+	int i;
+
+	for (i = 0; i < CONFIG_NR_DRAM_BANKS; i++) {
+		const ulong bank_size = get_ram_size((long *)bank_addr[i],
+						MAX_BANK_SIZE);
+		if (bank_size) {
+			gd->bd->bi_dram[i].start = bank_addr[i];
+			gd->bd->bi_dram[i].size = bank_size;
+		}

MAKEALL

Quoted 10 lines
MAKEALL +10 -0
+	}
+
+	/* copy exception vectors */
+	src = (unsigned int *)_armboot_start;
+
+#ifdef CONFIG_EDB93XX_SDCS3
+	dst = (unsigned int *)0x00000000;
+#else
+	dst = (unsigned int *)0xc0000000;
+#endif

This could be reduced to
dst = (unsigned int *)PHYS_SDRAM_1;

Quoted 4 lines
MAKEALL +4 -0
+	memcpy(dst, src, 16 * sizeof(unsigned int));
+
+	return 0;
+}

<snip>

Quoted 34 lines
board/edb93xx/pll_cfg.h new file +31 -0
@@ -0,0 +1,72 @@
+/*
+ * PLL register values for Cirrus edb93xx boards
+ *
+ * Copyright (C) 2009 Matthias Kaehlcke <[email protected]>
+ *
+ * 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
+ */
+
+#include <config.h>
+#include <asm/arch/ep93xx.h>
+
+#if defined(CONFIG_EDB9301) || defined(CONFIG_EDB9302) || \
+	defined(CONFIG_EDB9302A)
+/*
+ * fclk_div: 2, nbyp1: 1, hclk_div: 5, pclk_div: 2

board/edb93xx/pll_cfg.h line 41

Quoted 10 lines
board/edb93xx/pll_cfg.h new file +10 -0
+ * pll1_x1: 294912000.000000, pll1_x2ip: 36864000.000000,
+ * pll1_x2: 331776000.000000, pll1_out: 331776000.000000
+ */
+#define CLKSET1_VAL	(7 << SYSCON_CLKSET_PLL_X2IPD_SHIFT |      \
+			8 << SYSCON_CLKSET_PLL_X2FBD2_SHIFT |	   \
+			19 << SYSCON_CLKSET_PLL_X1FBD1_SHIFT |	   \
+			1 << SYSCON_CLKSET1_PCLK_DIV_SHIFT |	   \
+			3 << SYSCON_CLKSET1_HCLK_DIV_SHIFT |	   \
+			SYSCON_CLKSET1_NBYP1 |			   \
+			1 << SYSCON_CLKSET1_FCLK_DIV_SHIFT)

ws trailing spaces
Other macros have similar issues

Quoted 8 lines
board/edb93xx/pll_cfg.h new file +8 -0
+#elif defined(CONFIG_EDB9307) || defined(CONFIG_EDB9307A) ||\
+	defined CONFIG_EDB9312 || defined(CONFIG_EDB9315) ||\
+	defined(CONFIG_EDB9315A)
+/*
+ * fclk_div: 2, nbyp1: 1, hclk_div: 4, pclk_div: 2
+ * pll1_x1: 3096576000.000000, pll1_x2ip: 129024000.000000,
+ * pll1_x2: 3999744000.000000, pll1_out: 1999872000.000000
+ */

<snip>

Quoted 10 lines
board/edb93xx/pll_cfg.h new file +10 -0
+static void setup_refresh_timer(void)
+{
+	struct sdram_regs *sdram = (struct sdram_regs *)SDRAM_BASE;
+
+	/* Load refresh timer with 10 to issue refresh every 10 cycles */
+	writel(0x0a, &sdram->refrshtimr);
+
+	/*
+	 * Wait at least 80 clock cycles to provide 8 refresh cycles
+	 * to all SDRAMs

board/edb93xx/pll_cfg.h

Quoted 10 lines
board/edb93xx/pll_cfg.h new file +10 -0
+	 */
+	early_udelay(1);
+
+	/*
+	 * Program refresh timer with normal value
+	 * We need 8192 refresh cycles every 64ms
+	 * at 15ns (HCLK >= 66MHz) per cycle:
+	 * 64ms / 8192 = 7.8125us
+	 * 7.8125us / 15ns = 520 (0x208)
+	 */

Good comment!

board/edb93xx/pll_cfg.h

Quoted 11 lines
board/edb93xx/pll_cfg.h new file +11 -0
+	/*
+	 * TODO: redboot uses 0x1e0 for the slowest possible device
+	 * but i don't understand how this value is calculated
+	 */
+	writel(0x208, &sdram->refrshtimr);
+}
+
+static void program_mode_registers(void)
+{
+	PROGRAM_MODE_REG(0);
+

It looks like all this macros is doing is reading memory. Is this correct ?
If so, please add a comment

Quoted 12 lines
board/edb93xx/pll_cfg.h new file +12 -0
+#if (CONFIG_NR_DRAM_BANKS >= 2)
+	PROGRAM_MODE_REG(1);
+#endif
+
+#if (CONFIG_NR_DRAM_BANKS >= 3)
+	PROGRAM_MODE_REG(2);
+#endif
+
+#if (CONFIG_NR_DRAM_BANKS == 4)
+	PROGRAM_MODE_REG(3);
+#endif
+}

<snip>

board/edb93xx/pll_cfg.h

Quoted 9 lines
board/edb93xx/pll_cfg.h new file +9 -0
+#define CONFIG_SYS_MEMTEST_START	0xc0100000
+#define CONFIG_SYS_MEMTEST_END		0xc1e00000
+#endif
+
+#if defined(CONFIG_EDB93XX_SDCS3)
+#define CONFIG_SYS_LOAD_ADDR	0x01000000	/* Default load address	*/
+#elif defined(CONFIG_EDB93XX_SDCS0)
+#define CONFIG_SYS_LOAD_ADDR	0xc1000000	/* Default load address	*/
+#endif

This could be reduced to
+#define CONFIG_SYS_LOAD_ADDR (PHYS_SDRAM_1 + 0x01000000) /* Default load address */

Tom