Skip to contentSkip to conversation

ZOOM2 Add initial support for Zoom2

PATCH New Tom Rix 3 participants 13 messages Apr 1, 2009 – Apr 2, 2009 Kbuild

lore
Share & tools
lore

Tom Rix

author
#0 lore raw

PATCH 1/1 ZOOM2 Add initial support for Zoom2

Zoom2 is a new board from Texas Instruments and LogicPD This is the product description
http://www.logicpd.com/products/development-kits/texas-instruments-zoom%E2%84%A2-omap34x-ii-mdp

This patch provides a zoom2 base target by copying zoom1 and by making some obvious changes. This target compiles but does not yet run.

To configure, run
make omap3_zoom2_config

---
 MAINTAINERS                   |    4 +
 MAKEALL                       |    1 +
 Makefile                      |    3 +
 board/omap3/common/Makefile   |    1 +
 board/omap3/zoom2/Makefile    |   49 ++++++
 board/omap3/zoom2/config.mk   |   33 ++++
 board/omap3/zoom2/u-boot.lds  |   63 ++++++++
 board/omap3/zoom2/zoom2.c     |   79 ++++++++++
 board/omap3/zoom2/zoom2.h     |  134 +++++++++++++++++
 include/configs/omap3_zoom2.h |  328 +++++++++++++++++++++++++++++++++++++++++
 10 files changed, 695 insertions(+), 0 deletions(-)
 create mode 100644 board/omap3/zoom2/Makefile
 create mode 100644 board/omap3/zoom2/config.mk
 create mode 100644 board/omap3/zoom2/u-boot.lds
 create mode 100644 board/omap3/zoom2/zoom2.c
 create mode 100644 board/omap3/zoom2/zoom2.h
 create mode 100644 include/configs/omap3_zoom2.h
MAINTAINERS +4 -0
index 25b28d6..f89e01a 100644
@@ -610,6 +610,10 @@ Stelian Pop <[email protected]>
 	at91sam9263ek	ARM926EJS (AT91SAM9263 SoC)
 	at91sam9rlek	ARM926EJS (AT91SAM9RL SoC)
 
+Tom Rix <[email protected]>
+
+	omap3_zoom2	ARM CORTEX-A8 (OMAP3xx SoC)
+
 Stefan Roese <[email protected]>
 
 	ixdpg425	xscale
MAKEALL +1 -0
index aa7095e..e2d7556 100755
@@ -560,6 +560,7 @@ LIST_ARM_CORTEX_A8="		\
 	omap3_evm		\
 	omap3_pandora		\
 	omap3_zoom1		\
+	omap3_zoom2		\
 "
 
 #########################################################################
Makefile +3 -0
index b6fb939..c02a282 100644
@@ -2971,6 +2971,9 @@ omap3_pandora_config :	unconfig
 omap3_zoom1_config :	unconfig
 	@$(MKCONFIG) $(@:_config=) arm arm_cortexa8 zoom1 omap3 omap3
 
+omap3_zoom2_config :	unconfig
+	@$(MKCONFIG) $(@:_config=) arm arm_cortexa8 zoom2 omap3 omap3
+
 #########################################################################
 ## XScale Systems
 #########################################################################
board/omap3/common/Makefile +1 -0
index 7b892fa..b8a0b14 100644
@@ -33,6 +33,7 @@ COBJS-$(CONFIG_OMAP3_BEAGLE) += power.o
 COBJS-$(CONFIG_OMAP3_OVERO) += power.o
 COBJS-$(CONFIG_OMAP3_PANDORA) += power.o
 COBJS-$(CONFIG_OMAP3_ZOOM1) += power.o
+COBJS-$(CONFIG_OMAP3_ZOOM2) += power.o
 
 COBJS	:= $(COBJS-y)
 SRCS	:= $(COBJS:.o=.c)
board/omap3/zoom2/Makefile new file +49 -0

49 lines not on this page · raw message

board/omap3/zoom2/config.mk new file +33 -0
new file mode 100644
index 0000000..ef2ae97
@@ -0,0 +1,33 @@
+#
+# (C) Copyright 2009
+# Texas Instruments, <www.ti.com>
+#
+# Zoom II uses OMAP3 (ARM-CortexA8) cpu
+# see http://www.ti.com/ for more information on Texas Instruments
+#
+# 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
+#
+# Physical Address:
+# 8000'0000 (bank0)
+# A000/0000 (bank1)
+# Linux-Kernel is expected to be at 8000'8000, entry 8000'8000
+# (mem base + reserved)
+
+# For use with external or internal boots.
+TEXT_BASE = 0x80e80000
board/omap3/zoom2/u-boot.lds new file +63 -0

63 lines not on this page · raw message

board/omap3/zoom2/zoom2.c new file +79 -0

79 lines not on this page · raw message

