[commit] r1451 - in trunk: . util

[repository service]

Author: uwe
Date: Fri Oct 14 22:33:14 2011
New Revision: 1451
URL: http://flashrom.org/trac/flashrom/changeset/1451

Log:
TIAO/DIYGADGET USB Multi-Protocol Adapter (TUMPA) support.

Thanks to TIAO/DIYGADGET for sponsoring a test device!

This is an FTDI FT2232H based device which provides an easily accessible JTAG,
SPI, I2C, serial breakout. The SPI part can be used to flash SPI flash chips
using flashrom.

http://www.diygadget.com/tiao-usb-multi-protocol-adapter-jtag-spi-i2c-serial...
http://www.tiaowiki.com/w/TIAO_USB_Multi_Protocol_Adapter_User%27s_Manual#SP...

There are two SPI connectors (pin headers) on the board: SPI1, which is
connected to the FT2232H's A interface, and SPI2, which is connected to the
chip's B interface. Both can be used to flash SPI chips:

flashrom -p ft2232_spi:type=tumpa,port=A
 flashrom -p ft2232_spi:type=tumpa,port=B

The default interface is A, so for SPI1 you can also just write:

flashrom -p ft2232_spi:type=tumpa

I tested all operations on both interfaces, everything works fine.

Signed-off-by: Uwe Hermann 
Acked-by: Stefan Tauner

Modified:
   trunk/flashrom.8
   trunk/ft2232_spi.c
   trunk/util/z60_flashrom.rules

Modified: trunk/flashrom.8
==============================================================================
--- trunk/flashrom.8	Mon Sep 19 00:42:18 2011	(r1450)
+++ trunk/flashrom.8	Fri Oct 14 22:33:14 2011	(r1451)
@@ -199,7 +199,8 @@
 based USB SPI programmer), including the DLP Design DLP-USB1232H, \
 FTDI FT2232H Mini-Module, FTDI FT4232H Mini-Module, openbiosprog-spi, Amontec \
 JTAGkey/JTAGkey-tiny/JTAGkey-2, Dangerous Prototypes Bus Blaster, \
-Olimex ARM-USB-TINY/-H, and Olimex ARM-USB-OCD/-H."
+Olimex ARM-USB-TINY/-H, Olimex ARM-USB-OCD/-H, and TIAO/DIYGADGET USB
+Multi-Protocol Adapter (TUMPA).
 .sp
 .BR "* serprog" " (for flash ROMs attached to a programmer speaking serprog), \
 including AVR flasher by Urja Rannikko, AVR flasher by eightdot, \
@@ -441,7 +442,8 @@
 .B model
 can be
 .BR 2232H ", " 4232H ", " jtagkey ", " busblaster ", " openmoko ", " \
-arm-usb-tiny ", " arm-usb-tiny-h ", " arm-usb-ocd " or " arm-usb-ocd-h
+arm-usb-tiny ", " arm-usb-tiny-h ", " arm-usb-ocd ", " arm-usb-ocd-h \
+", or " tumpa
 and
 .B interface
 can be

Modified: trunk/ft2232_spi.c
==============================================================================
--- trunk/ft2232_spi.c	Mon Sep 19 00:42:18 2011	(r1450)
+++ trunk/ft2232_spi.c	Fri Oct 14 22:33:14 2011	(r1451)
@@ -29,9 +29,12 @@
 #include "spi.h"
 #include <ftdi.h>

+/* Please keep sorted by vendor ID, then device ID. */
+
 #define FTDI_VID		0x0403
 #define FTDI_FT2232H_PID	0x6010
 #define FTDI_FT4232H_PID	0x6011
+#define TIAO_TUMPA_PID		0x8a98
 #define AMONTEC_JTAGKEY_PID	0xCFF8

#define FIC_VID			0x1457
@@ -46,6 +49,7 @@
 const struct usbdev_status devs_ft2232spi[] = {
    {FTDI_VID, FTDI_FT2232H_PID, OK, "FTDI", "FT2232H"},
    {FTDI_VID, FTDI_FT4232H_PID, OK, "FTDI", "FT4232H"},
+	{FTDI_VID, TIAO_TUMPA_PID, OK, "TIAO", "USB Multi-Protocol Adapter"},
    {FTDI_VID, AMONTEC_JTAGKEY_PID, OK, "Amontec", "JTAGkey"},
    {FIC_VID, OPENMOKO_DBGBOARD_PID, OK, "FIC",
    	"OpenMoko Neo1973 Debug board (V2+)"},
@@ -172,6 +176,10 @@
    		ft2232_interface = INTERFACE_A;
    		cs_bits = 0x18;
    		pindir = 0x1b;
+		} else if (!strcasecmp(arg, "tumpa")) {
+			/* Interface A is SPI1, B is SPI2. */
+			ft2232_type = TIAO_TUMPA_PID;
+			ft2232_interface = INTERFACE_A;
    	} else if (!strcasecmp(arg, "busblaster")) {
    		/* In its default configuration it is a jtagkey clone */
    		ft2232_type = FTDI_FT2232H_PID;

Modified: trunk/util/z60_flashrom.rules
==============================================================================
--- trunk/util/z60_flashrom.rules	Mon Sep 19 00:42:18 2011	(r1450)
+++ trunk/util/z60_flashrom.rules	Fri Oct 14 22:33:14 2011	(r1451)
@@ -72,4 +72,8 @@
 # http://olimex.com/dev/arm-usb-tiny-h.html
 ATTRS{idVendor}=="15ba", ATTRS{idProduct}=="002a", MODE="664", GROUP="plugdev"

+# TIAO/DIYGADGET USB Multi-Protocol Adapter (TUMPA)
+# http://www.diygadget.com/tiao-usb-multi-protocol-adapter-jtag-spi-i2c-serial...
+ATTRS{idVendor}=="0403", ATTRS{idProduct}=="8a98", MODE="664", GROUP="plugdev"
+
 LABEL="flashrom_rules_end"