Skip to contentSkip to conversation

MPC5200: Add initial support for Matrix Vision mvSMR board

PATCH New Andre Schwarz 2 participants 3 messages Mar 23, 2010 – Mar 24, 2010 Kbuild

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 MPC5200: Add initial support for Matrix Vision mvSMR board

Add initial support for Matrix Vision mvSMR board based on MPC5200B.

---
 CREDITS                              |    2 +-
 MAINTAINERS                          |    1 +
 MAKEALL                              |    1 +
 Makefile                             |    5 +
 board/matrix_vision/mvsmr/Makefile   |   51 ++++++
 board/matrix_vision/mvsmr/autoscript |   43 +++++
 board/matrix_vision/mvsmr/config.mk  |   31 ++++
 board/matrix_vision/mvsmr/fpga.c     |  151 +++++++++++++++++
 board/matrix_vision/mvsmr/fpga.h     |   32 ++++
 board/matrix_vision/mvsmr/mvsmr.c    |  276 +++++++++++++++++++++++++++++++
 board/matrix_vision/mvsmr/mvsmr.h    |   43 +++++
 board/matrix_vision/mvsmr/u-boot.lds |  138 ++++++++++++++++
 doc/README.mvsmr                     |   55 +++++++
 include/configs/MVSMR.h              |  295 ++++++++++++++++++++++++++++++++++
 14 files changed, 1123 insertions(+), 1 deletions(-)
 create mode 100644 board/matrix_vision/mvsmr/Makefile
 create mode 100644 board/matrix_vision/mvsmr/autoscript
 create mode 100644 board/matrix_vision/mvsmr/config.mk
 create mode 100644 board/matrix_vision/mvsmr/fpga.c
 create mode 100644 board/matrix_vision/mvsmr/fpga.h
 create mode 100644 board/matrix_vision/mvsmr/mvsmr.c
 create mode 100644 board/matrix_vision/mvsmr/mvsmr.h
 create mode 100644 board/matrix_vision/mvsmr/u-boot.lds
 create mode 100644 doc/README.mvsmr
 create mode 100644 include/configs/MVSMR.h
CREDITS +1 -1
index 2471029..cc96d87 100644
@@ -437,7 +437,7 @@ D: FADS823 configuration, MPC823 video support, I2C, wireless keyboard, lots mor
 
 N: Andre Schwarz
 E: andre.schwarz at matrix-vision.de
-D: Support for Matrix Vision boards (MVBLM7/MVBC_P)
+D: Support for Matrix Vision boards (MVBLM7/MVBC_P/MVSMR)
 
 N: Robert Schwebel
 E: r.schwebel at pengutronix.de
MAINTAINERS +1 -0
index 0340c19..a7d55f9 100644
@@ -424,6 +424,7 @@ Andre Schwarz <[email protected]>
 
 	mvbc_p		MPC5200
 	mvblm7		MPC8343
+	mvsmr		MPC5200
 
 Jon Smirl <[email protected]>
 
MAKEALL +1 -0
index 1949985..ce4fe66 100755
@@ -71,6 +71,7 @@ LIST_5xxx="		\
 	motionpro	\
 	munices		\
 	MVBC_P		\
+	MVSMR		\
 	o2dnt		\
 	pcm030		\
 	pf5200		\
Makefile +5 -0
index ce77e10..2d2d6d3 100644
@@ -676,6 +676,11 @@ MVBC_P_config: unconfig
 	{   	echo "#define CONFIG_MVBC_P" 	>>$(obj)include/config.h; }
 	@$(MKCONFIG) -n $@ -a MVBC_P ppc mpc5xxx mvbc_p matrix_vision
 
+MVSMR_config: unconfig
+	@mkdir -p $(obj)include
+	@mkdir -p $(obj)board/matrix_vision/mvsmr
+	@$(MKCONFIG) $(@:_config=) ppc mpc5xxx mvsmr matrix_vision
+
 o2dnt_config:	unconfig
 	@$(MKCONFIG) o2dnt ppc mpc5xxx o2dnt
 
