From patchwork Thu Apr 14 13:11:47 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andre Schwarz X-Patchwork-Id: 91235 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id E509E1007D1 for ; Thu, 14 Apr 2011 23:12:49 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 3F9F82840A; Thu, 14 Apr 2011 15:12:27 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id s80h8bVclTXT; Thu, 14 Apr 2011 15:12:27 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 6B0AB2840B; Thu, 14 Apr 2011 15:12:05 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 3759B283E4 for ; Thu, 14 Apr 2011 15:12:00 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id WtW5t0oay7Oo for ; Thu, 14 Apr 2011 15:11:55 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mail2.matrix-vision.com (mail2.matrix-vision.com [85.214.244.251]) by theia.denx.de (Postfix) with ESMTPS id 009D32839A for ; Thu, 14 Apr 2011 15:11:53 +0200 (CEST) Received: from mail2.matrix-vision.com (localhost [127.0.0.1]) by mail2.matrix-vision.com (Postfix) with ESMTP id 5D0B13F64C; Thu, 14 Apr 2011 15:11:51 +0200 (CEST) Received: from erinome (g2.matrix-vision.com [80.152.136.245]) by mail2.matrix-vision.com (Postfix) with ESMTPA id 9519E3F61E; Thu, 14 Apr 2011 15:11:50 +0200 (CEST) Received: from erinome (localhost [127.0.0.1]) by erinome (Postfix) with ESMTP id 210BC6F9B; Thu, 14 Apr 2011 15:11:50 +0200 (CEST) Received: by erinome (Postfix, from userid 108) id 1667A6FA0; Thu, 14 Apr 2011 15:11:50 +0200 (CEST) Received: from localhost.localdomain (host65-223.intern.matrix-vision.de [192.168.65.223]) by erinome (Postfix) with ESMTPA id 0667D6F9B; Thu, 14 Apr 2011 15:11:50 +0200 (CEST) From: Andre Schwarz To: U-Boot@lists.denx.de Date: Thu, 14 Apr 2011 15:11:47 +0200 Message-Id: <1302786707-15359-5-git-send-email-andre.schwarz@matrix-vision.de> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1302786707-15359-1-git-send-email-andre.schwarz@matrix-vision.de> References: <1302786707-15359-1-git-send-email-andre.schwarz@matrix-vision.de> X-AV-Checked: ClamAV using ClamSMTP (erinome) X-AV-Checked: ClamAV using ClamSMTP (mail2) Cc: kim.phillips@freescale.com Subject: [U-Boot] [PATCH 4/4] MergerBox: add board specific files in vendor dir. X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.9 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de Signed-off-by: Andre Schwarz --- board/matrix_vision/mergerbox/Makefile | 51 ++++++ board/matrix_vision/mergerbox/fpga.c | 175 +++++++++++++++++++++ board/matrix_vision/mergerbox/fpga.h | 30 ++++ board/matrix_vision/mergerbox/mergerbox.c | 241 +++++++++++++++++++++++++++++ board/matrix_vision/mergerbox/mergerbox.h | 67 ++++++++ board/matrix_vision/mergerbox/pci.c | 134 ++++++++++++++++ board/matrix_vision/mergerbox/sm107.c | 126 +++++++++++++++ 7 files changed, 824 insertions(+), 0 deletions(-) create mode 100644 board/matrix_vision/mergerbox/Makefile create mode 100644 board/matrix_vision/mergerbox/fpga.c create mode 100644 board/matrix_vision/mergerbox/fpga.h create mode 100644 board/matrix_vision/mergerbox/mergerbox.c create mode 100644 board/matrix_vision/mergerbox/mergerbox.h create mode 100644 board/matrix_vision/mergerbox/pci.c create mode 100644 board/matrix_vision/mergerbox/sm107.c diff --git a/board/matrix_vision/mergerbox/Makefile b/board/matrix_vision/mergerbox/Makefile new file mode 100644 index 0000000..2b78c98 --- /dev/null +++ b/board/matrix_vision/mergerbox/Makefile @@ -0,0 +1,51 @@ +# +# (C) Copyright 2006 +# Wolfgang Denk, DENX Software Engineering, wd@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., 59 Temple Place, Suite 330, Boston, +# MA 02111-1307 USA +# + +include $(TOPDIR)/config.mk + +LIB = $(obj)lib$(BOARD).o + +COBJS-y += $(BOARD).o pci.o fpga.o sm107.o + +COBJS := $(COBJS-y) +SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) +OBJS := $(addprefix $(obj),$(COBJS)) +SOBJS := $(addprefix $(obj),$(SOBJS)) + +$(LIB): $(obj).depend $(OBJS) + $(AR) $(ARFLAGS) $@ $(OBJS) + +clean: + rm -f $(SOBJS) $(OBJS) + +distclean: clean + rm -f $(LIB) core *.bak $(obj).depend + +######################################################################### + +# defines $(obj).depend target +include $(SRCTREE)/rules.mk + +sinclude $(obj).depend + +######################################################################### diff --git a/board/matrix_vision/mergerbox/fpga.c b/board/matrix_vision/mergerbox/fpga.c new file mode 100644 index 0000000..673bc2c --- /dev/null +++ b/board/matrix_vision/mergerbox/fpga.c @@ -0,0 +1,175 @@ +/* + * (C) Copyright 2002 + * Rich Ireland, Enterasys Networks, rireland@enterasys.com. + * Keith Outwater, keith_outwater@mvis.com. + * + * (C) Copyright 2011 + * Andre Schwarz, Matrix Vision GmbH, andre.schwarz@matrix-vision.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., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + * + */ + +#include +#include +#include +#include "mergerbox.h" +#include "fpga.h" + +Altera_CYC2_Passive_Serial_fns altera_fns = { + fpga_null_fn, + fpga_config_fn, + fpga_status_fn, + fpga_done_fn, + fpga_wr_fn, + fpga_null_fn, + fpga_null_fn, +}; + +Altera_desc cyclone2 = { + Altera_CYC2, + passive_serial, + Altera_EP2C20_SIZE, + (void *) &altera_fns, + NULL, + 0 +}; + +DECLARE_GLOBAL_DATA_PTR; + +int mergerbox_init_fpga(void) +{ + debug("Initialize FPGA interface\n"); + fpga_init(); + fpga_add(fpga_altera, &cyclone2); + + return 1; +} + +int fpga_null_fn(int cookie) +{ + return 0; +} + +int fpga_config_fn(int assert, int flush, int cookie) +{ + volatile immap_t *im = (immap_t *)CONFIG_SYS_IMMR; + volatile gpio83xx_t *gpio = (gpio83xx_t *)&im->gpio[0]; + u32 dvo = gpio->dat; + + dvo &= ~FPGA_CONFIG; + gpio->dat = dvo; + udelay(5); + dvo |= FPGA_CONFIG; + gpio->dat = dvo; + + return assert; +} + +int fpga_done_fn(int cookie) +{ + volatile immap_t *im = (immap_t *)CONFIG_SYS_IMMR; + volatile gpio83xx_t *gpio = (gpio83xx_t *)&im->gpio[0]; + int result = 0; + + udelay(10); + debug("CONF_DONE check ... "); + if (gpio->dat & FPGA_CONF_DONE) { + debug("high\n"); + result = 1; + } else + debug("low\n"); + + return result; +} + +int fpga_status_fn(int cookie) +{ + volatile immap_t *im = (immap_t *)CONFIG_SYS_IMMR; + volatile gpio83xx_t *gpio = (gpio83xx_t *)&im->gpio[0]; + int result = 0; + + debug("STATUS check ... "); + if (gpio->dat & FPGA_STATUS) { + debug("high\n"); + result = 1; + } else + debug("low\n"); + + return result; +} + +int fpga_clk_fn(int assert_clk, int flush, int cookie) +{ + volatile immap_t *im = (immap_t *)CONFIG_SYS_IMMR; + volatile gpio83xx_t *gpio = (gpio83xx_t *)&im->gpio[0]; + u32 dvo = gpio->dat; + + debug("CLOCK %s\n", assert_clk ? "high" : "low"); + if (assert_clk) + dvo |= FPGA_CCLK; + else + dvo &= ~FPGA_CCLK; + + if (flush) + gpio->dat = dvo; + + return assert_clk; +} + +static inline int _write_fpga(u8 val, int dump) +{ + volatile immap_t *im = (immap_t *)CONFIG_SYS_IMMR; + volatile gpio83xx_t *gpio = (gpio83xx_t *)&im->gpio[0]; + int i; + u32 dvo = gpio->dat; + + if (dump) + debug(" %02x -> ", val); + for (i = 0; i < 8; i++) { + dvo &= ~FPGA_CCLK; + gpio->dat = dvo; + dvo &= ~FPGA_DIN; + if (dump) + debug("%d ", val&1); + if (val & 1) + dvo |= FPGA_DIN; + gpio->dat = dvo; + dvo |= FPGA_CCLK; + gpio->dat = dvo; + val >>= 1; + } + if (dump) + debug("\n"); + + return 0; +} + +int fpga_wr_fn(void *buf, size_t len, int flush, int cookie) +{ + unsigned char *data = (unsigned char *) buf; + int i; + + debug("fpga_wr: buf %p / size %d\n", buf, len); + for (i = 0; i < len; i++) + _write_fpga(data[i], 0); + debug("\n"); + + return FPGA_SUCCESS; +} diff --git a/board/matrix_vision/mergerbox/fpga.h b/board/matrix_vision/mergerbox/fpga.h new file mode 100644 index 0000000..fccff9f --- /dev/null +++ b/board/matrix_vision/mergerbox/fpga.h @@ -0,0 +1,30 @@ +/* + * 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 + * + */ + +extern int mergerbox_init_fpga(void); + +extern int fpga_pgm_fn(int assert_pgm, int flush, int cookie); +extern int fpga_status_fn(int cookie); +extern int fpga_config_fn(int assert, int flush, 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(void *buf, size_t len, int flush, int cookie); +extern int fpga_null_fn(int cookie); diff --git a/board/matrix_vision/mergerbox/mergerbox.c b/board/matrix_vision/mergerbox/mergerbox.c new file mode 100644 index 0000000..8616205 --- /dev/null +++ b/board/matrix_vision/mergerbox/mergerbox.c @@ -0,0 +1,241 @@ +/* + * Copyright (C) 2007 Freescale Semiconductor, Inc. + * + * Copyright (C) 2011 Matrix Vision GmbH + * Andre Schwarz + * + * 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. + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include "mergerbox.h" +#include "fpga.h" +#include "../common/mv_common.h" + +static void setup_serdes(void) +{ + fsl_setup_serdes(CONFIG_FSL_SERDES1, FSL_SERDES_PROTO_SATA, + FSL_SERDES_CLK_100, FSL_SERDES_VDD_1V); + fsl_setup_serdes(CONFIG_FSL_SERDES2, FSL_SERDES_PROTO_PEX, + FSL_SERDES_CLK_100, FSL_SERDES_VDD_1V); +} + +#if defined(CONFIG_SYS_DRAM_TEST) +int testdram(void) +{ + uint *pstart = (uint *) CONFIG_SYS_MEMTEST_START; + uint *pend = (uint *) CONFIG_SYS_MEMTEST_END; + uint *p; + + printf("Testing DRAM from 0x%08x to 0x%08x\n", + CONFIG_SYS_MEMTEST_START, CONFIG_SYS_MEMTEST_END); + + printf("DRAM test phase 1:\n"); + for (p = pstart; p < pend; p++) + *p = 0xaaaaaaaa; + + for (p = pstart; p < pend; p++) { + if (*p != 0xaaaaaaaa) { + printf("DRAM test fails at: %08x\n", (uint) p); + return 1; + } + } + + printf("DRAM test phase 2:\n"); + for (p = pstart; p < pend; p++) + *p = 0x55555555; + + for (p = pstart; p < pend; p++) { + if (*p != 0x55555555) { + printf("DRAM test fails at: %08x\n", (uint) p); + return 1; + } + } + + printf("DRAM test passed.\n"); + return 0; +} +#endif + +phys_size_t initdram(int board_type) +{ + u32 msize; + + volatile immap_t *immr = (immap_t *)CONFIG_SYS_IMMR; + volatile clk83xx_t *clk = (clk83xx_t *)&immr->clk; + + /* Enable PCI_CLK[0:1] */ + clk->occr |= 0xc0000000; + udelay(2000); + +#if defined(CONFIG_SPD_EEPROM) + msize = spd_sdram(); +#else + immap_t *im = (immap_t *) CONFIG_SYS_IMMR; + u32 msize_log2; + + msize = CONFIG_SYS_DDR_SIZE; + msize_log2 = __ilog2(msize); + + im->sysconf.ddrlaw[0].bar = CONFIG_SYS_DDR_SDRAM_BASE & 0xfffff000; + im->sysconf.ddrlaw[0].ar = LBLAWAR_EN | (msize_log2 - 1); + + im->sysconf.ddrcdr = CONFIG_SYS_DDRCDR_VALUE; + udelay(50000); + + im->ddr.sdram_clk_cntl = CONFIG_SYS_DDR_SDRAM_CLK_CNTL; + udelay(1000); + + im->ddr.csbnds[0].csbnds = CONFIG_SYS_DDR_CS0_BNDS; + im->ddr.cs_config[0] = CONFIG_SYS_DDR_CS0_CONFIG; + udelay(1000); + + im->ddr.timing_cfg_0 = CONFIG_SYS_DDR_TIMING_0; + im->ddr.timing_cfg_1 = CONFIG_SYS_DDR_TIMING_1; + im->ddr.timing_cfg_2 = CONFIG_SYS_DDR_TIMING_2; + im->ddr.timing_cfg_3 = CONFIG_SYS_DDR_TIMING_3; + im->ddr.sdram_cfg = CONFIG_SYS_DDR_SDRAM_CFG; + im->ddr.sdram_cfg2 = CONFIG_SYS_DDR_SDRAM_CFG2; + im->ddr.sdram_mode = CONFIG_SYS_DDR_MODE; + im->ddr.sdram_mode2 = CONFIG_SYS_DDR_MODE2; + im->ddr.sdram_interval = CONFIG_SYS_DDR_INTERVAL; + __asm__ __volatile__("sync"); + udelay(1000); + + im->ddr.sdram_cfg |= SDRAM_CFG_MEM_EN; + udelay(2000); +#endif + setup_serdes(); + + return msize << 20; +} + +int checkboard(void) +{ + puts("Board: Matrix Vision MergerBox\n"); + + return 0; +} + +int misc_init_r(void) +{ + u16 dim; + int result; + volatile immap_t *immr = (immap_t *)CONFIG_SYS_IMMR; + volatile gpio83xx_t *gpio = (gpio83xx_t *)&immr->gpio[1]; + unsigned char mac[6], mac_verify[6]; + char *s = getenv("reset_env"); + + for (dim = 10; dim < 180; dim += 5) { + mergerbox_tft_dim(dim); + udelay(100000); + } + + if (s) + mv_reset_environment(); + + i2c_read(SPD_EEPROM_ADDRESS, 0x80, 2, mac, sizeof(mac)); + + /* check if Matrix Vision prefix present and export to env */ + if (mac[0] == 0x00 && mac[1] == 0x0c && mac[2] == 0x8d) { + printf("valid MAC found in eeprom: %pM\n", mac); + eth_setenv_enetaddr("ethaddr", mac); + } else { + printf("no valid MAC found in eeprom.\n"); + + /* no: check the env */ + if (!eth_getenv_enetaddr("ethaddr", mac)) { + printf("no valid MAC found in env either.\n"); + /* TODO: ask for valid MAC */ + } else { + printf("valid MAC found in env: %pM\n", mac); + printf("updating MAC in eeprom.\n"); + + do { + result = test_and_clear_bit(20, &gpio->dat); + if (result) + printf("unprotect EEPROM failed !\n"); + udelay(20000); + } while(result); + + i2c_write(SPD_EEPROM_ADDRESS, 0x80, 2, mac, 6); + udelay(20000); + + do { + result = test_and_set_bit(20, &gpio->dat); + if (result) + printf("protect EEPROM failed !\n"); + udelay(20000); + } while(result); + + printf("verify MAC %pM ... ", mac); + i2c_read(SPD_EEPROM_ADDRESS, 0x80, 2, mac_verify, 6); + + if (!strncmp((char *)mac, (char *)mac_verify, 6)) + printf("ok.\n"); + else + /* TODO: retry or do something useful */ + printf("FAILED (got %pM) !\n", mac_verify); + } + } + + return 0; +} + +int spi_cs_is_valid(unsigned int bus, unsigned int cs) +{ + return bus == 0 && cs == 0; +} + +void spi_cs_activate(struct spi_slave *slave) +{ + volatile gpio83xx_t *iopd = &((immap_t *)CONFIG_SYS_IMMR)->gpio[0]; + + iopd->dat &= ~TFT_SPI_CPLD_CS; +} + +void spi_cs_deactivate(struct spi_slave *slave) +{ + volatile gpio83xx_t *iopd = &((immap_t *)CONFIG_SYS_IMMR)->gpio[0]; + + iopd->dat |= TFT_SPI_CPLD_CS; +} + +/* control backlight pwm (display brightness). + * allow values 0-250 with 0 = turn off and 250 = max brightness + */ +void mergerbox_tft_dim(u16 value) +{ + struct spi_slave *slave; + u16 din; + u16 dout = 0; + + if (value > 0 && value < 250) + dout = 0x4000 | value; + + slave = spi_setup_slave(0, 0, 1000000, SPI_MODE_0 | SPI_CS_HIGH); + spi_claim_bus(slave); + spi_xfer(slave, 16, &dout, &din, SPI_XFER_BEGIN | SPI_XFER_END); + spi_release_bus(slave); + spi_free_slave(slave); +} + +void ft_board_setup(void *blob, bd_t *bd) +{ + ft_cpu_setup(blob, bd); + fdt_fixup_dr_usb(blob, bd); + ft_pci_setup(blob, bd); +} diff --git a/board/matrix_vision/mergerbox/mergerbox.h b/board/matrix_vision/mergerbox/mergerbox.h new file mode 100644 index 0000000..d666d07 --- /dev/null +++ b/board/matrix_vision/mergerbox/mergerbox.h @@ -0,0 +1,67 @@ +/* + * Copyright (C) 2011 Matrix Vision GmbH + * Andre Schwarz + * + * 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. + */ + +#ifndef __MERGERBOX_H__ +#define __MERGERBOX_H__ + +#define MV_GPIO + +/* + * GPIO Bank 1 + */ +#define TFT_SPI_EN (0x80000000>>0) +#define FPGA_CONFIG (0x80000000>>1) +#define FPGA_STATUS (0x80000000>>2) +#define FPGA_CONF_DONE (0x80000000>>3) +#define FPGA_DIN (0x80000000>>4) +#define FPGA_CCLK (0x80000000>>5) +#define MAN_RST (0x80000000>>6) +#define FPGA_SYS_RST (0x80000000>>7) +#define WD_WDI (0x80000000>>8) +#define TFT_RST (0x80000000>>9) +#define HISCON_GPIO1 (0x80000000>>10) +#define HISCON_GPIO2 (0x80000000>>11) +#define B2B_GPIO2 (0x80000000>>12) +#define CCU_GPIN (0x80000000>>13) +#define CCU_GPOUT (0x80000000>>14) +#define TFT_GPIO0 (0x80000000>>15) +#define TFT_GPIO1 (0x80000000>>16) +#define TFT_GPIO2 (0x80000000>>17) +#define TFT_GPIO3 (0x80000000>>18) +#define B2B_GPIO0 (0x80000000>>19) +#define B2B_GPIO1 (0x80000000>>20) +#define TFT_SPI_CPLD_CS (0x80000000>>21) +#define TFT_SPI_CS (0x80000000>>22) +#define CCU_PWR_EN (0x80000000>>23) +#define B2B_GPIO3 (0x80000000>>24) +#define CCU_PWR_STAT (0x80000000>>25) + +#define MV_GPIO1_DAT (FPGA_CONFIG|CCU_PWR_EN|TFT_SPI_CPLD_CS) +#define MV_GPIO1_OUT (TFT_SPI_EN|FPGA_CONFIG|FPGA_DIN|FPGA_CCLK|CCU_PWR_EN| \ + TFT_SPI_CPLD_CS) +#define MV_GPIO1_ODE (FPGA_CONFIG|MAN_RST) + +/* + * GPIO Bank 2 + */ +#define SPI_FLASH_WP (0x80000000>>10) +#define SYS_EEPROM_WP (0x80000000>>11) +#define SPI_FLASH_CS (0x80000000>>22) + +#define MV_GPIO2_DAT (SYS_EEPROM_WP|SPI_FLASH_CS) +#define MV_GPIO2_OUT (SPI_FLASH_WP|SYS_EEPROM_WP|SPI_FLASH_CS) +#define MV_GPIO2_ODE 0 + +void mergerbox_tft_dim(u16 value); + +#endif diff --git a/board/matrix_vision/mergerbox/pci.c b/board/matrix_vision/mergerbox/pci.c new file mode 100644 index 0000000..8bc8342 --- /dev/null +++ b/board/matrix_vision/mergerbox/pci.c @@ -0,0 +1,134 @@ +/* + * Copyright (C) 2006-2009 Freescale Semiconductor, Inc. + * + * Copyright (C) 2011 Matrix Vision GmbH + * Andre Schwarz + * + * 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. + */ + +#include +#include +#include +#include +#include +#include "mergerbox.h" +#include "fpga.h" +#include "../common/mv_common.h" + +static struct pci_region pci_regions[] = { + { + .bus_start = CONFIG_SYS_PCI_MEM_BASE, + .phys_start = CONFIG_SYS_PCI_MEM_PHYS, + .size = CONFIG_SYS_PCI_MEM_SIZE, + .flags = PCI_REGION_MEM | PCI_REGION_PREFETCH + }, + { + .bus_start = CONFIG_SYS_PCI_MMIO_BASE, + .phys_start = CONFIG_SYS_PCI_MMIO_PHYS, + .size = CONFIG_SYS_PCI_MMIO_SIZE, + .flags = PCI_REGION_MEM + }, + { + .bus_start = CONFIG_SYS_PCI_IO_BASE, + .phys_start = CONFIG_SYS_PCI_IO_PHYS, + .size = CONFIG_SYS_PCI_IO_SIZE, + .flags = PCI_REGION_IO + } +}; + +static struct pci_region pcie_regions_0[] = { + { + .bus_start = CONFIG_SYS_PCIE1_MEM_BASE, + .phys_start = CONFIG_SYS_PCIE1_MEM_PHYS, + .size = CONFIG_SYS_PCIE1_MEM_SIZE, + .flags = PCI_REGION_MEM, + }, + { + .bus_start = CONFIG_SYS_PCIE1_IO_BASE, + .phys_start = CONFIG_SYS_PCIE1_IO_PHYS, + .size = CONFIG_SYS_PCIE1_IO_SIZE, + .flags = PCI_REGION_IO, + }, +}; + +static struct pci_region pcie_regions_1[] = { + { + .bus_start = CONFIG_SYS_PCIE2_MEM_BASE, + .phys_start = CONFIG_SYS_PCIE2_MEM_PHYS, + .size = CONFIG_SYS_PCIE2_MEM_SIZE, + .flags = PCI_REGION_MEM, + }, + { + .bus_start = CONFIG_SYS_PCIE2_IO_BASE, + .phys_start = CONFIG_SYS_PCIE2_IO_PHYS, + .size = CONFIG_SYS_PCIE2_IO_SIZE, + .flags = PCI_REGION_IO, + }, +}; + +void pci_init_board(void) +{ + volatile immap_t *immr = (immap_t *)CONFIG_SYS_IMMR; + volatile sysconf83xx_t *sysconf = &immr->sysconf; + volatile clk83xx_t *clk = (clk83xx_t *)&immr->clk; + volatile law83xx_t *pci_law = immr->sysconf.pcilaw; + volatile law83xx_t *pcie_law = sysconf->pcielaw; + struct pci_region *reg[] = { pci_regions }; + struct pci_region *pcie_reg[] = { pcie_regions_0, pcie_regions_1, }; + + volatile gpio83xx_t *gpio; + gpio = (gpio83xx_t *)&immr->gpio[0]; + + gpio->dat = MV_GPIO1_DAT; + gpio->odr = MV_GPIO1_ODE; + gpio->dir = MV_GPIO1_OUT; + + gpio = (gpio83xx_t *)&immr->gpio[1]; + + gpio->dat = MV_GPIO2_DAT; + gpio->odr = MV_GPIO2_ODE; + gpio->dir = MV_GPIO2_OUT; + + printf("SICRH / SICRL : 0x%08x / 0x%08x\n", immr->sysconf.sicrh, + immr->sysconf.sicrl); + + /* Enable PCI_CLK[0:1] */ + clk->occr |= 0xc0000000; + udelay(2000); + + mergerbox_init_fpga(); + mv_load_fpga(); + + mergerbox_tft_dim(0); + + /* Configure PCI Local Access Windows */ + pci_law[0].bar = CONFIG_SYS_PCI_MEM_PHYS & LAWBAR_BAR; + pci_law[0].ar = LBLAWAR_EN | LBLAWAR_512MB; + + pci_law[1].bar = CONFIG_SYS_PCI_IO_PHYS & LAWBAR_BAR; + pci_law[1].ar = LBLAWAR_EN | LBLAWAR_1MB; + + udelay(2000); + + mpc83xx_pci_init(1, reg); + + /* Deassert the resets in the control register */ + out_be32(&sysconf->pecr1, 0xE0008000); + out_be32(&sysconf->pecr2, 0xE0008000); + udelay(2000); + + out_be32(&pcie_law[0].bar, CONFIG_SYS_PCIE1_BASE & LAWBAR_BAR); + out_be32(&pcie_law[0].ar, LBLAWAR_EN | LBLAWAR_512MB); + + out_be32(&pcie_law[1].bar, CONFIG_SYS_PCIE2_BASE & LAWBAR_BAR); + out_be32(&pcie_law[1].ar, LBLAWAR_EN | LBLAWAR_512MB); + + mpc83xx_pcie_init(2, pcie_reg); +} diff --git a/board/matrix_vision/mergerbox/sm107.c b/board/matrix_vision/mergerbox/sm107.c new file mode 100644 index 0000000..db716b2 --- /dev/null +++ b/board/matrix_vision/mergerbox/sm107.c @@ -0,0 +1,126 @@ +/* + * Copyright (C) 2011 Matrix Vision GmbH + * Andre Schwarz + * + * 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. + */ + +#include +#include +#include +#include +#include +#include +#include "../common/mv_common.h" + +#ifdef CONFIG_VIDEO +static const SMI_REGS init_regs_800x480[] = { + /* set endianess to little endian */ + {0x0005c, 0x00000000}, + /* PCI drive 12mA */ + {0x00004, 0x42401001}, + /* current clock */ + {0x0003c, 0x310a1818}, + /* clocks for pm0... */ + {0x00040, 0x0002184f}, + {0x00044, 0x2a1a0a01}, + /* GPIO */ + {0x10008, 0x00000000}, + {0x1000C, 0x00000000}, + /* panel control regs */ + {0x80000, 0x0f017106}, + {0x80004, 0x0}, + {0x80008, 0x0}, + {0x8000C, 0x00000000}, + {0x80010, 0x0c800c80}, + /* width 0x320 */ + {0x80014, 0x03200000}, + /* height 0x1e0 */ + {0x80018, 0x01E00000}, + {0x8001C, 0x0}, + {0x80020, 0x01df031f}, + {0x80024, 0x041f031f}, + {0x80028, 0x00800347}, + {0x8002C, 0x020c01df}, + {0x80030, 0x000201e9}, + {0x80200, 0x00000000}, + /* ZV[0:7] */ + {0x00008, 0x00ff0000}, + /* 24-Bit TFT */ + {0x0000c, 0x3f000000}, + {0, 0} +}; + +/* + * Returns SM107 register base address. First thing called in the driver. + */ +unsigned int board_video_init(void) +{ + pci_dev_t devbusfn; + u32 addr; + + devbusfn = pci_find_device(PCI_VENDOR_SM, PCI_DEVICE_SM501, 0); + if (devbusfn != -1) { + pci_read_config_dword(devbusfn, PCI_BASE_ADDRESS_1, + (u32 *)&addr); + return addr & 0xfffffffe; + } + + return 0; +} + +/* + * Called after initializing the SM501 and before clearing the screen. + */ +void board_validate_screen(unsigned int base) +{ +} + +/* + * Returns SM107 framebuffer address + */ +unsigned int board_video_get_fb(void) +{ + pci_dev_t devbusfn; + u32 addr; + + devbusfn = pci_find_device(PCI_VENDOR_SM, PCI_DEVICE_SM501, 0); + if (devbusfn != -1) { + pci_read_config_dword(devbusfn, PCI_BASE_ADDRESS_0, + (u32 *)&addr); + addr &= 0xfffffffe; +#ifdef CONFIG_VIDEO_SM501_FBMEM_OFFSET + addr += CONFIG_VIDEO_SM501_FBMEM_OFFSET; +#endif + return addr; + } + + printf("board_video_get_fb(): FAILED\n"); + + return 0; +} + +/* + * Return a pointer to the initialization sequence. + */ +const SMI_REGS *board_get_regs(void) +{ + return init_regs_800x480; +} + +int board_get_width(void) +{ + return 800; +} + +int board_get_height(void) +{ + return 480; +} +#endif