arc: Rename AXS101 board to more generic AXS10x
authorAlexey Brodkin <abrodkin@synopsys.com>
Thu, 4 Aug 2016 12:00:35 +0000 (15:00 +0300)
committerAlexey Brodkin <abrodkin@synopsys.com>
Fri, 5 Aug 2016 09:50:33 +0000 (12:50 +0300)
As of now we have 2 flavors of ARC SDP boards:
 1) AXS101 - with ARC770 in ASIC
 2) AXS103 - with ARC HS38 in FPGA

Both options share exactly the same base-board and only differ with
CPU-tiles in use. That means all peripherals are the same (they are
implemented in FPGA on the base-board) and so generic board could be
used for both.

While at it:
 * Recreated defconfigs with savedefconfig
 * In include/configs/axs10x.h numerical sizes replaced with
defines from linux/sizes.h for better readability.

Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
18 files changed:
arch/arc/Kconfig
arch/arc/dts/Makefile
board/synopsys/axs101/Kconfig [deleted file]
board/synopsys/axs101/MAINTAINERS [deleted file]
board/synopsys/axs101/Makefile [deleted file]
board/synopsys/axs101/axs101.c [deleted file]
board/synopsys/axs101/axs10x.h [deleted file]
board/synopsys/axs101/nand.c [deleted file]
board/synopsys/axs10x/Kconfig [new file with mode: 0644]
board/synopsys/axs10x/MAINTAINERS [new file with mode: 0644]
board/synopsys/axs10x/Makefile [new file with mode: 0644]
board/synopsys/axs10x/axs10x.c [new file with mode: 0644]
board/synopsys/axs10x/axs10x.h [new file with mode: 0644]
board/synopsys/axs10x/nand.c [new file with mode: 0644]
configs/axs101_defconfig
configs/axs103_defconfig
include/configs/axs101.h [deleted file]
include/configs/axs10x.h [new file with mode: 0644]

index b81d0ca3c35ac938c490d42fe8464458ea08fbba..4c5696be1c3c834dcd8626aa412d9f878fbecd72 100644 (file)
@@ -118,7 +118,7 @@ config SYS_DCACHE_OFF
 
 choice
        prompt "Target select"
-       default TARGET_AXS101
+       default TARGET_AXS10X
 
 config TARGET_TB100
        bool "Support tb100"
@@ -126,13 +126,13 @@ config TARGET_TB100
 config TARGET_NSIM
        bool "Support standalone nSIM & Free nSIM"
 
-config TARGET_AXS101
-       bool "Support axs101"
+config TARGET_AXS10X
+       bool "Support Synopsys Designware SDP board (AXS101 & AXS103)"
 
 endchoice
 
 source "board/abilis/tb100/Kconfig"
 source "board/synopsys/Kconfig"
-source "board/synopsys/axs101/Kconfig"
+source "board/synopsys/axs10x/Kconfig"
 
 endmenu
index 196f8829637425bd57703e42d20d93b9260da4f3..1d94c082ab57d9a1adef739b4a5b4889b2aa119b 100644 (file)
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier:     GPL-2.0+
 #
 
-dtb-$(CONFIG_TARGET_AXS101) +=  axs10x.dtb
+dtb-$(CONFIG_TARGET_AXS10X) +=  axs10x.dtb
 dtb-$(CONFIG_TARGET_NSIM) +=  nsim.dtb
 dtb-$(CONFIG_TARGET_TB100) +=  abilis_tb100.dtb
 
