On 27/08/2013 19:12, Philippe Reynes wrote:
> Signed-off-by: Philippe Reynes <trem...@yahoo.fr>
> Signed-off-by: Eric Jarrige <eric.jarr...@armadeus.org>
> ---
> board/armadeus/apf27/Makefile | 3 +
> board/armadeus/apf27/apf27.c | 5 +
> board/armadeus/apf27/fpga.c | 223
> +++++++++++++++++++++++++++++++++++++++++
> board/armadeus/apf27/fpga.h | 25 +++++
> include/configs/apf27.h | 14 +++
> 5 files changed, 270 insertions(+), 0 deletions(-)
> create mode 100644 board/armadeus/apf27/fpga.c
> create mode 100644 board/armadeus/apf27/fpga.h
>
> diff --git a/board/armadeus/apf27/Makefile b/board/armadeus/apf27/Makefile
> index ec0cb03..5fcda6e 100644
> --- a/board/armadeus/apf27/Makefile
> +++ b/board/armadeus/apf27/Makefile
> @@ -13,6 +13,9 @@ LIB = $(obj)lib$(BOARD).o
>
> COBJS := apf27.o
> SOBJS := lowlevel_init.o
> +ifdef CONFIG_FPGA
> +COBJS += fpga.o
> +endif
>
> SRCS := $(COBJS:.o=.c) $(SOBJS:.o=.S)
> OBJS := $(addprefix $(obj),$(COBJS))
> diff --git a/board/armadeus/apf27/apf27.c b/board/armadeus/apf27/apf27.c
> index 98c51a7..cd08bf4 100644
> --- a/board/armadeus/apf27/apf27.c
> +++ b/board/armadeus/apf27/apf27.c
> @@ -19,6 +19,7 @@
> #include <asm/errno.h>
> #include "apf27.h"
> #include "crc.h"
> +#include "fpga.h"
>
> DECLARE_GLOBAL_DATA_PTR;
>
> @@ -181,6 +182,10 @@ int board_init(void)
> apf27_setup_port();
> apf27_iomux_init();
> apf27_devices_init();
> +#if defined(CONFIG_FPGA)
> + APF27_init_fpga();
> +#endif
> +
>
> return 0;
> }
> diff --git a/board/armadeus/apf27/fpga.c b/board/armadeus/apf27/fpga.c
> new file mode 100644
> index 0000000..df2ddc2
> --- /dev/null
> +++ b/board/armadeus/apf27/fpga.c
> @@ -0,0 +1,223 @@
> +/*
> + * (C) Copyright 2002-2013
> + * Eric Jarrige <eric.jarr...@armadeus.org>
> + *
> + * based on the files by
> + * Rich Ireland, Enterasys Networks, rirel...@enterasys.com
> + * and
> + * Keith Outwater, keith_outwa...@mvis.com
> + *
> + * SPDX-License-Identifier: GPL-2.0+
> + */
> +#include <common.h>
> +
> +#include <asm/arch/imx-regs.h>
> +#include <asm/gpio.h>
> +#include <asm/io.h>
> +#include <command.h>
> +#include <config.h>
> +#include "fpga.h"
> +#include <spartan3.h>
> +#include "apf27.h"
> +
> +/*
> + * Note that these are pointers to code that is in Flash. They will be
> + * relocated at runtime.
> + * Spartan2 code is used to download our Spartan 3 :) code is compatible.
> + * Just take care about the file size
> + */
> +Xilinx_Spartan3_Slave_Parallel_fns fpga_fns = {
> + fpga_pre_fn,
> + fpga_pgm_fn,
> + fpga_init_fn,
> + NULL,
> + fpga_done_fn,
> + fpga_clk_fn,
> + fpga_cs_fn,
> + fpga_wr_fn,
> + fpga_rdata_fn,
> + fpga_wdata_fn,
> + fpga_busy_fn,
> + fpga_abort_fn,
> + fpga_post_fn,
> +};
> +
> +Xilinx_desc fpga[CONFIG_FPGA_COUNT] = {
> + {Xilinx_Spartan3,
> + slave_parallel,
> + 1196128l/8,
> + (void *)&fpga_fns,
> + 0}
> +};
> +
> +/*
> + * Initialize GPIO port B before download
> + */
> +int fpga_pre_fn(int cookie)
> +{
> + /* Initialize GPIO pins */
> + gpio_set_value(ACFG_FPGA_PWR, 1);
> + imx_gpio_mode(ACFG_FPGA_INIT | GPIO_IN | GPIO_PUEN | GPIO_GPIO);
> + imx_gpio_mode(ACFG_FPGA_DONE | GPIO_IN | GPIO_PUEN | GPIO_GPIO);
> + imx_gpio_mode(ACFG_FPGA_PRG | GPIO_OUT | GPIO_PUEN | GPIO_GPIO);
> + imx_gpio_mode(ACFG_FPGA_CLK | GPIO_OUT | GPIO_PUEN | GPIO_GPIO);
> + imx_gpio_mode(ACFG_FPGA_RW | GPIO_OUT | GPIO_PUEN | GPIO_GPIO);
> + imx_gpio_mode(ACFG_FPGA_CS | GPIO_OUT | GPIO_PUEN | GPIO_GPIO);
> + imx_gpio_mode(ACFG_FPGA_SUSPEND|GPIO_OUT|GPIO_PUEN|GPIO_GPIO);
> + gpio_set_value(ACFG_FPGA_RESET, 1);
> + imx_gpio_mode(ACFG_FPGA_RESET | GPIO_OUT | GPIO_PUEN | GPIO_GPIO);
> + imx_gpio_mode(ACFG_FPGA_PWR | GPIO_OUT | GPIO_PUEN | GPIO_GPIO);
> + gpio_set_value(ACFG_FPGA_PRG, 1);
> + gpio_set_value(ACFG_FPGA_CLK, 1);
> + gpio_set_value(ACFG_FPGA_RW, 1);
> + gpio_set_value(ACFG_FPGA_CS, 1);
> + gpio_set_value(ACFG_FPGA_SUSPEND, 0);
> + gpio_set_value(ACFG_FPGA_PWR, 0);
> + udelay(30000); /*wait until supply started*/
> +
> + return cookie;
> +}
> +
> +/*
> + * Set the FPGA's active-low program line to the specified level
> + */
> +int fpga_pgm_fn(int assert, int flush, int cookie)
> +{
> + debug("%s:%d: FPGA PROGRAM %s", __func__, __LINE__,
> + assert ? "high" : "low");
> + gpio_set_value(ACFG_FPGA_PRG, !assert);
> + return assert;
> +}
> +
> +/*
> + * Set the FPGA's active-high clock line to the specified level
> + */
> +int fpga_clk_fn(int assert_clk, int flush, int cookie)
> +{
> + debug("%s:%d: FPGA CLOCK %s", __func__, __LINE__,
> + assert_clk ? "high" : "low");
> + gpio_set_value(ACFG_FPGA_CLK, !assert_clk);
> + return assert_clk;
> +}
> +
> +/*
> + * Test the state of the active-low FPGA INIT line. Return 1 on INIT
> + * asserted (low).
> + */
> +int fpga_init_fn(int cookie)
> +{
> + int value;
> + debug("%s:%d: INIT check... ", __func__, __LINE__);
> + value = gpio_get_value(ACFG_FPGA_INIT);
> + /* printf("init value read %x",value); */
> +#ifdef CONFIG_SYS_FPGA_IS_PROTO
> + return value;
> +#else
> + return !value;
> +#endif
> +}
> +
> +/*
> + * Test the state of the active-high FPGA DONE pin
> + */
> +int fpga_done_fn(int cookie)
> +{
> + debug("%s:%d: DONE check... %s", __func__, __LINE__,
> + gpio_get_value(ACFG_FPGA_DONE) ? "high" : "low");
> + return gpio_get_value(ACFG_FPGA_DONE) ? FPGA_SUCCESS : FPGA_FAIL;
> +}
> +
> +/*
> + * Set the FPGA's wr line to the specified level
> + */
> +int fpga_wr_fn(int assert_write, int flush, int cookie)
> +{
> + debug("%s:%d: FPGA RW... %s ", __func__, __LINE__,
> + assert_write ? "high" : "low");
> + gpio_set_value(ACFG_FPGA_RW, !assert_write);
> + return assert_write;
> +}
> +
> +int fpga_cs_fn(int assert_cs, int flush, int cookie)
> +{
> + debug("%s:%d: FPGA CS %s ", __func__, __LINE__,
> + assert_cs ? "high" : "low");
> + gpio_set_value(ACFG_FPGA_CS, !assert_cs);
> + return assert_cs;
> +}
> +
> +int fpga_rdata_fn(unsigned char *data, int cookie)
> +{
> + debug("%s:%d: FPGA READ DATA %02X ", __func__, __LINE__,
> + *((char *)ACFG_FPGA_RDATA));
> + *data = (unsigned char)
> + ((*((unsigned short *)ACFG_FPGA_RDATA))&0x00FF);
> + return *data;
> +}
> +
> +int fpga_wdata_fn(unsigned char data, int flush, int cookie)
> +{
> + debug("%s:%d: FPGA WRITE DATA %02X ", __func__, __LINE__,
> + data);
> + *((unsigned short *)ACFG_FPGA_WDATA) = data;
> + return data;
> +}
> +
> +int fpga_abort_fn(int cookie)
> +{
> + return fpga_post_fn(cookie);
> +}
> +
> +
> +int fpga_busy_fn(int cookie)
> +{
> + return 1;
> +}
> +
> +int fpga_post_fn(int cookie)
> +{
> + debug("%s:%d: FPGA POST ", __func__, __LINE__);
> +
> + imx_gpio_mode(ACFG_FPGA_RW | GPIO_PF | GPIO_PUEN);
> + imx_gpio_mode(ACFG_FPGA_CS | GPIO_PF | GPIO_PUEN);
> + imx_gpio_mode(ACFG_FPGA_CLK | GPIO_PF | GPIO_PUEN);
> + gpio_set_value(ACFG_FPGA_PRG, 1);
> + gpio_set_value(ACFG_FPGA_RESET, 0);
> + imx_gpio_mode(ACFG_FPGA_RESET | GPIO_OUT | GPIO_PUEN | GPIO_GPIO);
> + return cookie;
> +}
> +
> +void apf27_fpga_setup(void)
> +{
> + struct pll_regs *pll = (struct pll_regs *)IMX_PLL_BASE;
> + struct system_control_regs *system =
> + (struct system_control_regs *)IMX_SYSTEM_CTL_BASE;
> +
> + /* Configure FPGA CLKO */
> + writel(ACFG_CCSR_VAL, &pll->ccsr);
> +
> + /* Configure strentgh for FPGA */
> + writel(ACFG_DSCR10_VAL, &system->dscr10);
> + writel(ACFG_DSCR3_VAL, &system->dscr3);
> + writel(ACFG_DSCR7_VAL, &system->dscr7);
> + writel(ACFG_DSCR2_VAL, &system->dscr2);
> +}
> +
> +/*
> + * Initialize the fpga. Return 1 on success, 0 on failure.
> + */
> +void APF27_init_fpga(void)
> +{
> + int i;
> +
> + apf27_fpga_setup();
> +
> + fpga_init();
> +
> + for (i = 0; i < CONFIG_FPGA_COUNT; i++) {
> + debug("%s:%d: Adding fpga %d\n", __func__, __LINE__, i);
> + fpga_add(fpga_xilinx, &fpga[i]);
> + }
> +
> + return;
> +}
> diff --git a/board/armadeus/apf27/fpga.h b/board/armadeus/apf27/fpga.h
> new file mode 100644
> index 0000000..84a5244
> --- /dev/null
> +++ b/board/armadeus/apf27/fpga.h
> @@ -0,0 +1,25 @@
> +/*
> + * (C) Copyright 2002-2013
> + * Eric Jarrige <eric.jarr...@armadeus.org>
> + *
> + * based on the files by
> + * Rich Ireland, Enterasys Networks, rirel...@enterasys.com
> + * and
> + * Keith Outwater, keith_outwa...@mvis.com
> + *
> + * SPDX-License-Identifier: GPL-2.0+
> + */
> +extern void APF27_init_fpga(void);
> +
> +extern int fpga_pre_fn(int cookie);
> +extern int fpga_pgm_fn(int assert_pgm, int flush, int cookie);
> +extern int fpga_cs_fn(int assert_cs, int flush, int cookie);
> +extern int fpga_init_fn(int cookie);
> +extern int fpga_done_fn(int cookie);
> +extern int fpga_clk_fn(int assert_clk, int flush, int cookie);
> +extern int fpga_wr_fn(int assert_write, int flush, int cookie);
> +extern int fpga_rdata_fn(unsigned char *data, int cookie);
> +extern int fpga_wdata_fn(unsigned char data, int flush, int cookie);
> +extern int fpga_abort_fn(int cookie);
> +extern int fpga_post_fn(int cookie);
> +extern int fpga_busy_fn(int cookie);
> diff --git a/include/configs/apf27.h b/include/configs/apf27.h
> index 447be8d..37d8258 100644
> --- a/include/configs/apf27.h
> +++ b/include/configs/apf27.h
> @@ -292,6 +292,20 @@
> #define CONFIG_MII /* MII PHY management */
>
> /*
> + * FPGA
> + */
> +#ifndef CONFIG_SPL_BUILD
> +#define CONFIG_FPGA
> +#endif
> +#define CONFIG_FPGA_COUNT 1
> +#define CONFIG_FPGA_XILINX
> +#define CONFIG_FPGA_SPARTAN3
> +#define CONFIG_SYS_FPGA_WAIT 250 /* 250 ms s */
> +#define CONFIG_SYS_FPGA_PROG_FEEDBACK
> +#define CONFIG_SYS_FPGA_CHECK_CTRLC
> +#define CONFIG_SYS_FPGA_CHECK_ERROR
> +
> +/*
> * Fuses - IIM
> */
> #ifdef CONFIG_CMD_IMX_FUSE
>
Acked-by: Stefano babic <sba...@denx.de>
Best regards,
Stefano Babic
--
=====================================================================
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sba...@denx.de
=====================================================================
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