board/matrix_vision/mvsmr/Makefile new file +51 -0

51 lines not on this page · raw message

board/matrix_vision/mvsmr/autoscript new file +43 -0

43 lines not on this page · raw message

board/matrix_vision/mvsmr/config.mk new file +31 -0
new file mode 100644
index 0000000..b1da812
@@ -0,0 +1,31 @@
+#
+# (C) Copyright 2003
+# 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., 59 Temple Place, Suite 330, Boston,
+# MA 02111-1307 USA
+#
+
+sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp
+
+ifndef TEXT_BASE
+TEXT_BASE = 0xFF800000
+endif
+
+PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR)/board
+LDSCRIPT := $(SRCTREE)/board/matrix_vision/mvsmr/u-boot.lds
board/matrix_vision/mvsmr/fpga.c new file +151 -0

151 lines not on this page · raw message

board/matrix_vision/mvsmr/fpga.h new file +32 -0
new file mode 100644
index 0000000..ee690e6
@@ -0,0 +1,32 @@
+/*
+ * (C) Copyright 2008
+ * Andre Schwarz, Matrix Vision GmbH, andre.schwarz at 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
+ *
+ */
+
+extern int mvsmr_init_fpga(void);
+
+extern int fpga_pgm_fn(int assert_pgm, int flush, int cookie);
+extern int fpga_init_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_done_fn(int cookie);
+extern int fpga_pre_config_fn(int cookie);
board/matrix_vision/mvsmr/mvsmr.c new file +276 -0

276 lines not on this page · raw message

board/matrix_vision/mvsmr/mvsmr.h new file +43 -0

43 lines not on this page · raw message

board/matrix_vision/mvsmr/u-boot.lds new file +138 -0

138 lines not on this page · raw message

doc/README.mvsmr new file +55 -0

55 lines not on this page · raw message

include/configs/MVSMR.h new file +295 -0

295 lines not on this page · raw message

Signature · 1 line
1.6.0.4
#1 lore raw

PATCH 1/1 MPC5200: Add initial support for Matrix Vision mvSMR board

Hi Andre,

just a few obligatory remarks...

Quoted 30 lines

Add initial support for Matrix Vision mvSMR board based on MPC5200B.

---
 CREDITS                              |    2 +-
 MAINTAINERS                          |    1 +
 MAKEALL                              |    1 +
 Makefile                             |    5 +
 board/matrix_vision/mvsmr/Makefile   |   51 ++++++
 board/matrix_vision/mvsmr/autoscript |   43 +++++
 board/matrix_vision/mvsmr/config.mk  |   31 ++++
 board/matrix_vision/mvsmr/fpga.c     |  151 +++++++++++++++++
 board/matrix_vision/mvsmr/fpga.h     |   32 ++++
 board/matrix_vision/mvsmr/mvsmr.c    |  276 +++++++++++++++++++++++++++++++
 board/matrix_vision/mvsmr/mvsmr.h    |   43 +++++
 board/matrix_vision/mvsmr/u-boot.lds |  138 ++++++++++++++++
 doc/README.mvsmr                     |   55 +++++++
 include/configs/MVSMR.h              |  295 ++++++++++++++++++++++++++++++++++
 14 files changed, 1123 insertions(+), 1 deletions(-)
 create mode 100644 board/matrix_vision/mvsmr/Makefile
 create mode 100644 board/matrix_vision/mvsmr/autoscript
 create mode 100644 board/matrix_vision/mvsmr/config.mk
 create mode 100644 board/matrix_vision/mvsmr/fpga.c
 create mode 100644 board/matrix_vision/mvsmr/fpga.h
 create mode 100644 board/matrix_vision/mvsmr/mvsmr.c
 create mode 100644 board/matrix_vision/mvsmr/mvsmr.h
 create mode 100644 board/matrix_vision/mvsmr/u-boot.lds
 create mode 100644 doc/README.mvsmr
 create mode 100644 include/configs/MVSMR.h

[...]