board/omap3/zoom2/zoom2.h new file +134 -0

134 lines not on this page · raw message

include/configs/omap3_zoom2.h new file +328 -0

328 lines not on this page · raw message

Signature · 1 line
1.6.0.5
author
#1 lore raw

PATCH 1/1 ZOOM2 Mux changes to support zoom2 configuration.

---
 board/omap3/zoom2/zoom2.h |   20 +++++++++++++++++++-
 1 files changed, 19 insertions(+), 1 deletions(-)
board/omap3/zoom2/zoom2.h +19 -1
index 3199fa9..47401f7 100644
@@ -129,6 +129,24 @@ const omap3_sysinfo sysinfo = {
  MUX_VAL(CP(GPMC_WAIT0),	(IEN  | PTD | EN  | M0)) /*GPMC_WAIT0*/\
  MUX_VAL(CP(GPMC_WAIT1),	(IEN  | PTU | EN  | M0)) /*GPMC_WAIT1*/\
  MUX_VAL(CP(GPMC_WAIT2),	(IEN  | PTU | EN  | M0)) /*GPMC_WAIT2*/\
- MUX_VAL(CP(GPMC_WAIT3),	(IEN  | PTU | EN  | M0)) /*GPMC_WAIT3*/
+ MUX_VAL(CP(GPMC_WAIT3),	(IEN  | PTU | EN  | M0)) /*GPMC_WAIT3*/\
+ /* IDCC modem Power On */					       \
+ MUX_VAL(CP(CAM_D11),           (IEN  | PTU | EN | M4)) /*GPIO_110*/\
+ MUX_VAL(CP(CAM_D4),            (IEN  | PTU | EN | M4)) /*GPIO_103 */\
+ /* GPMC CS7 has LAN9211 device */\
+ MUX_VAL(CP(GPMC_NCS7),         (IDIS | PTU | EN  | M0)) /*GPMC_nCS7*/\
+ MUX_VAL(CP(MCBSP1_DX),         (IEN  | PTD | DIS | M4)) /*LAN9221*/\
+ MUX_VAL(CP(MCSPI1_CS2),        (IEN  | PTD | EN  | M0)) /*MCSPI1_CS2*/\
+ /* GPMC CS3 has Serial TL16CP754C device */\
+ MUX_VAL(CP(GPMC_NCS3),         (IDIS | PTU | EN  | M0)) /*GPMC_nCS3*/\
+ /* Toggle Reset pin of TL16CP754C device */\
+ MUX_VAL(CP(MCBSP4_CLKX),       (IEN  | PTU | EN  | M4)) /*GPIO_152*/\
+ udelay(10);\
+ MUX_VAL(CP(MCBSP4_CLKX),       (IEN  | PTD | EN  | M4)) /*GPIO_152*/\
+ MUX_VAL(CP(SDRC_CKE1),         (IDIS | PTU | EN  | M0)) /*SDRC_CKE1*/\
+ /* LEDS */\
+ MUX_VAL(CP(MCSPI1_SOMI),       (IEN  | PTD | EN | M4))  /*GPIO_173 red */\
+ MUX_VAL(CP(MCBSP4_DX),         (IEN  | PTD | EN | M4))  /*GPIO_154 blue */\
+ MUX_VAL(CP(GPMC_NBE1),         (IEN  | PTD | EN | M4))  /*GPIO_61 blue2 */
 
 #endif /* _BOARD_ZOOM_H_ */
Signature · 1 line
1.6.0.5
author
#2 lore raw

PATCH 1/1 ZOOM2 Add support for debug board detection.

https://omapzoom.org/gf/project/omapzoom/wiki/?pagename=GettingStartedWithZoomII_AKA_OMAP34XII_MDP

The zoom2 has an auxillary board that contains the serial, net, jtag and battery simulator. This change supports a runtime check if the debug board is connected.

---
 board/omap3/zoom2/Makefile      |    3 +-
 board/omap3/zoom2/debug_board.c |   55 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 57 insertions(+), 1 deletions(-)
 create mode 100644 board/omap3/zoom2/debug_board.c
board/omap3/zoom2/Makefile +2 -1
index 088b8cb..b8fa5a7 100644
@@ -25,7 +25,8 @@ include $(TOPDIR)/config.mk
 
 LIB	= $(obj)lib$(BOARD).a
 
-COBJS	:= zoom2.o
+COBJS	:= zoom2.o \
+	debug_board.o
 
 SRCS	:= $(COBJS:.o=.c)
 OBJS	:= $(addprefix $(obj),$(COBJS))
board/omap3/zoom2/debug_board.c new file +55 -0

55 lines not on this page · raw message

Signature · 1 line
1.6.0.5
author
#3 lore raw

PATCH 1/1 ZOOM2 Add serial support.

Zoom2 serial is in general supplied by one of the 4 UARTS on the debug board. The default serial is from the USB connector on left side of the debug board. The USB connector will produce 2 of the 4 UARTS. On your host pick the first enumeration.

The serial port set up is the same with Zoom1.
Baud rate 115200, 8 bit data, no parity, 1 stop bit, no flow.

The kernel bootargs are
console=ttyS3,115200n8

---
 board/omap3/zoom2/Makefile       |    3 +-
 board/omap3/zoom2/zoom2_serial.c |  103 ++++++++++++++++++++++++++++++++++++++
 board/omap3/zoom2/zoom2_serial.h |   77 ++++++++++++++++++++++++++++
 common/serial.c                  |    2 +
 cpu/arm_cortexa8/omap3/mem.c     |   23 ++++++++
 drivers/serial/ns16550.c         |   13 ++++-
 include/asm-arm/arch-omap3/cpu.h |    2 +
 include/configs/omap3_zoom2.h    |   26 ++++-----
 include/ns16550.h                |   19 +++++++
 include/serial.h                 |    7 +++
 10 files changed, 258 insertions(+), 17 deletions(-)
 create mode 100644 board/omap3/zoom2/zoom2_serial.c
 create mode 100644 board/omap3/zoom2/zoom2_serial.h
board/omap3/zoom2/Makefile +2 -1
index b8fa5a7..d27990c 100644
@@ -26,7 +26,8 @@ include $(TOPDIR)/config.mk
 LIB	= $(obj)lib$(BOARD).a
 
 COBJS	:= zoom2.o \
-	debug_board.o
+	debug_board.o \
+	zoom2_serial.o
 
 SRCS	:= $(COBJS:.o=.c)
 OBJS	:= $(addprefix $(obj),$(COBJS))
board/omap3/zoom2/zoom2_serial.c new file +103 -0

103 lines not on this page · raw message

board/omap3/zoom2/zoom2_serial.h new file +77 -0

77 lines not on this page · raw message

common/serial.c +2 -0
index 09385d0..3e9135b 100644
@@ -68,6 +68,8 @@ struct serial_device *__default_serial_console (void)
 #else
 #error "CONFIG_SERIAL? missing."
 #endif
+#elif defined(CONFIG_OMAP3_ZOOM2)
+		return DEFAULT_ZOOM2_SERIAL_DEVICE;
 #else
 #error No default console
 #endif
cpu/arm_cortexa8/omap3/mem.c +23 -0
index 3cc22c4..20a8748 100644
@@ -82,6 +82,18 @@ gpmc_csx_t *onenand_cs_base;
 
 #endif
 
+#if defined(CONFIG_OMAP3_ZOOM2)
+static u32 gpmc_serial_TL16CP754C[GPMC_MAX_REG] = {
+	0x00011000,
+	0x001F1F01,
+	0x00080803,
+	0x1D091D09,
+	0x041D1F1F,
+	0x1D0904C4, 0
+};
+gpmc_csx_t *serial_cs_base;
+#endif
+
 static sdrc_t *sdrc_base = (sdrc_t *)OMAP34XX_SDRC_BASE;
 
 /**************************************************************************
@@ -281,4 +293,15 @@ void gpmc_init(void)
 	boot_flash_env_addr = f_off;
 #endif
 #endif
+
+#ifdef CONFIG_OMAP3_ZOOM2
+	/* Configure console support on zoom2 */
+	gpmc_config = gpmc_serial_TL16CP754C;
+	serial_cs_base = (gpmc_csx_t *) (GPMC_CONFIG_CS0_BASE +
+					 (3 * GPMC_CONFIG_WIDTH));
+	enable_gpmc_config(gpmc_config,
+			   serial_cs_base,
+			   SERIAL_TL16CP754C_BASE,
+			   GPMC_SIZE_16M);
+#endif
 }