diff --git a/board/synopsys/axs101/Kconfig b/board/synopsys/axs101/Kconfig
deleted file mode 100644 (file)
index 79e5400..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-if TARGET_AXS101
-
-config SYS_BOARD
-       default "axs101"
-
-config SYS_VENDOR
-       default "synopsys"
-
-config SYS_CONFIG_NAME
-       default "axs101"
-
-endif
diff --git a/board/synopsys/axs101/MAINTAINERS b/board/synopsys/axs101/MAINTAINERS
deleted file mode 100644 (file)
index 79fff8e..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-AXS101 BOARD
-M:     Alexey Brodkin <abrodkin@synopsys.com>
-S:     Maintained
-F:     board/synopsys/axs101/
-F:     include/configs/axs101.h
-F:     configs/axs101_defconfig
-F:     configs/axs103_defconfig
diff --git a/board/synopsys/axs101/Makefile b/board/synopsys/axs101/Makefile
deleted file mode 100644 (file)
index f0965f7..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# Copyright (C) 2013-2014 Synopsys, Inc. All rights reserved.
-#
-# SPDX-License-Identifier:     GPL-2.0+
-#
-
-obj-y  += axs101.o
-obj-$(CONFIG_CMD_NAND) += nand.o
diff --git a/board/synopsys/axs101/axs101.c b/board/synopsys/axs101/axs101.c
deleted file mode 100644 (file)
index a5e774b..0000000
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright (C) 2013-2014 Synopsys, Inc. All rights reserved.
- *
- * SPDX-License-Identifier:    GPL-2.0+
- */
-
-#include <common.h>
-#include <dwmmc.h>
-#include <malloc.h>
-#include "axs10x.h"
-
-DECLARE_GLOBAL_DATA_PTR;
-
-int board_mmc_init(bd_t *bis)
-{
-       struct dwmci_host *host = NULL;
-
-       host = malloc(sizeof(struct dwmci_host));
-       if (!host) {
-               printf("dwmci_host malloc fail!\n");
-               return 1;
-       }
-
-       memset(host, 0, sizeof(struct dwmci_host));
-       host->name = "Synopsys Mobile storage";
-       host->ioaddr = (void *)ARC_DWMMC_BASE;
-       host->buswidth = 4;
-       host->dev_index = 0;
-       host->bus_hz = 50000000;
-
-       add_dwmci(host, host->bus_hz / 2, 400000);
-
-       return 0;
-}
-
-#define AXS_MB_CREG    0xE0011000
-
-int board_early_init_f(void)
-{
-       if (readl((void __iomem *)AXS_MB_CREG + 0x234) & (1 << 28))
-               gd->board_type = AXS_MB_V3;
-       else
-               gd->board_type = AXS_MB_V2;
-
-       return 0;
-}
-
-#ifdef CONFIG_ISA_ARCV2
-#define RESET_VECTOR_ADDR      0x0
-
-void smp_set_core_boot_addr(unsigned long addr, int corenr)
-{
-       /* All cores have reset vector pointing to 0 */
-       writel(addr, (void __iomem *)RESET_VECTOR_ADDR);
-
-       /* Make sure other cores see written value in memory */
-       flush_dcache_all();
-}
-
-void smp_kick_all_cpus(void)
-{
-/* CPU start CREG */
-#define AXC003_CREG_CPU_START  0xF0001400
-
-/* Bits positions in CPU start CREG */
-#define BITS_START     0
-#define BITS_POLARITY  8
-#define BITS_CORE_SEL  9
-#define BITS_MULTICORE 12
-
-#define CMD    (1 << BITS_MULTICORE) | (1 << BITS_CORE_SEL) | \
-               (1 << BITS_POLARITY) | (1 << BITS_START)
-
-       writel(CMD, (void __iomem *)AXC003_CREG_CPU_START);
-}
-#endif
diff --git a/board/synopsys/axs101/axs10x.h b/board/synopsys/axs101/axs10x.h
deleted file mode 100644 (file)
index 8e8c41f..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Copyright (C) 2015 Synopsys, Inc. All rights reserved.
- *
- * SPDX-License-Identifier:    GPL-2.0+
- */
-
-#ifndef _BOARD_SYNOPSYS_AXS10X_H
-#define _BOARD_SYNOPSYS_AXS10X_H
-
-enum {
-       AXS_MB_V2,
-       AXS_MB_V3
-};
-
-#endif /* _BOARD_SYNOPSYS_AXS10X_H */
-
diff --git a/board/synopsys/axs101/nand.c b/board/synopsys/axs101/nand.c
deleted file mode 100644 (file)
index 4be52e2..0000000
+++ /dev/null
@@ -1,243 +0,0 @@
-/*
- * Copyright (C) 2013-2014 Synopsys, Inc. All rights reserved.
- *
- * SPDX-License-Identifier:    GPL-2.0+
- */
-
-#include <bouncebuf.h>
-#include <common.h>
-#include <malloc.h>
-#include <nand.h>
-#include <asm/io.h>
-#include "axs10x.h"
-
-DECLARE_GLOBAL_DATA_PTR;
-
-#define BUS_WIDTH      8               /* AXI data bus width in bytes  */
-
-/* DMA buffer descriptor bits & masks */
-#define BD_STAT_OWN                    (1 << 31)
-#define BD_STAT_BD_FIRST               (1 << 3)
-#define BD_STAT_BD_LAST                        (1 << 2)
-#define BD_SIZES_BUFFER1_MASK          0xfff
-
-#define BD_STAT_BD_COMPLETE    (BD_STAT_BD_FIRST | BD_STAT_BD_LAST)
-
-/* Controller command flags */
-#define B_WFR          (1 << 19)       /* 1b - Wait for ready          */
-#define B_LC           (1 << 18)       /* 1b - Last cycle              */
-#define B_IWC          (1 << 13)       /* 1b - Interrupt when complete */
-
-/* NAND cycle types */
-#define B_CT_ADDRESS   (0x0 << 16)     /* Address operation            */
-#define B_CT_COMMAND   (0x1 << 16)     /* Command operation            */
-#define B_CT_WRITE     (0x2 << 16)     /* Write operation              */
-#define B_CT_READ      (0x3 << 16)     /* Write operation              */
-
-enum nand_isr_t {
-       NAND_ISR_DATAREQUIRED = 0,
-       NAND_ISR_TXUNDERFLOW,
-       NAND_ISR_TXOVERFLOW,
-       NAND_ISR_DATAAVAILABLE,
-       NAND_ISR_RXUNDERFLOW,
-       NAND_ISR_RXOVERFLOW,
-       NAND_ISR_TXDMACOMPLETE,
-       NAND_ISR_RXDMACOMPLETE,
-       NAND_ISR_DESCRIPTORUNAVAILABLE,
-       NAND_ISR_CMDDONE,
-       NAND_ISR_CMDAVAILABLE,
-       NAND_ISR_CMDERROR,
-       NAND_ISR_DATATRANSFEROVER,
-       NAND_ISR_NONE
-};
-
-enum nand_regs_t {
-       AC_FIFO = 0,            /* address and command fifo */
-       IDMAC_BDADDR = 0x18,    /* idmac descriptor list base address */
-       INT_STATUS = 0x118,     /* interrupt status register */
-       INT_CLR_STATUS = 0x120, /* interrupt clear status register */
-};
-
-struct nand_bd {
-       uint32_t status;        /* DES0 */
-       uint32_t sizes;         /* DES1 */
-       uint32_t buffer_ptr0;   /* DES2 */
-       uint32_t buffer_ptr1;   /* DES3 */
-};
-
-#define NAND_REG_WRITE(r, v)   \
-       writel(v, (volatile void __iomem *)(CONFIG_SYS_NAND_BASE + r))
-#define NAND_REG_READ(r)               \
-       readl((const volatile void __iomem *)(CONFIG_SYS_NAND_BASE + r))
-
-static struct nand_bd *bd;     /* DMA buffer descriptors       */
-
-/**
- * axs101_nand_write_buf -  write buffer to chip
- * @mtd:       MTD device structure
- * @buf:       data buffer
- * @len:       number of bytes to write
- */
-static uint32_t nand_flag_is_set(uint32_t flag)
-{
-       uint32_t reg = NAND_REG_READ(INT_STATUS);
-
-       if (reg & (1 << NAND_ISR_CMDERROR))
-               return 0;
-
-       if (reg & (1 << flag)) {
-               NAND_REG_WRITE(INT_CLR_STATUS, 1 << flag);
-               return 1;
-       }
-
-       return 0;
-}
-
-/**
- * axs101_nand_write_buf -  write buffer to chip
- * @mtd:       MTD device structure
- * @buf:       data buffer
- * @len:       number of bytes to write
- */
-static void axs101_nand_write_buf(struct mtd_info *mtd, const u_char *buf,
-                                  int len)
-{
-       struct bounce_buffer bbstate;
-
-       bounce_buffer_start(&bbstate, (void *)buf, len, GEN_BB_READ);
-
-       /* Setup buffer descriptor */
-       writel(BD_STAT_OWN | BD_STAT_BD_COMPLETE, &bd->status);
-       writel(ALIGN(len, BUS_WIDTH) & BD_SIZES_BUFFER1_MASK, &bd->sizes);
-       writel(bbstate.bounce_buffer, &bd->buffer_ptr0);
-       writel(0, &bd->buffer_ptr1);
-
-       /* Flush modified buffer descriptor */
-       flush_dcache_range((unsigned long)bd,
-                          (unsigned long)bd + sizeof(struct nand_bd));
-
-       /* Issue "write" command */
-       NAND_REG_WRITE(AC_FIFO, B_CT_WRITE | B_WFR | B_IWC | B_LC | (len-1));
-
-       /* Wait for NAND command and DMA to complete */
-       while (!nand_flag_is_set(NAND_ISR_CMDDONE))
-               ;
-       while (!nand_flag_is_set(NAND_ISR_TXDMACOMPLETE))
-               ;
-
-       bounce_buffer_stop(&bbstate);
-}
-
-/**
- * axs101_nand_read_buf -  read chip data into buffer
- * @mtd:       MTD device structure
- * @buf:       buffer to store data
- * @len:       number of bytes to read
- */
-static void axs101_nand_read_buf(struct mtd_info *mtd, u_char *buf, int len)
-{
-       struct bounce_buffer bbstate;
-
-       bounce_buffer_start(&bbstate, buf, len, GEN_BB_WRITE);
-
-       /* Setup buffer descriptor */
-       writel(BD_STAT_OWN | BD_STAT_BD_COMPLETE, &bd->status);
-       writel(ALIGN(len, BUS_WIDTH) & BD_SIZES_BUFFER1_MASK, &bd->sizes);
-       writel(bbstate.bounce_buffer, &bd->buffer_ptr0);
-       writel(0, &bd->buffer_ptr1);
-
-       /* Flush modified buffer descriptor */
-       flush_dcache_range((unsigned long)bd,
-                          (unsigned long)bd + sizeof(struct nand_bd));
-
-       /* Issue "read" command */
-       NAND_REG_WRITE(AC_FIFO, B_CT_READ | B_WFR | B_IWC | B_LC | (len - 1));
-
-       /* Wait for NAND command and DMA to complete */
-       while (!nand_flag_is_set(NAND_ISR_CMDDONE))
-               ;
-       while (!nand_flag_is_set(NAND_ISR_RXDMACOMPLETE))
-               ;
-
-       bounce_buffer_stop(&bbstate);
-}
-
-/**
- * axs101_nand_read_byte -  read one byte from the chip
- * @mtd:       MTD device structure
- */
-static u_char axs101_nand_read_byte(struct mtd_info *mtd)
-{
-       u8 byte;
-
-       axs101_nand_read_buf(mtd, (uchar *)&byte, sizeof(byte));
-       return byte;
-}
-
-/**
- * axs101_nand_read_word -  read one word from the chip
- * @mtd:       MTD device structure
- */
-static u16 axs101_nand_read_word(struct mtd_info *mtd)
-{
-       u16 word;
-
-       axs101_nand_read_buf(mtd, (uchar *)&word, sizeof(word));
-       return word;
-}
-
-/**
- * axs101_nand_hwcontrol - NAND control functions wrapper.
- * @mtd:       MTD device structure
- * @cmd:       Command
- */
-static void axs101_nand_hwcontrol(struct mtd_info *mtdinfo, int cmd,
-                                  unsigned int ctrl)
-{
-       if (cmd == NAND_CMD_NONE)
-               return;
-
-       cmd = cmd & 0xff;
-
-       switch (ctrl & (NAND_ALE | NAND_CLE)) {
-       /* Address */
-       case NAND_ALE:
-               cmd |= B_CT_ADDRESS;
-               break;
-
-       /* Command */
-       case NAND_CLE:
-               cmd |= B_CT_COMMAND | B_WFR;
-
-               break;
-
-       default:
-               debug("%s: unknown ctrl %#x\n", __func__, ctrl);
-       }
-
-       NAND_REG_WRITE(AC_FIFO, cmd | B_LC);
-       while (!nand_flag_is_set(NAND_ISR_CMDDONE))
-               ;
-}
-
-int board_nand_init(struct nand_chip *nand)
-{
-       bd = (struct nand_bd *)memalign(ARCH_DMA_MINALIGN,
-                                       sizeof(struct nand_bd));
-
-       /* Set buffer descriptor address in IDMAC */
-       NAND_REG_WRITE(IDMAC_BDADDR, bd);
-
-       nand->ecc.mode = NAND_ECC_SOFT;
-       nand->cmd_ctrl = axs101_nand_hwcontrol;
-       nand->read_byte = axs101_nand_read_byte;
-       nand->read_word = axs101_nand_read_word;
-       nand->write_buf = axs101_nand_write_buf;
-       nand->read_buf = axs101_nand_read_buf;
-
-       /* MBv3 has NAND IC with 16-bit data bus */
-       if (gd->board_type == AXS_MB_V3)
-               nand->options |= NAND_BUSWIDTH_16;
-
-       return 0;
-}
diff --git a/board/synopsys/axs10x/Kconfig b/board/synopsys/axs10x/Kconfig
new file mode 100644 (file)
index 0000000..c60b6a2
--- /dev/null
@@ -0,0 +1,12 @@
+if TARGET_AXS10X
+
+config SYS_BOARD
+       default "axs10x"
+
+config SYS_VENDOR
+       default "synopsys"
+
+config SYS_CONFIG_NAME
+       default "axs10x"
+
+endif
diff --git a/board/synopsys/axs10x/MAINTAINERS b/board/synopsys/axs10x/MAINTAINERS
new file mode 100644 (file)
index 0000000..abb890b
--- /dev/null
@@ -0,0 +1,7 @@
+AXS10X BOARD
+M:     Alexey Brodkin <abrodkin@synopsys.com>
+S:     Maintained
+F:     board/synopsys/axs10x/
+F:     include/configs/axs10x.h
+F:     configs/axs101_defconfig
+F:     configs/axs103_defconfig
diff --git a/board/synopsys/axs10x/Makefile b/board/synopsys/axs10x/Makefile
new file mode 100644 (file)
index 0000000..e29d520
--- /dev/null
@@ -0,0 +1,8 @@
+#
+# Copyright (C) 2013-2016 Synopsys, Inc. All rights reserved.
+#
+# SPDX-License-Identifier:     GPL-2.0+
+#
+
+obj-y  += axs10x.o
+obj-$(CONFIG_CMD_NAND) += nand.o
diff --git a/board/synopsys/axs10x/axs10x.c b/board/synopsys/axs10x/axs10x.c
new file mode 100644 (file)
index 0000000..a5e774b
--- /dev/null
@@ -0,0 +1,76 @@
+/*
+ * Copyright (C) 2013-2014 Synopsys, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+
+#include <common.h>
+#include <dwmmc.h>
+#include <malloc.h>
+#include "axs10x.h"
+
+DECLARE_GLOBAL_DATA_PTR;
+
+int board_mmc_init(bd_t *bis)
+{
+       struct dwmci_host *host = NULL;
+
+       host = malloc(sizeof(struct dwmci_host));
+       if (!host) {
+               printf("dwmci_host malloc fail!\n");
+               return 1;
+       }
+
+       memset(host, 0, sizeof(struct dwmci_host));
+       host->name = "Synopsys Mobile storage";
+       host->ioaddr = (void *)ARC_DWMMC_BASE;
+       host->buswidth = 4;
+       host->dev_index = 0;
+       host->bus_hz = 50000000;
+
+       add_dwmci(host, host->bus_hz / 2, 400000);
+
+       return 0;
+}
+
+#define AXS_MB_CREG    0xE0011000
+
+int board_early_init_f(void)
+{
+       if (readl((void __iomem *)AXS_MB_CREG + 0x234) & (1 << 28))
+               gd->board_type = AXS_MB_V3;
+       else
+               gd->board_type = AXS_MB_V2;
+
+       return 0;
+}
+
+#ifdef CONFIG_ISA_ARCV2
+#define RESET_VECTOR_ADDR      0x0
+
+void smp_set_core_boot_addr(unsigned long addr, int corenr)
+{
+       /* All cores have reset vector pointing to 0 */
+       writel(addr, (void __iomem *)RESET_VECTOR_ADDR);
+
+       /* Make sure other cores see written value in memory */
+       flush_dcache_all();
+}
+
+void smp_kick_all_cpus(void)
+{
+/* CPU start CREG */
+#define AXC003_CREG_CPU_START  0xF0001400
+
+/* Bits positions in CPU start CREG */
+#define BITS_START     0
+#define BITS_POLARITY  8
+#define BITS_CORE_SEL  9
+#define BITS_MULTICORE 12
+
+#define CMD    (1 << BITS_MULTICORE) | (1 << BITS_CORE_SEL) | \
+               (1 << BITS_POLARITY) | (1 << BITS_START)
+
+       writel(CMD, (void __iomem *)AXC003_CREG_CPU_START);
+}
+#endif
diff --git a/board/synopsys/axs10x/axs10x.h b/board/synopsys/axs10x/axs10x.h
new file mode 100644 (file)
index 0000000..8e8c41f
--- /dev/null
@@ -0,0 +1,16 @@
+/*
+ * Copyright (C) 2015 Synopsys, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+
+#ifndef _BOARD_SYNOPSYS_AXS10X_H
+#define _BOARD_SYNOPSYS_AXS10X_H
+
+enum {
+       AXS_MB_V2,
+       AXS_MB_V3
+};
+
+#endif /* _BOARD_SYNOPSYS_AXS10X_H */
+
diff --git a/board/synopsys/axs10x/nand.c b/board/synopsys/axs10x/nand.c
new file mode 100644 (file)
index 0000000..4be52e2
--- /dev/null
@@ -0,0 +1,243 @@
+/*
+ * Copyright (C) 2013-2014 Synopsys, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+
+#include <bouncebuf.h>
+#include <common.h>
+#include <malloc.h>
+#include <nand.h>
+#include <asm/io.h>
+#include "axs10x.h"
+
+DECLARE_GLOBAL_DATA_PTR;
+
+#define BUS_WIDTH      8               /* AXI data bus width in bytes  */
+
+/* DMA buffer descriptor bits & masks */
+#define BD_STAT_OWN                    (1 << 31)
+#define BD_STAT_BD_FIRST               (1 << 3)
+#define BD_STAT_BD_LAST                        (1 << 2)
+#define BD_SIZES_BUFFER1_MASK          0xfff
+
+#define BD_STAT_BD_COMPLETE    (BD_STAT_BD_FIRST | BD_STAT_BD_LAST)
+
+/* Controller command flags */
+#define B_WFR          (1 << 19)       /* 1b - Wait for ready          */
+#define B_LC           (1 << 18)       /* 1b - Last cycle              */
+#define B_IWC          (1 << 13)       /* 1b - Interrupt when complete */
+
+/* NAND cycle types */
+#define B_CT_ADDRESS   (0x0 << 16)     /* Address operation            */
+#define B_CT_COMMAND   (0x1 << 16)     /* Command operation            */
+#define B_CT_WRITE     (0x2 << 16)     /* Write operation              */
+#define B_CT_READ      (0x3 << 16)     /* Write operation              */
+
+enum nand_isr_t {
+       NAND_ISR_DATAREQUIRED = 0,
+       NAND_ISR_TXUNDERFLOW,
+       NAND_ISR_TXOVERFLOW,
+       NAND_ISR_DATAAVAILABLE,
+       NAND_ISR_RXUNDERFLOW,
+       NAND_ISR_RXOVERFLOW,
+       NAND_ISR_TXDMACOMPLETE,
+       NAND_ISR_RXDMACOMPLETE,
+       NAND_ISR_DESCRIPTORUNAVAILABLE,
+       NAND_ISR_CMDDONE,
+       NAND_ISR_CMDAVAILABLE,
+       NAND_ISR_CMDERROR,
+       NAND_ISR_DATATRANSFEROVER,
+       NAND_ISR_NONE
+};
+
+enum nand_regs_t {
+       AC_FIFO = 0,            /* address and command fifo */
+       IDMAC_BDADDR = 0x18,    /* idmac descriptor list base address */
+       INT_STATUS = 0x118,     /* interrupt status register */
+       INT_CLR_STATUS = 0x120, /* interrupt clear status register */
+};
+
+struct nand_bd {
+       uint32_t status;        /* DES0 */
+       uint32_t sizes;         /* DES1 */
+       uint32_t buffer_ptr0;   /* DES2 */
+       uint32_t buffer_ptr1;   /* DES3 */
+};
+
+#define NAND_REG_WRITE(r, v)   \
+       writel(v, (volatile void __iomem *)(CONFIG_SYS_NAND_BASE + r))
+#define NAND_REG_READ(r)               \
+       readl((const volatile void __iomem *)(CONFIG_SYS_NAND_BASE + r))
+
+static struct nand_bd *bd;     /* DMA buffer descriptors       */
+
+/**
+ * axs101_nand_write_buf -  write buffer to chip
+ * @mtd:       MTD device structure
+ * @buf:       data buffer
+ * @len:       number of bytes to write
+ */
+static uint32_t nand_flag_is_set(uint32_t flag)
+{
+       uint32_t reg = NAND_REG_READ(INT_STATUS);
+
+       if (reg & (1 << NAND_ISR_CMDERROR))
+               return 0;
+
+       if (reg & (1 << flag)) {
+               NAND_REG_WRITE(INT_CLR_STATUS, 1 << flag);
+               return 1;
+       }
+
+       return 0;
+}
+
+/**
+ * axs101_nand_write_buf -  write buffer to chip
+ * @mtd:       MTD device structure
+ * @buf:       data buffer
+ * @len:       number of bytes to write
+ */
+static void axs101_nand_write_buf(struct mtd_info *mtd, const u_char *buf,
+                                  int len)
+{
+       struct bounce_buffer bbstate;
+
+       bounce_buffer_start(&bbstate, (void *)buf, len, GEN_BB_READ);
+
+       /* Setup buffer descriptor */
+       writel(BD_STAT_OWN | BD_STAT_BD_COMPLETE, &bd->status);
+       writel(ALIGN(len, BUS_WIDTH) & BD_SIZES_BUFFER1_MASK, &bd->sizes);
+       writel(bbstate.bounce_buffer, &bd->buffer_ptr0);
+       writel(0, &bd->buffer_ptr1);
+
+       /* Flush modified buffer descriptor */
+       flush_dcache_range((unsigned long)bd,
+                          (unsigned long)bd + sizeof(struct nand_bd));
+
+       /* Issue "write" command */
+       NAND_REG_WRITE(AC_FIFO, B_CT_WRITE | B_WFR | B_IWC | B_LC | (len-1));
+
+       /* Wait for NAND command and DMA to complete */
+       while (!nand_flag_is_set(NAND_ISR_CMDDONE))
+               ;
+       while (!nand_flag_is_set(NAND_ISR_TXDMACOMPLETE))
+               ;
+
+       bounce_buffer_stop(&bbstate);
+}
+
+/**
+ * axs101_nand_read_buf -  read chip data into buffer
+ * @mtd:       MTD device structure
+ * @buf:       buffer to store data
+ * @len:       number of bytes to read
+ */
+static void axs101_nand_read_buf(struct mtd_info *mtd, u_char *buf, int len)
+{
+       struct bounce_buffer bbstate;
+
+       bounce_buffer_start(&bbstate, buf, len, GEN_BB_WRITE);
+
+       /* Setup buffer descriptor */
+       writel(BD_STAT_OWN | BD_STAT_BD_COMPLETE, &bd->status);
+       writel(ALIGN(len, BUS_WIDTH) & BD_SIZES_BUFFER1_MASK, &bd->sizes);
+       writel(bbstate.bounce_buffer, &bd->buffer_ptr0);
+       writel(0, &bd->buffer_ptr1);
+
+       /* Flush modified buffer descriptor */
+       flush_dcache_range((unsigned long)bd,
+                          (unsigned long)bd + sizeof(struct nand_bd));
+
+       /* Issue "read" command */
+       NAND_REG_WRITE(AC_FIFO, B_CT_READ | B_WFR | B_IWC | B_LC | (len - 1));
+
+       /* Wait for NAND command and DMA to complete */
+       while (!nand_flag_is_set(NAND_ISR_CMDDONE))
+               ;
+       while (!nand_flag_is_set(NAND_ISR_RXDMACOMPLETE))
+               ;
+
+       bounce_buffer_stop(&bbstate);
+}
+
+/**
+ * axs101_nand_read_byte -  read one byte from the chip
+ * @mtd:       MTD device structure
+ */
+static u_char axs101_nand_read_byte(struct mtd_info *mtd)
+{
+       u8 byte;
+
+       axs101_nand_read_buf(mtd, (uchar *)&byte, sizeof(byte));
+       return byte;
+}
+
+/**
+ * axs101_nand_read_word -  read one word from the chip
+ * @mtd:       MTD device structure
+ */
+static u16 axs101_nand_read_word(struct mtd_info *mtd)
+{
+       u16 word;
+
+       axs101_nand_read_buf(mtd, (uchar *)&word, sizeof(word));
+       return word;
+}
+
+/**
+ * axs101_nand_hwcontrol - NAND control functions wrapper.
+ * @mtd:       MTD device structure
+ * @cmd:       Command
+ */
+static void axs101_nand_hwcontrol(struct mtd_info *mtdinfo, int cmd,
+                                  unsigned int ctrl)
+{
+       if (cmd == NAND_CMD_NONE)
+               return;
+
+       cmd = cmd & 0xff;
+
+       switch (ctrl & (NAND_ALE | NAND_CLE)) {
+       /* Address */
+       case NAND_ALE:
+               cmd |= B_CT_ADDRESS;
+               break;
+
+       /* Command */
+       case NAND_CLE:
+               cmd |= B_CT_COMMAND | B_WFR;
+
+               break;
+
+       default:
+               debug("%s: unknown ctrl %#x\n", __func__, ctrl);
+       }
+
+       NAND_REG_WRITE(AC_FIFO, cmd | B_LC);
+       while (!nand_flag_is_set(NAND_ISR_CMDDONE))
+               ;
+}
+
+int board_nand_init(struct nand_chip *nand)
+{
+       bd = (struct nand_bd *)memalign(ARCH_DMA_MINALIGN,
+                                       sizeof(struct nand_bd));
+
+       /* Set buffer descriptor address in IDMAC */
+       NAND_REG_WRITE(IDMAC_BDADDR, bd);
+
+       nand->ecc.mode = NAND_ECC_SOFT;
+       nand->cmd_ctrl = axs101_nand_hwcontrol;
+       nand->read_byte = axs101_nand_read_byte;
+       nand->read_word = axs101_nand_read_word;
+       nand->write_buf = axs101_nand_write_buf;
+       nand->read_buf = axs101_nand_read_buf;
+
+       /* MBv3 has NAND IC with 16-bit data bus */
+       if (gd->board_type == AXS_MB_V3)
+               nand->options |= NAND_BUSWIDTH_16;
+
+       return 0;
+}
index 10e802d65530a9be02ce44c4ce0a3e08f1685382..dd82581febcdafd167fc5e9ad3d80cceb5c006bf 100644 (file)
@@ -1,7 +1,7 @@
 CONFIG_ARC=y
 CONFIG_SYS_DCACHE_OFF=y