Quoted 35 lines
board/matrix_vision/mvsmr/fpga.c new file +29 -0
new file mode 100644
index 0000000..3fe55f2
@@ -0,0 +1,151 @@
+/*
+ * (C) Copyright 2002
+ * Rich Ireland, Enterasys Networks, rireland at enterasys.com.
+ * Keith Outwater, keith_outwater at mvis.com.
+ *
+ * (C) Copyright 2010
+ * Andre Schwarz, Matrix Vision GmbH, andre.schwarz at 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 <common.h>

board/matrix_vision/mvsmr/fpga.c line 39

Quoted 10 lines
board/matrix_vision/mvsmr/fpga.c new file +10 -0
+#include <spartan3.h>
+#include <command.h>
+#include "fpga.h"
+#include "mvsmr.h"
+
+#ifdef FPGA_DEBUG
+#define fpga_debug(fmt, args...)	printf("%s: "fmt, __func__, ##args)
+#else
+#define fpga_debug(fmt, args...)
+#endif

Do you really insist on yet another debug macro? I know it includes the function, but is it really worth it?

Quoted 27 lines
board/matrix_vision/mvsmr/fpga.c new file +27 -0
+
+
+Xilinx_Spartan3_Slave_Serial_fns fpga_fns = {
+	fpga_pre_config_fn,
+	fpga_pgm_fn,
+	fpga_clk_fn,
+	fpga_init_fn,
+	fpga_done_fn,
+	fpga_wr_fn,
+	0
+};
+
+Xilinx_desc spartan3 = {
+	Xilinx_Spartan2,
+	slave_serial,
+	XILINX_XC3S200_SIZE,
+	(void *) &fpga_fns,
+	0,
+};
+
+DECLARE_GLOBAL_DATA_PTR;
+
+int mvsmr_init_fpga(void)
+{
+	fpga_debug("Initialize FPGA interface\n");
+	fpga_init();
+	fpga_add(fpga_xilinx, &spartan3);

board/matrix_vision/mvsmr/fpga.c line 76

Quoted 10 lines
board/matrix_vision/mvsmr/fpga.c new file +10 -0
+
+	return 1;
+}
+
+int fpga_init_fn(int cookie)
+{
+	struct mpc5xxx_gpio *gpio = (struct mpc5xxx_gpio *)MPC5XXX_GPIO;
+
+	fpga_debug("INIT check ... ");
+	if (gpio->simple_ival & FPGA_CONFIG) {

Use accessor functions.

Quoted 6 lines
board/matrix_vision/mvsmr/fpga.c new file +6 -0
+		fpga_debug("high");
+		return 0;
+	} else {
+		fpga_debug("low");
+		return 1;
+	}

board/matrix_vision/mvsmr/fpga.c line 92

Quoted 10 lines
board/matrix_vision/mvsmr/fpga.c new file +10 -0
+}
+
+int fpga_done_fn(int cookie)
+{
+	struct mpc5xxx_gpio *gpio = (struct mpc5xxx_gpio *)MPC5XXX_GPIO;
+	int result = 0;
+
+	udelay(10);
+	fpga_debug("CONF_DONE check ... ");
+	if (gpio->simple_ival & FPGA_DONE) {

Accessors.

Quoted 7 lines
board/matrix_vision/mvsmr/fpga.c new file +7 -0
+		fpga_debug("high\n");
+		result = 1;
+	} else
+		fpga_debug("low\n");
+
+	return result;
+}

board/matrix_vision/mvsmr/fpga.c line 109

Quoted 10 lines
board/matrix_vision/mvsmr/fpga.c new file +10 -0
+
+int fpga_pgm_fn(int assert, int flush, int cookie)
+{
+	struct mpc5xxx_gpio *gpio = (struct mpc5xxx_gpio *)MPC5XXX_GPIO;
+
+	fpga_debug("SET prog : %s\n", assert ? "low" : "high");
+	if (!assert)
+		gpio->sint_dvo |= FPGA_STATUS;
+	else
+		gpio->sint_dvo &= ~FPGA_STATUS;

Accessors.

Quoted 7 lines
board/matrix_vision/mvsmr/fpga.c new file +7 -0
+
+	return assert;
+}
+
+int fpga_clk_fn(int assert_clk, int flush, int cookie)
+{
+	struct mpc5xxx_gpio *gpio = (struct mpc5xxx_gpio *)MPC5XXX_GPIO;

board/matrix_vision/mvsmr/fpga.c line 126

Quoted 10 lines
board/matrix_vision/mvsmr/fpga.c new file +10 -0
+	u32 dvo = gpio->simple_dvo;
+
+	fpga_debug("CLOCK %s\n", assert_clk ? "high" : "low");
+	if (assert_clk)
+		dvo |= FPGA_CCLK;
+	else
+		dvo &= ~FPGA_CCLK;
+
+	if (flush)
+		gpio->simple_dvo = dvo;

Again.

board/matrix_vision/mvsmr/fpga.c line 139

Quoted 13 lines
board/matrix_vision/mvsmr/fpga.c new file +13 -0
+
+	return assert_clk;
+}
+
+int fpga_wr_fn(int assert_write, int flush, int cookie)
+{
+	struct mpc5xxx_gpio *gpio = (struct mpc5xxx_gpio *)MPC5XXX_GPIO;
+
+	debug("SET data : %d\n", assert_write ? 1 : 0);
+	if (assert_write)
+		gpio->simple_dvo |= FPGA_DIN;
+	else
+		gpio->simple_dvo &= ~FPGA_DIN;

Again.

board/matrix_vision/mvsmr/fpga.c line 148

Quoted 9 lines
board/matrix_vision/mvsmr/fpga.c new file +9 -0
+
+	return assert_write;
+}
+
+int fpga_pre_config_fn(int cookie)
+{
+	struct mpc5xxx_gpio *gpio = (struct mpc5xxx_gpio *)MPC5XXX_GPIO;
+
+	gpio->sint_dvo |= FPGA_STATUS;

And once more.

Quoted 103 lines
board/matrix_vision/mvsmr/fpga.c new file +3 -0
+
+	return 0;
+}
board/matrix_vision/mvsmr/fpga.h new file +32 -0
new file mode 100644
index 0000000..ee690e6
@@ -0,0 +1,32 @@
+/*
+ * (C) Copyright 2008
+ * Andre Schwarz, Matrix Vision GmbH, andre.schwarz at 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
+ *
+ */
+
+extern int mvsmr_init_fpga(void);
+
+extern int fpga_pgm_fn(int assert_pgm, int flush, int cookie);
+extern int fpga_init_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_done_fn(int cookie);
+extern int fpga_pre_config_fn(int cookie);
board/matrix_vision/mvsmr/mvsmr.c new file +56 -0
new file mode 100644
index 0000000..e588ed9
@@ -0,0 +1,276 @@
+/*
+ * (C) Copyright 2003
+ * Wolfgang Denk, DENX Software Engineering, wd at denx.de.
+ *
+ * (C) Copyright 2004
+ * Mark Jonas, Freescale Semiconductor, mark.jonas at motorola.com.
+ *
+ * (C) Copyright 2005-2010
+ * Andre Schwarz, Matrix Vision GmbH, andre.schwarz at 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 <common.h>
+#include <mpc5xxx.h>
+#include <malloc.h>
+#include <pci.h>
+#include <i2c.h>
+#include <fpga.h>
+#include <environment.h>
+#include <netdev.h>
+#include <asm/io.h>
+#include "fpga.h"
+#include "mvsmr.h"
+#include "../common/mv_common.h"
+
+#define SDRAM_DDR	1
+#define SDRAM_MODE	0x018D0000
+#define SDRAM_EMODE	0x40090000
+#define SDRAM_CONTROL	0x715f0f00
+#define SDRAM_CONFIG1	0xd3722930
+#define SDRAM_CONFIG2	0x46770000
+
+DECLARE_GLOBAL_DATA_PTR;
+
+static void sdram_start(int hi_addr)
+{
+	long hi_bit = hi_addr ? 0x01000000 : 0;
+
+	/* unlock mode register */