drivers/serial/ns16550.c +11 -2
index 397f5df..93a1bd2 100644
@@ -14,9 +14,18 @@
 void NS16550_init (NS16550_t com_port, int baud_divisor)
 {
 	com_port->ier = 0x00;
-#ifdef CONFIG_OMAP
+#if defined(CONFIG_OMAP) && !defined(CONFIG_OMAP3_ZOOM2)
 	com_port->mdr1 = 0x7;	/* mode select reset TL16C750*/
 #endif
+#if defined(CONFIG_OMAP3_ZOOM2)
+	/* On Zoom2 board Set pre-scalar to 1
+	 * CLKSEL is GND => MCR[7] is 1 => preslr is 4
+	 * So change the prescl to 1
+	 */
+	com_port->lcr = 0xBF;
+	com_port->fcr |= 0x10;
+	com_port->mcr &= 0x7F;
+#endif
 	com_port->lcr = LCR_BKSE | LCRVAL;
 	com_port->dll = 0;
 	com_port->dlm = 0;
@@ -27,7 +36,7 @@ void NS16550_init (NS16550_t com_port, int baud_divisor)
 	com_port->dll = baud_divisor & 0xff;
 	com_port->dlm = (baud_divisor >> 8) & 0xff;
 	com_port->lcr = LCRVAL;
-#if defined(CONFIG_OMAP)
+#if defined(CONFIG_OMAP) && !defined(CONFIG_OMAP3_ZOOM2)
 #if defined(CONFIG_APTIX)
 	com_port->mdr1 = 3;	/* /13 mode so Aptix 6MHz can hit 115200 */
 #else
include/asm-arm/arch-omap3/cpu.h +2 -0
index c544e0c..7671a3a 100644
@@ -153,6 +153,8 @@ typedef struct gpmc_csx {
 #define PISMO2_BASE		0x18000000	/* PISMO2 CS1/2 */
 #define ONENAND_MAP		0x20000000	/* OneNand addr */
 						/* (actual size small port) */
+#define SERIAL_TL16CP754C_BASE	0x10000000      /* Zoom2 Serial chip address */
+
 /* SMS */
 #ifndef __ASSEMBLY__
 typedef struct sms {
include/configs/omap3_zoom2.h +12 -14
index 9ea8ea0..c991b1b 100644
@@ -70,26 +70,24 @@
 
 /*
  * NS16550 Configuration
+ * Zoom2 uses the TL16CP754C on the debug board
  */
-#define V_NS16550_CLK			48000000	/* 48MHz (APLL96/2) */
+#define CONFIG_SERIAL_MULTI      1
+/* 0 - 1 : first  USB with respect to the left edge of the debug board
+   2 - 3 : second USB with respect to the left edge of the debug board */
+#define DEFAULT_ZOOM2_SERIAL_DEVICE (&zoom2_serial_device0)
 
-#define CONFIG_SYS_NS16550
-#define CONFIG_SYS_NS16550_SERIAL
-#define CONFIG_SYS_NS16550_REG_SIZE	(-4)
-#define CONFIG_SYS_NS16550_CLK		V_NS16550_CLK
+#define V_NS16550_CLK            (1843200)  /* 1.8432 Mhz */
 
-/*
- * select serial console configuration
- */
-#define CONFIG_CONS_INDEX		3
-#define CONFIG_SYS_NS16550_COM3		OMAP34XX_UART3
-#define CONFIG_SERIAL3			3	/* UART3 */
+#define CONFIG_SYS_NS16550
+#define CONFIG_SYS_NS16550_REG_SIZE     (-2)
+#define CONFIG_SYS_NS16550_CLK          V_NS16550_CLK
+#define CONFIG_BAUDRATE          115200
+#define CONFIG_SYS_BAUDRATE_TABLE   {115200}
 
 /* allow to overwrite serial and ethaddr */
 #define CONFIG_ENV_OVERWRITE
-#define CONFIG_BAUDRATE			115200
-#define CONFIG_SYS_BAUDRATE_TABLE	{4800, 9600, 19200, 38400, 57600,\
-					115200}
+
 #define CONFIG_MMC			1
 #define CONFIG_OMAP3_MMC		1
 #define CONFIG_DOS_PARTITION		1
include/ns16550.h +19 -0
index edfbc53..ebaa44f 100644
@@ -57,6 +57,25 @@ struct NS16550 {
 	unsigned long msr;		/* 6 r  */
 	unsigned long scr;		/* 7 rw */
 }; /* No need to pack an already aligned struct */
+#elif (CONFIG_SYS_NS16550_REG_SIZE == -2)
+struct NS16550 {
+	unsigned char rbr;		/* 0 r  */
+	int pad1:8;
+	unsigned char ier;		/* 1 rw */
+	int pad2:8;
+	unsigned char fcr;		/* 2 w  */
+	int pad3:8;
+	unsigned char lcr;		/* 3 rw */
+	int pad4:8;
+	unsigned char mcr;		/* 4 rw */
+	int pad5:8;
+	unsigned char lsr;		/* 5 r  */
+	int pad6:8;
+	unsigned char msr;		/* 6 r  */
+	int pad7:8;
+	unsigned char scr;		/* 7 rw */
+	int pad8:8;
+}; /* No need to pack an already aligned struct */
 #elif (CONFIG_SYS_NS16550_REG_SIZE == -4)
 struct NS16550 {
 	unsigned char rbr;		/* 0 */
include/serial.h +7 -0
index e3d8b36..aca5221 100644
@@ -42,6 +42,13 @@ extern struct serial_device s3c24xx_serial1_device;
 extern struct serial_device s3c24xx_serial2_device;
 #endif
 
+#if defined(CONFIG_OMAP3_ZOOM2)
+extern struct serial_device zoom2_serial_device0;
+extern struct serial_device zoom2_serial_device1;
+extern struct serial_device zoom2_serial_device2;
+extern struct serial_device zoom2_serial_device3;
+#endif
+
 extern struct serial_device serial_ffuart_device;
 extern struct serial_device serial_btuart_device;
 extern struct serial_device serial_stuart_device;
Signature · 1 line
1.6.0.5
author
#4 lore raw

PATCH 1/1 ZOOM2 Add led support.

This patch controls the large LED on the top left of the zoom2.

---
 board/omap3/zoom2/Makefile |    4 ++-
 board/omap3/zoom2/led.c    |   65 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 68 insertions(+), 1 deletions(-)
 create mode 100644 board/omap3/zoom2/led.c
board/omap3/zoom2/Makefile +3 -1
index d27990c..6c74217 100644
@@ -25,8 +25,10 @@ include $(TOPDIR)/config.mk
 
 LIB	= $(obj)lib$(BOARD).a
 
-COBJS	:= zoom2.o \
+COBJS	:= \
 	debug_board.o \
+	led.o \
+	zoom2.o \
 	zoom2_serial.o
 
 SRCS	:= $(COBJS:.o=.c)
board/omap3/zoom2/led.c new file +65 -0

65 lines not on this page · raw message

Signature · 1 line
1.6.0.5
#5 lore raw

PATCH 1/1 ZOOM2 Add serial support.

In reply to Tom Rix

Dear Tom Rix,

Quoted 10 lines · In message <[email protected]> you wrote:

Zoom2 serial is in general supplied by one of the 4 UARTS on the debug board. The default serial is from the USB connector on left side of the debug board. The USB connector will produce 2 of the 4 UARTS. On your host pick the first enumeration.

The serial port set up is the same with Zoom1.
Baud rate 115200, 8 bit data, no parity, 1 stop bit, no flow.

The kernel bootargs are
console=ttyS3,115200n8

...

board/omap3/zoom2/Makefile include $(TOPDIR)/config.mk · line 30

Quoted 11 lines
board/omap3/zoom2/Makefile +2 -1
index b8fa5a7..d27990c 100644
@@ -26,7 +26,8 @@ include $(TOPDIR)/config.mk
 LIB	= $(obj)lib$(BOARD).a
 
 COBJS	:= zoom2.o \
-	debug_board.o
+	debug_board.o \
+	zoom2_serial.o

Please sort lists.

Quoted 7 lines
board/omap3/zoom2/Makefile +0 -0
 SRCS	:= $(COBJS:.o=.c)
 OBJS	:= $(addprefix $(obj),$(COBJS))
board/omap3/zoom2/zoom2_serial.c new file +0 -0
new file mode 100644
index 0000000..c1c4f4a

...

board/omap3/zoom2/zoom2_serial.c line 32

Quoted 4 lines
board/omap3/zoom2/zoom2_serial.c new file +4 -0
+int quad_init_dev(unsigned long base)
+{
+	/* The Quad UART is on the debug board.
+	   Check if the debug board is attached before using the UART */

Incorrect multiline comment style. Please fix globally.

Quoted 10 lines
drivers/serial/ns16550.c +1 -1
index 397f5df..93a1bd2 100644
@@ -14,9 +14,18 @@
 void NS16550_init (NS16550_t com_port, int baud_divisor)
 {
 	com_port->ier = 0x00;
-#ifdef CONFIG_OMAP
+#if defined(CONFIG_OMAP) && !defined(CONFIG_OMAP3_ZOOM2)

drivers/serial/ns16550.c line 27

Quoted 10 lines
drivers/serial/ns16550.c +8 -0
 	com_port->mdr1 = 0x7;	/* mode select reset TL16C750*/
 #endif
+#if defined(CONFIG_OMAP3_ZOOM2)
+	/* On Zoom2 board Set pre-scalar to 1
+	 * CLKSEL is GND => MCR[7] is 1 => preslr is 4
+	 * So change the prescl to 1
+	 */
+	com_port->lcr = 0xBF;
+	com_port->fcr |= 0x10;
+	com_port->mcr &= 0x7F;

Please don't add such strictly board-specific code to global driver files.

Quoted 5 lines
include/serial.h +0 -0
index e3d8b36..aca5221 100644

include/serial.h extern struct serial_device s3c24xx_serial1_device; · line 51

Quoted 10 lines
include/serial.h +7 -0
@@ -42,6 +42,13 @@ extern struct serial_device s3c24xx_serial1_device;
 extern struct serial_device s3c24xx_serial2_device;
 #endif
 
+#if defined(CONFIG_OMAP3_ZOOM2)
+extern struct serial_device zoom2_serial_device0;
+extern struct serial_device zoom2_serial_device1;
+extern struct serial_device zoom2_serial_device2;
+extern struct serial_device zoom2_serial_device3;
+#endif
+

Please don't add such strictly board-specific code to global header files.

Best regards,

Wolfgang Denk

Signature · 6 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
"Am besten betrachten Sie Fehlermeldungen als eine  Art  Psycho-Test,
mit  dem  herausgefunden  werden soll, wie belastbar Sie sind."
 - Dr. R. Wonneberger, Kompaktf?hrer LaTeX, Kap. 1.6: Fehlermeldungen
author
#6 lore raw

PATCH 1/1 ZOOM2 Add serial support.

Quoted 24 lines · Wolfgang Denk

Dear Tom Rix,

Quoted 11 lines · In message <[email protected]> you wrote:

Zoom2 serial is in general supplied by one of the 4 UARTS on the debug board. The default serial is from the USB connector on left side of the debug board. The USB connector will produce 2 of the 4 UARTS. On your host pick the first enumeration.

The serial port set up is the same with Zoom1.
Baud rate 115200, 8 bit data, no parity, 1 stop bit, no flow.

The kernel bootargs are
console=ttyS3,115200n8

...

Quoted 7 lines
board/omap3/zoom2/Makefile +0 -0
index b8fa5a7..d27990c 100644
@@ -26,7 +26,8 @@ include $(TOPDIR)/config.mk
 LIB	= $(obj)lib$(BOARD).a
 
Quoted 9 lines

board/omap3/zoom2/Makefile include $(TOPDIR)/config.mk · line 31

Quoted 5 lines
board/omap3/zoom2/Makefile +2 -1
 COBJS	:= zoom2.o \
-	debug_board.o
+	debug_board.o \
+	zoom2_serial.o
 

Please sort lists.

This was fixed on the last patch for led support.

Quoted 36 lines
Quoted 8 lines
board/omap3/zoom2/Makefile +0 -0
 SRCS	:= $(COBJS:.o=.c)
 OBJS	:= $(addprefix $(obj),$(COBJS))
board/omap3/zoom2/zoom2_serial.c new file +0 -0
new file mode 100644
index 0000000..c1c4f4a

...

board/omap3/zoom2/zoom2_serial.c line 32

Quoted 5 lines
board/omap3/zoom2/zoom2_serial.c new file +4 -0
+int quad_init_dev(unsigned long base)
+{
+	/* The Quad UART is on the debug board.
+	   Check if the debug board is attached before using the UART */

Incorrect multiline comment style. Please fix globally.

Quoted 16 lines
drivers/serial/ns16550.c +5 -1
index 397f5df..93a1bd2 100644
@@ -14,9 +14,18 @@
 void NS16550_init (NS16550_t com_port, int baud_divisor)
 {
 	com_port->ier = 0x00;
-#ifdef CONFIG_OMAP
+#if defined(CONFIG_OMAP) && !defined(CONFIG_OMAP3_ZOOM2)
 	com_port->mdr1 = 0x7;	/* mode select reset TL16C750*/
 #endif
+#if defined(CONFIG_OMAP3_ZOOM2)
+	/* On Zoom2 board Set pre-scalar to 1
+	 * CLKSEL is GND => MCR[7] is 1 => preslr is 4
+	 * So change the prescl to 1
Quoted 10 lines

drivers/serial/ns16550.c

Quoted 5 lines
drivers/serial/ns16550.c +4 -0
+	 */
+	com_port->lcr = 0xBF;
+	com_port->fcr |= 0x10;
+	com_port->mcr &= 0x7F;
 

Please don't add such strictly board-specific code to global driver files.

OK
I will move this.

Quoted 8 lines
Quoted 8 lines
include/serial.h +0 -0
index e3d8b36..aca5221 100644
@@ -42,6 +42,13 @@ extern struct serial_device s3c24xx_serial1_device;
 extern struct serial_device s3c24xx_serial2_device;
 #endif
 
Quoted 13 lines

include/serial.h extern struct serial_device s3c24xx_serial1_device;

Quoted 8 lines
include/serial.h +7 -0
+#if defined(CONFIG_OMAP3_ZOOM2)
+extern struct serial_device zoom2_serial_device0;
+extern struct serial_device zoom2_serial_device1;
+extern struct serial_device zoom2_serial_device2;
+extern struct serial_device zoom2_serial_device3;
+#endif
+
 

Please don't add such strictly board-specific code to global header files.

The other boards that do CONFIG_SERIAL_MULTI do the same thing. Can I have a pass on this ?

Quoted 5 lines

Best regards,

Wolfgang Denk

#7 lore raw

PATCH 1/1 ZOOM2 Add serial support.

Dear Tom,

Quoted 20 lines · In message <[email protected]> you wrote:
Quoted 9 lines
Quoted 9 lines
include/serial.h +0 -0
index e3d8b36..aca5221 100644
@@ -42,6 +42,13 @@ extern struct serial_device s3c24xx_serial1_device;
 extern struct serial_device s3c24xx_serial2_device;
 #endif
 
Quoted 11 lines

include/serial.h extern struct serial_device s3c24xx_serial1_device; · line 51

Quoted 7 lines
include/serial.h +7 -0
+#if defined(CONFIG_OMAP3_ZOOM2)
+extern struct serial_device zoom2_serial_device0;
+extern struct serial_device zoom2_serial_device1;
+extern struct serial_device zoom2_serial_device2;
+extern struct serial_device zoom2_serial_device3;
+#endif
+

Please don't add such strictly board-specific code to global header files.

Quoted 2 lines

The other boards that do CONFIG_SERIAL_MULTI do the same thing. Can I have a pass on this ?

Hm.. well, OK.

We should try to fnd a better solution, though. This doesn't scale well.

Ideas welcome.

Best regards,

Wolfgang Denk

Signature · 5 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
I'm a soldier, not a diplomat.  I can only tell the truth.
	-- Kirk, "Errand of Mercy", stardate 3198.9
#8 lore raw

PATCH 1/1 ZOOM2 Add support for debug board detection.

In reply to Tom Rix

Dear Tom Rix,

Quoted 18 lines · In message <[email protected]> you wrote:

https://omapzoom.org/gf/project/omapzoom/wiki/?pagename=GettingStartedWithZoomII_AKA_OMAP34XII_MDP

The zoom2 has an auxillary board that contains the serial, net, jtag and battery simulator. This change supports a runtime check if the debug board is connected.

---
 board/omap3/zoom2/Makefile      |    3 +-
 board/omap3/zoom2/debug_board.c |   55 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 57 insertions(+), 1 deletions(-)
 create mode 100644 board/omap3/zoom2/debug_board.c
board/omap3/zoom2/Makefile +0 -0
index 088b8cb..b8fa5a7 100644

board/omap3/zoom2/Makefile include $(TOPDIR)/config.mk · line 29

Quoted 6 lines
board/omap3/zoom2/Makefile +2 -1
@@ -25,7 +25,8 @@ include $(TOPDIR)/config.mk
 
 LIB	= $(obj)lib$(BOARD).a
 
-COBJS	:= zoom2.o
+COBJS	:= zoom2.o \
+	debug_board.o

Please keep lists sorted.

Quoted 32 lines
board/omap3/zoom2/debug_board.c new file +26 -0
new file mode 100644
index 0000000..a3043b7
@@ -0,0 +1,55 @@
+/*
+ * (C) Copyright 2009
+ * Windriver, <www.windriver.com>
+ * Tom Rix <[email protected]>
+ *
+ * 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 <asm/arch/cpu.h>
+#include <asm/io.h>
+#include <asm/arch/mux.h>
+

board/omap3/zoom2/debug_board.c line 36

Quoted 10 lines
board/omap3/zoom2/debug_board.c new file +10 -0
+#define DEBUG_BOARD_CONNECTED     1
+#define DEBUG_BOARD_NOT_CONNECTED 0
+
+static int debug_board_connected = DEBUG_BOARD_CONNECTED;
+
+static void zoom2_debug_board_detect(void)
+{
+	unsigned int val;
+	/* GPIO to query for debug board
+	   158 db board query, bank 5, index 30 */

Incorrect multiline comment style.

Best regards,

Wolfgang Denk

Signature · 6 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
"Probably the best operating system in the world  is  the  [operating
system] made for the PDP-11 by Bell Laboratories."
                                           - Ted Nelson, October 1977
#9 lore raw

PATCH 1/1 ZOOM2 Add initial support for Zoom2

In reply to Tom Rix
Quoted 5 lines · Tom Rix
include/configs/omap3_zoom2.h new file +5 -0
+#define WRITE_NAND_COMMAND(d, adr)\
+			writel(d, &nand_cs_base->nand_cmd)
+#define WRITE_NAND_ADDRESS(d, adr)\
+			writel(d, &nand_cs_base->nand_adr)
+#define WRITE_NAND(d, adr) writew(d, &nand_cs_base->nand_dat)

include/configs/omap3_zoom2.h line 326

Quoted 10 lines
include/configs/omap3_zoom2.h new file +10 -0
+#define READ_NAND(adr) readl(&nand_cs_base->nand_dat)
+
+/* Other NAND Access APIs */
+#define NAND_WP_OFF() do {readl(&gpmc_cfg_base->config) |= GPMC_CONFIG_WP; } \
+			while (0)
+#define NAND_WP_ON() do {readl(&gpmc_cfg_base->config) &= ~GPMC_CONFIG_WP; } \
+			while (0)
+#define NAND_DISABLE_CE(nand)
+#define NAND_ENABLE_CE(nand)
+#define NAND_WAIT_READY(nand)	udelay(10)

This is the legacy NAND interface which is deprecated and will be removed very soon. You don't seem to be selecting legacy NAND support, so these defines (and some others earlier in the file) are just dead code. Please remove them.

-Scott

author
#10 lore raw

PATCH 1/1 ZOOM2 Add initial support for Zoom2

Quoted 15 lines · Scott Wood
Quoted 13 lines · Tom Rix
include/configs/omap3_zoom2.h new file +13 -0
+#define WRITE_NAND_COMMAND(d, adr)\
+			writel(d, &nand_cs_base->nand_cmd)
+#define WRITE_NAND_ADDRESS(d, adr)\
+			writel(d, &nand_cs_base->nand_adr)
+#define WRITE_NAND(d, adr) writew(d, &nand_cs_base->nand_dat)
+#define READ_NAND(adr) readl(&nand_cs_base->nand_dat)
+
+/* Other NAND Access APIs */
+#define NAND_WP_OFF() do {readl(&gpmc_cfg_base->config) |= GPMC_CONFIG_WP; } \
+			while (0)
+#define NAND_WP_ON() do {readl(&gpmc_cfg_base->config) &= ~GPMC_CONFIG_WP; } \
+			while (0)
+#define NAND_DISABLE_CE(nand)
Quoted 10 lines

include/configs/omap3_zoom2.h line 326

Quoted 3 lines
include/configs/omap3_zoom2.h new file +2 -0
+#define NAND_ENABLE_CE(nand)
+#define NAND_WAIT_READY(nand)	udelay(10)

This is the legacy NAND interface which is deprecated and will be removed very soon. You don't seem to be selecting legacy NAND support, so these defines (and some others earlier in the file) are just dead code. Please remove them.

OK
Since this was a copy from Zoom1, I will also change Zoom1.

Quoted 2 lines

-Scott

#11 lore raw

PATCH 1/1 ZOOM2 Add initial support for Zoom2

In reply to Tom Rix

Dear Tom Rix,

Quoted 9 lines · In message <[email protected]> you wrote:

Zoom2 is a new board from Texas Instruments and LogicPD This is the product description
http://www.logicpd.com/products/development-kits/texas-instruments-zoom%E2%84%A2-omap34x-ii-mdp

This patch provides a zoom2 base target by copying zoom1 and by making some obvious changes. This target compiles but does not yet run.

To configure, run
make omap3_zoom2_config

...

Quoted 5 lines
board/omap3/zoom2/zoom2.c new file +0 -0
new file mode 100644
index 0000000..f861691

...

Quoted 4 lines

+/******************************************************************************
+ * Routine: board_init
+ * Description: Early hardware init.
+ *****************************************************************************/

Here and everywhere else: incorrect multiline comment style. Please fix everywhere.

Quoted 3 lines
include/configs/omap3_zoom2.h new file +0 -0
new file mode 100644
index 0000000..9ea8ea0

...

include/configs/omap3_zoom2.h line 47

Quoted 2 lines
include/configs/omap3_zoom2.h new file +2 -0
+/* Clock Defines */
+#define V_OSCK			26000000	/* Clock output from T2 */

Here and in some other places: line too long. Please fix everywhere.

Best regards,

Wolfgang Denk

Signature · 4 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
Your own mileage may vary.
author
#12 lore raw

PATCH 1/1 ZOOM2 Add initial support for Zoom2

Quoted 24 lines · Wolfgang Denk

Dear Tom Rix,

Quoted 10 lines · In message <[email protected]> you wrote:

Zoom2 is a new board from Texas Instruments and LogicPD This is the product description
http://www.logicpd.com/products/development-kits/texas-instruments-zoom%E2%84%A2-omap34x-ii-mdp

This patch provides a zoom2 base target by copying zoom1 and by making some obvious changes. This target compiles but does not yet run.

To configure, run
make omap3_zoom2_config

...

Quoted 6 lines
board/omap3/zoom2/zoom2.c new file +0 -0
new file mode 100644
index 0000000..f861691

...

Quoted 11 lines
Quoted 5 lines

+/******************************************************************************
+ * Routine: board_init
+ * Description: Early hardware init.
+ *****************************************************************************/

Here and everywhere else: incorrect multiline comment style. Please fix everywhere.

This is common in all the omap3 board files.
I will fix these as well.

Quoted 6 lines
Quoted 4 lines
include/configs/omap3_zoom2.h new file +0 -0
new file mode 100644
index 0000000..9ea8ea0

...

Quoted 9 lines

include/configs/omap3_zoom2.h line 47

Quoted 3 lines
include/configs/omap3_zoom2.h new file +2 -0
+/* Clock Defines */
+#define V_OSCK			26000000	/* Clock output from T2 */

Here and in some other places: line too long. Please fix everywhere.

OK

Quoted 5 lines

Best regards,

Wolfgang Denk