[U-Boot] [PATCH 4/9] arm: ls102xa: Add etsec support for LS102xA

Signed-off-by: Alison Wang alison.wang@freescale.com --- drivers/net/fsl_mdio.c | 15 ++++++++++++--- drivers/net/tsec.c | 7 +++++++ include/tsec.h | 7 ++++++- 3 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/drivers/net/fsl_mdio.c b/drivers/net/fsl_mdio.c index 8d09f5d..5cee709 100644 --- a/drivers/net/fsl_mdio.c +++ b/drivers/net/fsl_mdio.c @@ -12,6 +12,15 @@ #include <asm/io.h> #include <asm/errno.h>

+void tsec_mdio_sync(void) +{ +#if defined(CONFIG_PPC) + asm("sync"); +#elif defined(CONFIG_ARM) + asm("dsb"); +#endif +} + void tsec_local_mdio_write(struct tsec_mii_mng __iomem *phyregs, int port_addr, int dev_addr, int regnum, int value) { @@ -19,7 +28,7 @@ void tsec_local_mdio_write(struct tsec_mii_mng __iomem *phyregs, int port_addr,

out_be32(&phyregs->miimadd, (port_addr << 8) | (regnum & 0x1f)); out_be32(&phyregs->miimcon, value); - asm("sync"); + tsec_mdio_sync();

while ((in_be32(&phyregs->miimind) & MIIMIND_BUSY) && timeout--) ; @@ -37,11 +46,11 @@ int tsec_local_mdio_read(struct tsec_mii_mng __iomem *phyregs, int port_addr,

/* Clear the command register, and wait */ out_be32(&phyregs->miimcom, 0); - asm("sync"); + tsec_mdio_sync();

/* Initiate a read command, and wait */ out_be32(&phyregs->miimcom, MIIMCOM_READ_CYCLE); - asm("sync"); + tsec_mdio_sync();

/* Wait for the the indication that the read is done */ while ((in_be32(&phyregs->miimind) & (MIIMIND_NOTVALID | MIIMIND_BUSY)) diff --git a/drivers/net/tsec.c b/drivers/net/tsec.c index e9138f0..a220221 100644 --- a/drivers/net/tsec.c +++ b/drivers/net/tsec.c @@ -20,6 +20,7 @@ #include <fsl_mdio.h> #include <asm/errno.h> #include <asm/processor.h> +#include <asm/io.h>

DECLARE_GLOBAL_DATA_PTR;

@@ -270,6 +271,9 @@ void redundant_init(struct eth_device *dev) out_be32(&regs->tstat, TSTAT_CLEAR_THALT); out_be32(&regs->rstat, RSTAT_CLEAR_RHALT); clrbits_be32(&regs->dmactrl, DMACTRL_GRS | DMACTRL_GTS); +#ifdef CONFIG_LS102xA + setbits_be32(&regs->dmactrl, DMACTRL_LE); +#endif

do { uint16_t status; @@ -366,6 +370,9 @@ static void startup_tsec(struct eth_device *dev) out_be32(&regs->tstat, TSTAT_CLEAR_THALT); out_be32(&regs->rstat, RSTAT_CLEAR_RHALT); clrbits_be32(&regs->dmactrl, DMACTRL_GRS | DMACTRL_GTS); +#ifdef CONFIG_LS102xA + setbits_be32(&regs->dmactrl, DMACTRL_LE); +#endif }

/* This returns the status bits of the device. The return value diff --git a/include/tsec.h b/include/tsec.h index 2054715..5b74f67 100644 --- a/include/tsec.h +++ b/include/tsec.h @@ -20,10 +20,14 @@ #include <net.h> #include <config.h> #include <phy.h> -#include <fsl_mdio.h>

+#ifdef CONFIG_LS102xA +#define TSEC_SIZE 0x40000 +#define TSEC_MDIO_OFFSET 0x40000 +#else #define TSEC_SIZE 0x01000 #define TSEC_MDIO_OFFSET 0x01000 +#endif

#define CONFIG_SYS_MDIO_BASE_ADDR (MDIO_BASE_ADDR + 0x520)

@@ -128,6 +132,7 @@ #define DMACTRL_INIT_SETTINGS 0x000000c3 #define DMACTRL_GRS 0x00000010 #define DMACTRL_GTS 0x00000008 +#define DMACTRL_LE 0x00008000

#define TSTAT_CLEAR_THALT 0x80000000 #define RSTAT_CLEAR_RHALT 0x00800000