board/matrix_vision/mvsmr/mvsmr.c line 66

Quoted 10 lines
board/matrix_vision/mvsmr/mvsmr.c new file +10 -0
+	out_be32((u32 *)MPC5XXX_SDRAM_CTRL, SDRAM_CONTROL | 0x80000000 |
+		hi_bit);
+
+	/* precharge all banks */
+	out_be32((u32 *)MPC5XXX_SDRAM_CTRL, SDRAM_CONTROL | 0x80000002 |
+		hi_bit);
+
+	/* set mode register: extended mode */
+	*(vu_long *)MPC5XXX_SDRAM_MODE = SDRAM_EMODE;
+	__asm__ volatile ("sync");

Mixing accessors and direct pointer accesses? Please update all to using the accessors.

board/matrix_vision/mvsmr/mvsmr.c line 70

Quoted 4 lines
board/matrix_vision/mvsmr/mvsmr.c new file +4 -0
+
+	/* set mode register: reset DLL */
+	*(vu_long *)MPC5XXX_SDRAM_MODE = SDRAM_MODE | 0x04000000;
+	__asm__ volatile ("sync");

Dito.

Quoted 66 lines
board/matrix_vision/mvsmr/mvsmr.c new file +66 -0
+
+	/* precharge all banks */
+	out_be32((u32 *)MPC5XXX_SDRAM_CTRL, SDRAM_CONTROL | 0x80000002 |
+		hi_bit);
+
+	/* auto refresh */
+	out_be32((u32 *)MPC5XXX_SDRAM_CTRL, SDRAM_CONTROL | 0x80000004 |
+		hi_bit);
+
+	/* set mode register */
+	out_be32((u32 *)MPC5XXX_SDRAM_MODE, SDRAM_MODE);
+
+	/* normal operation */
+	out_be32((u32 *)MPC5XXX_SDRAM_CTRL, SDRAM_CONTROL | hi_bit);
+}
+
+phys_addr_t initdram(int board_type)
+{
+	ulong dramsize = 0;
+	ulong test1,
+	      test2;
+
+	/* setup SDRAM chip selects */
+	out_be32((u32 *)MPC5XXX_SDRAM_CS0CFG, 0x0000001e);
+
+	/* setup config registers */
+	out_be32((u32 *)MPC5XXX_SDRAM_CONFIG1, SDRAM_CONFIG1);
+	out_be32((u32 *)MPC5XXX_SDRAM_CONFIG2, SDRAM_CONFIG2);
+
+	/* find RAM size using SDRAM CS0 only */
+	sdram_start(0);
+	test1 = get_ram_size((long *)CONFIG_SYS_SDRAM_BASE, 0x80000000);
+	sdram_start(1);
+	test2 = get_ram_size((long *)CONFIG_SYS_SDRAM_BASE, 0x80000000);
+	if (test1 > test2) {
+		sdram_start(0);
+		dramsize = test1;
+	} else
+		dramsize = test2;
+
+	if (dramsize < (1 << 20))
+		dramsize = 0;
+
+	if (dramsize > 0)
+		out_be32((u32 *)MPC5XXX_SDRAM_CS0CFG, 0x13 +
+			__builtin_ffs(dramsize >> 20) - 1);
+	else
+		out_be32((u32 *)MPC5XXX_SDRAM_CS0CFG, 0);
+
+	return dramsize;
+}
+
+void mvsmr_init_gpio(void)
+{
+	struct mpc5xxx_gpio *gpio = (struct mpc5xxx_gpio *)MPC5XXX_GPIO;
+	struct mpc5xxx_gpt_0_7 *timers = (struct mpc5xxx_gpt_0_7 *)MPC5XXX_GPT;
+
+	printf("Ports : 0x%08x\n", gpio->port_config);
+	printf("PORCFG: 0x%08x\n", in_be32((unsigned *)MPC5XXX_CDM_PORCFG));
+
+	out_be32(&gpio->simple_ddr, SIMPLE_DDR);
+	out_be32(&gpio->simple_dvo, SIMPLE_DVO);
+	out_be32(&gpio->simple_ode, SIMPLE_ODE);
+	out_be32(&gpio->simple_gpioe, SIMPLE_GPIOEN);
+
+	out_8(&gpio->sint_ode, SINT_ODE);

board/matrix_vision/mvsmr/mvsmr.c line 146

Quoted 10 lines
board/matrix_vision/mvsmr/mvsmr.c new file +10 -0
+	out_8(&gpio->sint_ddr, SINT_DDR);
+	out_8(&gpio->sint_dvo, SINT_DVO);
+	out_8(&gpio->sint_inten, SINT_INTEN);
+	out_be16(&gpio->sint_itype, SINT_ITYPE);
+	out_8(&gpio->sint_gpioe, SINT_GPIOEN);
+
+	out_8((u8 *)MPC5XXX_WU_GPIO_ODE, WKUP_ODE);
+	out_8((u8 *)MPC5XXX_WU_GPIO_DIR, WKUP_DIR);
+	out_8((u8 *)MPC5XXX_WU_GPIO_DATA_O, WKUP_DO);
+	out_8((u8 *)MPC5XXX_WU_GPIO_ENABLE, WKUP_EN);

Actually we have a "struct mpc5xxx_wu_gpio", so please use it.

Quoted 23 lines
board/matrix_vision/mvsmr/mvsmr.c new file +23 -0
+
+	out_be32(&timers->gpt0.emsr, 0x00000234); /* OD output high */
+	out_be32(&timers->gpt1.emsr, 0x00000234);
+	out_be32(&timers->gpt2.emsr, 0x00000234);
+	out_be32(&timers->gpt3.emsr, 0x00000234);
+	out_be32(&timers->gpt4.emsr, 0x00000234);
+	out_be32(&timers->gpt5.emsr, 0x00000234);
+	out_be32(&timers->gpt6.emsr, 0x00000024); /* push-pull output low */
+	out_be32(&timers->gpt7.emsr, 0x00000024);
+
+	printf("simple_gpioe: 0x%08x\n", gpio->simple_gpioe);
+	printf("sint_gpioe  : 0x%08x\n", gpio->sint_gpioe);
+}
+
+int misc_init_r(void)
+{
+	char *s = getenv("reset_env");
+
+	if (s) {
+		printf(" === FACTORY RESET ===\n");
+		mv_reset_environment();
+		saveenv();
+	}

board/matrix_vision/mvsmr/mvsmr.c line 179

Quoted 10 lines
board/matrix_vision/mvsmr/mvsmr.c new file +10 -0
+
+	return -1;
+}
+
+void mvsmr_get_dbg_present(void)
+{
+	struct mpc5xxx_gpio *gpio = (struct mpc5xxx_gpio *)MPC5XXX_GPIO;
+	struct mpc5xxx_psc *psc = (struct mpc5xxx_psc *)MPC5XXX_PSC1;
+
+	if (gpio->simple_ival & COP_PRESENT) {

Good ol' accessors.

board/matrix_vision/mvsmr/mvsmr.c line 185

Quoted 6 lines
board/matrix_vision/mvsmr/mvsmr.c new file +6 -0
+		setenv("dbg_present", "no\0");
+		setenv("bootstopkey", "abcdefghijklmnopqrstuvwxyz\0");
+	} else {
+		setenv("dbg_present", "yes\0");
+		setenv("bootstopkey", "s\0");
+		psc->command |= PSC_RX_ENABLE;

Again.

board/matrix_vision/mvsmr/mvsmr.c line 194

Quoted 9 lines
board/matrix_vision/mvsmr/mvsmr.c new file +9 -0
+	}
+}
+
+void mvsmr_get_service_mode(void)
+{
+	struct mpc5xxx_wu_gpio *wu_gpio =
+		(struct mpc5xxx_wu_gpio *)MPC5XXX_WU_GPIO;
+
+	if (wu_gpio->ival & SERVICE_MODE)

And again.

board/matrix_vision/mvsmr/mvsmr.c line 204

Quoted 10 lines
board/matrix_vision/mvsmr/mvsmr.c new file +10 -0
+		setenv("servicemode", "no\0");
+	else
+		setenv("servicemode", "yes\0");
+}
+
+int mvsmr_get_mac(void)
+{
+	char *data, *mac;
+	struct mpc5xxx_wu_gpio *wu_gpio =
+		(struct mpc5xxx_wu_gpio *)MPC5XXX_WU_GPIO;

Aha, so you _did_ find it before ;)