-CONFIG_DM_SERIAL=y
 CONFIG_SYS_CLK_FREQ=750000000
+CONFIG_DM_SERIAL=y
 CONFIG_SYS_TEXT_BASE=0x81000000
 CONFIG_DEFAULT_DEVICE_TREE="axs10x"
 CONFIG_BOOTDELAY=3
index c8474de3c462226a34ad386d6760cd358b38b94b..8977f81c39bcb2302f4dfdcf252e47c8433bb272 100644 (file)
@@ -1,7 +1,7 @@
 CONFIG_ARC=y
 CONFIG_ISA_ARCV2=y
-CONFIG_DM_SERIAL=y
 CONFIG_SYS_CLK_FREQ=100000000
+CONFIG_DM_SERIAL=y
 CONFIG_SYS_TEXT_BASE=0x81000000
 CONFIG_DEFAULT_DEVICE_TREE="axs10x"
 CONFIG_BOOTDELAY=3
diff --git a/include/configs/axs101.h b/include/configs/axs101.h
deleted file mode 100644 (file)
index c0b68e2..0000000
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- * Copyright (C) 2013-2014 Synopsys, Inc. All rights reserved.
- *
- * SPDX-License-Identifier:    GPL-2.0+
- */
-
-#ifndef _CONFIG_AXS101_H_
-#define _CONFIG_AXS101_H_
-
-/*
- *  CPU configuration
- */
-#define CONFIG_SYS_TIMER_RATE          CONFIG_SYS_CLK_FREQ
-
-#define ARC_FPGA_PERIPHERAL_BASE       0xE0000000
-#define ARC_APB_PERIPHERAL_BASE                0xF0000000
-#define ARC_DWMMC_BASE                 (ARC_FPGA_PERIPHERAL_BASE + 0x15000)
-#define ARC_DWGMAC_BASE                        (ARC_FPGA_PERIPHERAL_BASE + 0x18000)
-
-/*
- * Memory configuration
- */
-#define CONFIG_SYS_MONITOR_BASE                CONFIG_SYS_TEXT_BASE
-
-#define CONFIG_SYS_DDR_SDRAM_BASE      0x80000000
-#define CONFIG_SYS_SDRAM_BASE          CONFIG_SYS_DDR_SDRAM_BASE
-#define CONFIG_SYS_SDRAM_SIZE          0x20000000      /* 512 Mb */
-
-#define CONFIG_SYS_INIT_SP_ADDR                \
-       (CONFIG_SYS_SDRAM_BASE + 0x1000 - GENERATED_GBL_DATA_SIZE)
-
-#define CONFIG_SYS_MALLOC_LEN          0x200000        /* 2 MB */
-#define CONFIG_SYS_BOOTM_LEN           0x2000000       /* 32 MB */
-#define CONFIG_SYS_LOAD_ADDR           0x82000000
-
-/*
- * This board might be of different versions so handle it
- */
-#define CONFIG_BOARD_TYPES
-#define CONFIG_BOARD_EARLY_INIT_F
-
-/*
- * NAND Flash configuration
- */
-#define CONFIG_SYS_NO_FLASH
-#define CONFIG_SYS_NAND_BASE           (ARC_FPGA_PERIPHERAL_BASE + 0x16000)
-#define CONFIG_SYS_MAX_NAND_DEVICE     1
-
-/*
- * UART configuration
- */
-#define CONFIG_DW_SERIAL
-#define CONFIG_SYS_NS16550_SERIAL
-#define CONFIG_SYS_NS16550_CLK         33333333
-#define CONFIG_SYS_NS16550_MEM32
-#define CONFIG_BAUDRATE                        115200
-
-/*
- * I2C configuration
- */
-#define CONFIG_SYS_I2C
-#define CONFIG_I2C_ENV_EEPROM_BUS      2
-#define CONFIG_SYS_I2C_SPEED           100000
-#define CONFIG_SYS_I2C_SPEED1          100000
-#define CONFIG_SYS_I2C_SPEED2          100000
-#define CONFIG_SYS_I2C_SLAVE           0
-#define CONFIG_SYS_I2C_SLAVE1          0
-#define CONFIG_SYS_I2C_SLAVE2          0
-#define CONFIG_SYS_I2C_BASE            0xE001D000
-#define CONFIG_SYS_I2C_BASE1           0xE001E000
-#define CONFIG_SYS_I2C_BASE2           0xE001F000
-#define CONFIG_SYS_I2C_BUS_MAX         3
-#define IC_CLK                         50
-
-/*
- * EEPROM configuration
- */
-#define CONFIG_SYS_I2C_EEPROM_ADDR             (0xA8 >> 1)
-#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN         1
-#define CONFIG_SYS_I2C_EEPROM_ADDR_OVERFLOW    1
-#define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS      3
-#define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS  64
-
-/*
- * SD/MMC configuration
- */
-#define CONFIG_MMC
-#define CONFIG_GENERIC_MMC
-#define CONFIG_DWMMC
-#define CONFIG_DOS_PARTITION
-
-/*
- * Ethernet PHY configuration
- */
-#define CONFIG_MII
-#define CONFIG_PHY_GIGE
-
-/*
- * USB 1.1 configuration
- */
-#define CONFIG_USB_OHCI_NEW
-#define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 1
-
-/*
- * Commands still not supported in Kconfig
- */
-#define CONFIG_CMD_NAND
-
-#define CONFIG_AUTO_COMPLETE
-#define CONFIG_SYS_MAXARGS             16
-
-/*
- * Environment settings
- */
-#define CONFIG_ENV_IS_IN_EEPROM
-#define CONFIG_ENV_SIZE                        0x00200         /* 512 bytes */
-#define CONFIG_ENV_OFFSET              0
-
-/*
- * Environment configuration
- */
-#define CONFIG_BOOTFILE                        "uImage"
-#define CONFIG_BOOTARGS                        "console=ttyS3,115200n8"
-#define CONFIG_LOADADDR                        CONFIG_SYS_LOAD_ADDR
-
-/*
- * Console configuration
- */
-#define CONFIG_SYS_LONGHELP
-#define CONFIG_SYS_CBSIZE              256
-#define CONFIG_SYS_BARGSIZE            CONFIG_SYS_CBSIZE
-#define CONFIG_SYS_PBSIZE              (CONFIG_SYS_CBSIZE + \
-                                               sizeof(CONFIG_SYS_PROMPT) + 16)
-
-/*
- * Misc utility configuration
- */
-#define CONFIG_BOUNCE_BUFFER
-
-#endif /* _CONFIG_AXS101_H_ */
diff --git a/include/configs/axs10x.h b/include/configs/axs10x.h
new file mode 100644 (file)
index 0000000..b99248e
--- /dev/null
@@ -0,0 +1,141 @@
+/*
+ * Copyright (C) 2013-2016 Synopsys, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+
+#ifndef _CONFIG_AXS10X_H_
+#define _CONFIG_AXS10X_H_
+
+#include <linux/sizes.h>
+/*
+ *  CPU configuration
+ */
+#define CONFIG_SYS_TIMER_RATE          CONFIG_SYS_CLK_FREQ
+
+#define ARC_FPGA_PERIPHERAL_BASE       0xE0000000
+#define ARC_APB_PERIPHERAL_BASE                0xF0000000
+#define ARC_DWMMC_BASE                 (ARC_FPGA_PERIPHERAL_BASE + 0x15000)
+#define ARC_DWGMAC_BASE                        (ARC_FPGA_PERIPHERAL_BASE + 0x18000)
+
+/*
+ * Memory configuration
+ */
+#define CONFIG_SYS_MONITOR_BASE                CONFIG_SYS_TEXT_BASE
+
+#define CONFIG_SYS_DDR_SDRAM_BASE      0x80000000
+#define CONFIG_SYS_SDRAM_BASE          CONFIG_SYS_DDR_SDRAM_BASE
+#define CONFIG_SYS_SDRAM_SIZE          SZ_512M
+
+#define CONFIG_SYS_INIT_SP_ADDR                \
+       (CONFIG_SYS_SDRAM_BASE + 0x1000 - GENERATED_GBL_DATA_SIZE)
+
+#define CONFIG_SYS_MALLOC_LEN          SZ_2M
+#define CONFIG_SYS_BOOTM_LEN           SZ_32M
+#define CONFIG_SYS_LOAD_ADDR           0x82000000
+
+/*
+ * This board might be of different versions so handle it
+ */
+#define CONFIG_BOARD_TYPES
+#define CONFIG_BOARD_EARLY_INIT_F
+
+/*
+ * NAND Flash configuration
+ */
+#define CONFIG_SYS_NO_FLASH
+#define CONFIG_SYS_NAND_BASE           (ARC_FPGA_PERIPHERAL_BASE + 0x16000)
+#define CONFIG_SYS_MAX_NAND_DEVICE     1
+
+/*
+ * UART configuration
+ */
+#define CONFIG_DW_SERIAL
+#define CONFIG_SYS_NS16550_SERIAL
+#define CONFIG_SYS_NS16550_CLK         33333333
+#define CONFIG_SYS_NS16550_MEM32
+#define CONFIG_BAUDRATE                        115200
+
+/*
+ * I2C configuration
+ */
+#define CONFIG_SYS_I2C
+#define CONFIG_I2C_ENV_EEPROM_BUS      2
+#define CONFIG_SYS_I2C_SPEED           100000
+#define CONFIG_SYS_I2C_SPEED1          100000
+#define CONFIG_SYS_I2C_SPEED2          100000
+#define CONFIG_SYS_I2C_SLAVE           0
+#define CONFIG_SYS_I2C_SLAVE1          0
+#define CONFIG_SYS_I2C_SLAVE2          0
+#define CONFIG_SYS_I2C_BASE            0xE001D000
+#define CONFIG_SYS_I2C_BASE1           0xE001E000
+#define CONFIG_SYS_I2C_BASE2           0xE001F000
+#define CONFIG_SYS_I2C_BUS_MAX         3
+#define IC_CLK                         50
+
+/*
+ * EEPROM configuration
+ */
+#define CONFIG_SYS_I2C_EEPROM_ADDR             (0xA8 >> 1)
+#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN         1
+#define CONFIG_SYS_I2C_EEPROM_ADDR_OVERFLOW    1
+#define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS      3
+#define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS  64
+
+/*
+ * SD/MMC configuration
+ */
+#define CONFIG_MMC
+#define CONFIG_GENERIC_MMC
+#define CONFIG_DWMMC
+#define CONFIG_DOS_PARTITION
+
+/*
+ * Ethernet PHY configuration
+ */
+#define CONFIG_MII
+#define CONFIG_PHY_GIGE
+
+/*
+ * USB 1.1 configuration
+ */
+#define CONFIG_USB_OHCI_NEW
+#define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 1
+
+/*
+ * Commands still not supported in Kconfig
+ */
+#define CONFIG_CMD_NAND
+
+#define CONFIG_AUTO_COMPLETE
+#define CONFIG_SYS_MAXARGS             16
+
+/*
+ * Environment settings
+ */
+#define CONFIG_ENV_IS_IN_EEPROM
+#define CONFIG_ENV_SIZE                        SZ_512
+#define CONFIG_ENV_OFFSET              0
+
+/*
+ * Environment configuration
+ */
+#define CONFIG_BOOTFILE                        "uImage"
+#define CONFIG_BOOTARGS                        "console=ttyS3,115200n8"
+#define CONFIG_LOADADDR                        CONFIG_SYS_LOAD_ADDR
+
+/*
+ * Console configuration
+ */
+#define CONFIG_SYS_LONGHELP
+#define CONFIG_SYS_CBSIZE              SZ_256
+#define CONFIG_SYS_BARGSIZE            CONFIG_SYS_CBSIZE
+#define CONFIG_SYS_PBSIZE              (CONFIG_SYS_CBSIZE + \
+                                               sizeof(CONFIG_SYS_PROMPT) + 16)
+
+/*
+ * Misc utility configuration
+ */
+#define CONFIG_BOUNCE_BUFFER
+
+#endif /* _CONFIG_AXS10X_H_ */