board/matrix_vision/mvsmr/mvsmr.c line 206

Quoted 2 lines
board/matrix_vision/mvsmr/mvsmr.c new file +2 -0
+
+	if (wu_gpio->ival & LAN_PRSNT) {

Accessors

Quoted 60 lines
board/matrix_vision/mvsmr/mvsmr.c new file +60 -0
+		setenv("lan_present", "no\0");
+		return -1;
+	} else
+		setenv("lan_present", "yes\0");
+
+	data = malloc(10);
+	mac = malloc(32);
+	memset(data, 0, sizeof(data));
+	memset(mac, 0, sizeof(mac));
+
+	i2c_read(0x50, 0, 1, (unsigned char *)data, 6);
+
+	sprintf(mac, "%02x:%02x:%02x:%02x:%02x:%02x",
+		data[0], data[1], data[2], data[3], data[4], data[5]);
+	setenv("ethaddr", mac);
+	free(data);
+	free(mac);
+
+	return 0;
+}
+
+int checkboard(void)
+{
+	mvsmr_init_gpio();
+	printf("Board: Matrix Vision mvSMR\n");
+
+	return 0;
+}
+
+void flash_preinit(void)
+{
+	/*
+	 * Now, when we are in RAM, enable flash write
+	 * access for detection process.
+	 * Note that CS_BOOT cannot be cleared when
+	 * executing in flash.
+	 */
+	clrbits_be32((u32 *)MPC5XXX_BOOTCS_CFG, 0x1);
+}
+
+void flash_afterinit(ulong size)
+{
+	out_be32((u32 *)MPC5XXX_BOOTCS_START,
+		START_REG(CONFIG_SYS_BOOTCS_START | size));
+	out_be32((u32 *)MPC5XXX_CS0_START,
+		START_REG(CONFIG_SYS_BOOTCS_START | size));
+	out_be32((u32 *)MPC5XXX_BOOTCS_STOP,
+		STOP_REG(CONFIG_SYS_BOOTCS_START | size, size));
+	out_be32((u32 *)MPC5XXX_CS0_STOP,
+		STOP_REG(CONFIG_SYS_BOOTCS_START | size, size));
+}
+
+struct pci_controller hose;
+
+void pci_init_board(void)
+{
+	mvsmr_get_dbg_present();
+	mvsmr_get_service_mode();
+	mvsmr_init_fpga();
+	mv_load_fpga();

board/matrix_vision/mvsmr/mvsmr.c line 276

Quoted 10 lines
board/matrix_vision/mvsmr/mvsmr.c new file +10 -0
+	pci_mpc5xxx_init(&hose);
+}
+
+int board_eth_init(bd_t *bis)
+{
+	if (!mvsmr_get_mac())
+		return cpu_eth_init(bis);
+
+	return pci_eth_init(bis);
+}

[...]

Cheers
Detlev

Signature · 5 lines
Markov does it in chains.
--
DENX Software Engineering GmbH,      MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich,  Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-40 Fax: (+49)-8142-66989-80 Email: dzu at denx.de
#2 lore raw

PATCH 1/1 MPC5200: Add initial support for Matrix Vision mvSMR board

Detlev,

Quoted 4 lines

Hi Andre,

just a few obligatory remarks...

thanks for pointing this out - these are remnants dated from 2006 ... simply overlooked them while concentrating on proper git usage :-)

Will wait for some more comments and resubmit v2 tomorrow.

Regards,
Andr?

MATRIX VISION GmbH, Talstrasse 16, DE-71570 Oppenweiler
Registergericht: Amtsgericht Stuttgart, HRB 271090
Geschaeftsfuehrer: Gerhard Thullner, Werner Armingeon, Uwe Furtner, Hans-Joachim Reich