cmd_i2c.c 43.9 KB
Newer Older
W
wdenk 已提交
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62
/*
 * (C) Copyright 2001
 * Gerald Van Baren, Custom IDEAS, vanbaren@cideas.com.
 *
 * 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
 */

/*
 * I2C Functions similar to the standard memory functions.
 *
 * There are several parameters in many of the commands that bear further
 * explanations:
 *
 * {i2c_chip} is the I2C chip address (the first byte sent on the bus).
 *   Each I2C chip on the bus has a unique address.  On the I2C data bus,
 *   the address is the upper seven bits and the LSB is the "read/write"
 *   bit.  Note that the {i2c_chip} address specified on the command
 *   line is not shifted up: e.g. a typical EEPROM memory chip may have
 *   an I2C address of 0x50, but the data put on the bus will be 0xA0
 *   for write and 0xA1 for read.  This "non shifted" address notation
 *   matches at least half of the data sheets :-/.
 *
 * {addr} is the address (or offset) within the chip.  Small memory
 *   chips have 8 bit addresses.  Large memory chips have 16 bit
 *   addresses.  Other memory chips have 9, 10, or 11 bit addresses.
 *   Many non-memory chips have multiple registers and {addr} is used
 *   as the register index.  Some non-memory chips have only one register
 *   and therefore don't need any {addr} parameter.
 *
 *   The default {addr} parameter is one byte (.1) which works well for
 *   memories and registers with 8 bits of address space.
 *
 *   You can specify the length of the {addr} field with the optional .0,
 *   .1, or .2 modifier (similar to the .b, .w, .l modifier).  If you are
 *   manipulating a single register device which doesn't use an address
 *   field, use "0.0" for the address and the ".0" length field will
 *   suppress the address in the I2C data stream.  This also works for
 *   successive reads using the I2C auto-incrementing memory pointer.
 *
 *   If you are manipulating a large memory with 2-byte addresses, use
 *   the .2 address modifier, e.g. 210.2 addresses location 528 (decimal).
 *
 *   Then there are the unfortunate memory chips that spill the most
 *   significant 1, 2, or 3 bits of address into the chip address byte.
 *   This effectively makes one chip (logically) look like 2, 4, or
 *   8 chips.  This is handled (awkwardly) by #defining
63
 *   CONFIG_SYS_I2C_EEPROM_ADDR_OVERFLOW and using the .1 modifier on the
W
wdenk 已提交
64 65 66
 *   {addr} field (since .1 is the default, it doesn't actually have to
 *   be specified).  Examples: given a memory chip at I2C chip address
 *   0x50, the following would happen...
67
 *     i2c md 50 0 10   display 16 bytes starting at 0x000
W
wdenk 已提交
68
 *                      On the bus: <S> A0 00 <E> <S> A1 <rd> ... <rd>
69
 *     i2c md 50 100 10 display 16 bytes starting at 0x100
W
wdenk 已提交
70
 *                      On the bus: <S> A2 00 <E> <S> A3 <rd> ... <rd>
71
 *     i2c md 50 210 10 display 16 bytes starting at 0x210
W
wdenk 已提交
72 73 74 75 76 77 78 79 80
 *                      On the bus: <S> A4 10 <E> <S> A5 <rd> ... <rd>
 *   This is awfully ugly.  It would be nice if someone would think up
 *   a better way of handling this.
 *
 * Adapted from cmd_mem.c which is copyright Wolfgang Denk (wd@denx.de).
 */

#include <common.h>
#include <command.h>
81
#include <edid.h>
82
#include <environment.h>
W
wdenk 已提交
83
#include <i2c.h>
84
#include <malloc.h>
W
wdenk 已提交
85
#include <asm/byteorder.h>
86
#include <linux/compiler.h>
W
wdenk 已提交
87 88 89 90 91 92 93 94 95 96 97 98 99

/* Display values from last command.
 * Memory modify remembered values are different from display memory.
 */
static uchar	i2c_dp_last_chip;
static uint	i2c_dp_last_addr;
static uint	i2c_dp_last_alen;
static uint	i2c_dp_last_length = 0x10;

static uchar	i2c_mm_last_chip;
static uint	i2c_mm_last_addr;
static uint	i2c_mm_last_alen;

B
Ben Warren 已提交
100 101 102 103 104
/* If only one I2C bus is present, the list of devices to ignore when
 * the probe command is issued is represented by a 1D array of addresses.
 * When multiple buses are present, the list is an array of bus-address
 * pairs.  The following macros take care of this */

105
#if defined(CONFIG_SYS_I2C_NOPROBES)
B
Ben Warren 已提交
106 107 108 109 110
#if defined(CONFIG_I2C_MULTI_BUS)
static struct
{
	uchar	bus;
	uchar	addr;
111
} i2c_no_probes[] = CONFIG_SYS_I2C_NOPROBES;
B
Ben Warren 已提交
112 113 114 115 116
#define GET_BUS_NUM	i2c_get_bus_num()
#define COMPARE_BUS(b,i)	(i2c_no_probes[(i)].bus == (b))
#define COMPARE_ADDR(a,i)	(i2c_no_probes[(i)].addr == (a))
#define NO_PROBE_ADDR(i)	i2c_no_probes[(i)].addr
#else		/* single bus */
117
static uchar i2c_no_probes[] = CONFIG_SYS_I2C_NOPROBES;
B
Ben Warren 已提交
118 119 120 121 122 123 124
#define GET_BUS_NUM	0
#define COMPARE_BUS(b,i)	((b) == 0)	/* Make compiler happy */
#define COMPARE_ADDR(a,i)	(i2c_no_probes[(i)] == (a))
#define NO_PROBE_ADDR(i)	i2c_no_probes[(i)]
#endif	/* CONFIG_MULTI_BUS */

#define NUM_ELEMENTS_NOPROBE (sizeof(i2c_no_probes)/sizeof(i2c_no_probes[0]))
W
wdenk 已提交
125 126
#endif

127 128
#if defined(CONFIG_I2C_MUX)
static I2C_MUX_DEVICE	*i2c_mux_devices = NULL;
129
static	int	i2c_mux_busid = CONFIG_SYS_MAX_I2C_BUS;
130 131 132 133 134

DECLARE_GLOBAL_DATA_PTR;

#endif

135 136
#define DISP_LINE_LEN	16

137 138 139 140 141 142 143
/**
 * i2c_init_board() - Board-specific I2C bus init
 *
 * This function is the default no-op implementation of I2C bus
 * initialization. This function can be overriden by board-specific
 * implementation if needed.
 */
144 145
__weak
void i2c_init_board(void)
146 147 148 149
{
	return;
}

150
/* TODO: Implement architecture-specific get/set functions */
151 152 153 154 155 156 157 158 159 160 161 162 163

/**
 * i2c_get_bus_speed() - Return I2C bus speed
 *
 * This function is the default implementation of function for retrieveing
 * the current I2C bus speed in Hz.
 *
 * A driver implementing runtime switching of I2C bus speed must override
 * this function to report the speed correctly. Simple or legacy drivers
 * can use this fallback.
 *
 * Returns I2C bus speed in Hz.
 */
164 165
__weak
unsigned int i2c_get_bus_speed(void)
166 167 168 169
{
	return CONFIG_SYS_I2C_SPEED;
}

170 171 172 173 174 175 176 177 178 179 180 181 182
/**
 * i2c_set_bus_speed() - Configure I2C bus speed
 * @speed:	Newly set speed of the I2C bus in Hz
 *
 * This function is the default implementation of function for setting
 * the I2C bus speed in Hz.
 *
 * A driver implementing runtime switching of I2C bus speed must override
 * this function to report the speed correctly. Simple or legacy drivers
 * can use this fallback.
 *
 * Returns zero on success, negative value on error.
 */
183 184
__weak
int i2c_set_bus_speed(unsigned int speed)
185 186 187 188 189 190 191
{
	if (speed != CONFIG_SYS_I2C_SPEED)
		return -1;

	return 0;
}

192 193 194 195
/**
 * get_alen() - Small parser helper function to get address length
 *
 * Returns the address length.
196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212
 */
static uint get_alen(char *arg)
{
	int	j;
	int	alen;

	alen = 1;
	for (j = 0; j < 8; j++) {
		if (arg[j] == '.') {
			alen = arg[j+1] - '0';
			break;
		} else if (arg[j] == '\0')
			break;
	}
	return alen;
}

213 214 215 216 217 218 219 220 221 222
/**
 * do_i2c_read() - Handle the "i2c read" command-line command
 * @cmdtp:	Command data struct pointer
 * @flag:	Command flag
 * @argc:	Command-line argument count
 * @argv:	Array of command-line arguments
 *
 * Returns zero on success, CMD_RET_USAGE in case of misuse and negative
 * on error.
 *
223 224 225
 * Syntax:
 *	i2c read {i2c_chip} {devaddr}{.0, .1, .2} {len} {memaddr}
 */
226
static int do_i2c_read ( cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
227 228 229 230 231
{
	u_char	chip;
	uint	devaddr, alen, length;
	u_char  *memaddr;

232
	if (argc != 5)
233
		return CMD_RET_USAGE;
234 235 236 237 238 239 240 241 242 243 244

	/*
	 * I2C chip address
	 */
	chip = simple_strtoul(argv[1], NULL, 16);

	/*
	 * I2C data address within the chip.  This can be 1 or
	 * 2 bytes long.  Some day it might be 3 bytes long :-).
	 */
	devaddr = simple_strtoul(argv[2], NULL, 16);
245
	alen = get_alen(argv[2]);
R
Reinhard Meyer 已提交
246
	if (alen > 3)
247
		return CMD_RET_USAGE;
248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265

	/*
	 * Length is the number of objects, not number of bytes.
	 */
	length = simple_strtoul(argv[3], NULL, 16);

	/*
	 * memaddr is the address where to store things in memory
	 */
	memaddr = (u_char *)simple_strtoul(argv[4], NULL, 16);

	if (i2c_read(chip, devaddr, alen, memaddr, length) != 0) {
		puts ("Error reading the chip.\n");
		return 1;
	}
	return 0;
}

Y
York Sun 已提交
266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313
static int do_i2c_write(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{
	u_char	chip;
	uint	devaddr, alen, length;
	u_char  *memaddr;

	if (argc != 5)
		return cmd_usage(cmdtp);

	/*
	 * memaddr is the address where to store things in memory
	 */
	memaddr = (u_char *)simple_strtoul(argv[1], NULL, 16);

	/*
	 * I2C chip address
	 */
	chip = simple_strtoul(argv[2], NULL, 16);

	/*
	 * I2C data address within the chip.  This can be 1 or
	 * 2 bytes long.  Some day it might be 3 bytes long :-).
	 */
	devaddr = simple_strtoul(argv[3], NULL, 16);
	alen = get_alen(argv[3]);
	if (alen > 3)
		return cmd_usage(cmdtp);

	/*
	 * Length is the number of objects, not number of bytes.
	 */
	length = simple_strtoul(argv[4], NULL, 16);

	while (length-- > 0) {
		if (i2c_write(chip, devaddr++, alen, memaddr++, 1) != 0) {
			puts("Error writing to the chip.\n");
			return 1;
		}
/*
 * No write delay with FRAM devices.
 */
#if !defined(CONFIG_SYS_I2C_FRAM)
		udelay(11000);
#endif
	}
	return 0;
}

314 315 316 317 318 319 320 321 322 323
/**
 * do_i2c_md() - Handle the "i2c md" command-line command
 * @cmdtp:	Command data struct pointer
 * @flag:	Command flag
 * @argc:	Command-line argument count
 * @argv:	Array of command-line arguments
 *
 * Returns zero on success, CMD_RET_USAGE in case of misuse and negative
 * on error.
 *
324 325 326
 * Syntax:
 *	i2c md {i2c_chip} {addr}{.0, .1, .2} {len}
 */
327
static int do_i2c_md ( cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
W
wdenk 已提交
328 329 330 331 332 333 334 335 336 337 338 339 340
{
	u_char	chip;
	uint	addr, alen, length;
	int	j, nbytes, linebytes;

	/* We use the last specified parameters, unless new ones are
	 * entered.
	 */
	chip   = i2c_dp_last_chip;
	addr   = i2c_dp_last_addr;
	alen   = i2c_dp_last_alen;
	length = i2c_dp_last_length;

341
	if (argc < 3)
342
		return CMD_RET_USAGE;
W
wdenk 已提交
343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358

	if ((flag & CMD_FLAG_REPEAT) == 0) {
		/*
		 * New command specified.
		 */

		/*
		 * I2C chip address
		 */
		chip = simple_strtoul(argv[1], NULL, 16);

		/*
		 * I2C data address within the chip.  This can be 1 or
		 * 2 bytes long.  Some day it might be 3 bytes long :-).
		 */
		addr = simple_strtoul(argv[2], NULL, 16);
359
		alen = get_alen(argv[2]);
R
Reinhard Meyer 已提交
360
		if (alen > 3)
361
			return CMD_RET_USAGE;
W
wdenk 已提交
362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383

		/*
		 * If another parameter, it is the length to display.
		 * Length is the number of objects, not number of bytes.
		 */
		if (argc > 3)
			length = simple_strtoul(argv[3], NULL, 16);
	}

	/*
	 * Print the lines.
	 *
	 * We buffer all read data, so we can make sure data is read only
	 * once.
	 */
	nbytes = length;
	do {
		unsigned char	linebuf[DISP_LINE_LEN];
		unsigned char	*cp;

		linebytes = (nbytes > DISP_LINE_LEN) ? DISP_LINE_LEN : nbytes;

384
		if (i2c_read(chip, addr, alen, linebuf, linebytes) != 0)
385
			puts ("Error reading the chip.\n");
386
		else {
W
wdenk 已提交
387 388 389 390 391 392
			printf("%04x:", addr);
			cp = linebuf;
			for (j=0; j<linebytes; j++) {
				printf(" %02x", *cp++);
				addr++;
			}
393
			puts ("    ");
W
wdenk 已提交
394 395 396
			cp = linebuf;
			for (j=0; j<linebytes; j++) {
				if ((*cp < 0x20) || (*cp > 0x7e))
397
					puts (".");
W
wdenk 已提交
398 399 400 401
				else
					printf("%c", *cp);
				cp++;
			}
402
			putc ('\n');
W
wdenk 已提交
403 404 405 406 407 408 409 410 411 412 413 414
		}
		nbytes -= linebytes;
	} while (nbytes > 0);

	i2c_dp_last_chip   = chip;
	i2c_dp_last_addr   = addr;
	i2c_dp_last_alen   = alen;
	i2c_dp_last_length = length;

	return 0;
}

415 416 417 418 419 420 421 422 423
/**
 * do_i2c_mw() - Handle the "i2c mw" command-line command
 * @cmdtp:	Command data struct pointer
 * @flag:	Command flag
 * @argc:	Command-line argument count
 * @argv:	Array of command-line arguments
 *
 * Returns zero on success, CMD_RET_USAGE in case of misuse and negative
 * on error.
W
wdenk 已提交
424 425
 *
 * Syntax:
426
 *	i2c mw {i2c_chip} {addr}{.0, .1, .2} {data} [{count}]
W
wdenk 已提交
427
 */
428
static int do_i2c_mw ( cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
W
wdenk 已提交
429 430 431 432 433 434 435
{
	uchar	chip;
	ulong	addr;
	uint	alen;
	uchar	byte;
	int	count;

436
	if ((argc < 4) || (argc > 5))
437
		return CMD_RET_USAGE;
W
wdenk 已提交
438 439

	/*
W
Wolfgang Denk 已提交
440 441
	 * Chip is always specified.
	 */
W
wdenk 已提交
442 443 444 445 446 447
	chip = simple_strtoul(argv[1], NULL, 16);

	/*
	 * Address is always specified.
	 */
	addr = simple_strtoul(argv[2], NULL, 16);
448
	alen = get_alen(argv[2]);
R
Reinhard Meyer 已提交
449
	if (alen > 3)
450
		return CMD_RET_USAGE;
W
wdenk 已提交
451 452 453 454 455 456 457 458 459

	/*
	 * Value to write is always specified.
	 */
	byte = simple_strtoul(argv[3], NULL, 16);

	/*
	 * Optional count
	 */
460
	if (argc == 5)
W
wdenk 已提交
461
		count = simple_strtoul(argv[4], NULL, 16);
462
	else
W
wdenk 已提交
463 464 465
		count = 1;

	while (count-- > 0) {
466
		if (i2c_write(chip, addr++, alen, &byte, 1) != 0)
467
			puts ("Error writing the chip.\n");
W
wdenk 已提交
468 469 470 471
		/*
		 * Wait for the write to complete.  The write can take
		 * up to 10mSec (we allow a little more time).
		 */
已提交
472 473 474
/*
 * No write delay with FRAM devices.
 */
475
#if !defined(CONFIG_SYS_I2C_FRAM)
W
wdenk 已提交
476
		udelay(11000);
已提交
477
#endif
W
wdenk 已提交
478 479
	}

480
	return 0;
W
wdenk 已提交
481 482
}

483 484 485 486 487 488 489 490 491 492 493
/**
 * do_i2c_crc() - Handle the "i2c crc32" command-line command
 * @cmdtp:	Command data struct pointer
 * @flag:	Command flag
 * @argc:	Command-line argument count
 * @argv:	Array of command-line arguments
 *
 * Calculate a CRC on memory
 *
 * Returns zero on success, CMD_RET_USAGE in case of misuse and negative
 * on error.
W
wdenk 已提交
494 495
 *
 * Syntax:
496
 *	i2c crc32 {i2c_chip} {addr}{.0, .1, .2} {count}
W
wdenk 已提交
497
 */
498
static int do_i2c_crc (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
W
wdenk 已提交
499 500 501 502 503 504 505 506 507
{
	uchar	chip;
	ulong	addr;
	uint	alen;
	int	count;
	uchar	byte;
	ulong	crc;
	ulong	err;

508
	if (argc < 4)
509
		return CMD_RET_USAGE;
W
wdenk 已提交
510 511

	/*
W
Wolfgang Denk 已提交
512 513
	 * Chip is always specified.
	 */
W
wdenk 已提交
514 515 516 517 518 519
	chip = simple_strtoul(argv[1], NULL, 16);

	/*
	 * Address is always specified.
	 */
	addr = simple_strtoul(argv[2], NULL, 16);
520
	alen = get_alen(argv[2]);
R
Reinhard Meyer 已提交
521
	if (alen > 3)
522
		return CMD_RET_USAGE;
W
wdenk 已提交
523 524 525 526 527 528 529 530 531 532 533 534 535

	/*
	 * Count is always specified
	 */
	count = simple_strtoul(argv[3], NULL, 16);

	printf ("CRC32 for %08lx ... %08lx ==> ", addr, addr + count - 1);
	/*
	 * CRC a byte at a time.  This is going to be slooow, but hey, the
	 * memories are small and slow too so hopefully nobody notices.
	 */
	crc = 0;
	err = 0;
536 537
	while (count-- > 0) {
		if (i2c_read(chip, addr, alen, &byte, 1) != 0)
W
wdenk 已提交
538 539 540 541
			err++;
		crc = crc32 (crc, &byte, 1);
		addr++;
	}
542
	if (err > 0)
543
		puts ("Error reading the chip,\n");
544
	else
W
wdenk 已提交
545 546 547 548 549
		printf ("%08lx\n", crc);

	return 0;
}

550 551 552 553 554 555 556 557 558 559 560
/**
 * mod_i2c_mem() - Handle the "i2c mm" and "i2c nm" command-line command
 * @cmdtp:	Command data struct pointer
 * @flag:	Command flag
 * @argc:	Command-line argument count
 * @argv:	Array of command-line arguments
 *
 * Modify memory.
 *
 * Returns zero on success, CMD_RET_USAGE in case of misuse and negative
 * on error.
W
wdenk 已提交
561 562
 *
 * Syntax:
563 564
 *	i2c mm{.b, .w, .l} {i2c_chip} {addr}{.0, .1, .2}
 *	i2c nm{.b, .w, .l} {i2c_chip} {addr}{.0, .1, .2}
W
wdenk 已提交
565 566
 */
static int
567
mod_i2c_mem(cmd_tbl_t *cmdtp, int incrflag, int flag, int argc, char * const argv[])
W
wdenk 已提交
568 569 570 571 572 573 574 575
{
	uchar	chip;
	ulong	addr;
	uint	alen;
	ulong	data;
	int	size = 1;
	int	nbytes;

576
	if (argc != 3)
577
		return CMD_RET_USAGE;
W
wdenk 已提交
578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597

#ifdef CONFIG_BOOT_RETRY_TIME
	reset_cmd_timeout();	/* got a good command to get here */
#endif
	/*
	 * We use the last specified parameters, unless new ones are
	 * entered.
	 */
	chip = i2c_mm_last_chip;
	addr = i2c_mm_last_addr;
	alen = i2c_mm_last_alen;

	if ((flag & CMD_FLAG_REPEAT) == 0) {
		/*
		 * New command specified.  Check for a size specification.
		 * Defaults to byte if no or incorrect specification.
		 */
		size = cmd_get_data_size(argv[0], 1);

		/*
W
Wolfgang Denk 已提交
598 599
		 * Chip is always specified.
		 */
W
wdenk 已提交
600 601 602 603 604 605
		chip = simple_strtoul(argv[1], NULL, 16);

		/*
		 * Address is always specified.
		 */
		addr = simple_strtoul(argv[2], NULL, 16);
606
		alen = get_alen(argv[2]);
R
Reinhard Meyer 已提交
607
		if (alen > 3)
608
			return CMD_RET_USAGE;
W
wdenk 已提交
609 610 611 612 613 614 615 616
	}

	/*
	 * Print the address, followed by value.  Then accept input for
	 * the next value.  A non-converted value exits.
	 */
	do {
		printf("%08lx:", addr);
617
		if (i2c_read(chip, addr, alen, (uchar *)&data, size) != 0)
618
			puts ("\nError reading the chip,\n");
619
		else {
W
wdenk 已提交
620
			data = cpu_to_be32(data);
621
			if (size == 1)
W
wdenk 已提交
622
				printf(" %02lx", (data >> 24) & 0x000000FF);
623
			else if (size == 2)
W
wdenk 已提交
624
				printf(" %04lx", (data >> 16) & 0x0000FFFF);
625
			else
W
wdenk 已提交
626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642
				printf(" %08lx", data);
		}

		nbytes = readline (" ? ");
		if (nbytes == 0) {
			/*
			 * <CR> pressed as only input, don't modify current
			 * location and move to next.
			 */
			if (incrflag)
				addr += size;
			nbytes = size;
#ifdef CONFIG_BOOT_RETRY_TIME
			reset_cmd_timeout(); /* good enough to not time out */
#endif
		}
#ifdef CONFIG_BOOT_RETRY_TIME
643
		else if (nbytes == -2)
W
wdenk 已提交
644 645 646 647 648 649
			break;	/* timed out, exit the command	*/
#endif
		else {
			char *endp;

			data = simple_strtoul(console_buffer, &endp, 16);
650
			if (size == 1)
W
wdenk 已提交
651
				data = data << 24;
652
			else if (size == 2)
W
wdenk 已提交
653 654 655 656 657 658 659 660 661 662
				data = data << 16;
			data = be32_to_cpu(data);
			nbytes = endp - console_buffer;
			if (nbytes) {
#ifdef CONFIG_BOOT_RETRY_TIME
				/*
				 * good enough to not time out
				 */
				reset_cmd_timeout();
#endif
663
				if (i2c_write(chip, addr, alen, (uchar *)&data, size) != 0)
664
					puts ("Error writing the chip.\n");
665 666
#ifdef CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS
				udelay(CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS * 1000);
W
wdenk 已提交
667
#endif
W
wdenk 已提交
668 669 670 671 672 673
				if (incrflag)
					addr += size;
			}
		}
	} while (nbytes);

P
Peter Tyser 已提交
674 675 676
	i2c_mm_last_chip = chip;
	i2c_mm_last_addr = addr;
	i2c_mm_last_alen = alen;
W
wdenk 已提交
677 678 679 680

	return 0;
}

681 682 683 684 685 686 687 688 689 690
/**
 * do_i2c_probe() - Handle the "i2c probe" command-line command
 * @cmdtp:	Command data struct pointer
 * @flag:	Command flag
 * @argc:	Command-line argument count
 * @argv:	Array of command-line arguments
 *
 * Returns zero on success, CMD_RET_USAGE in case of misuse and negative
 * on error.
 *
W
wdenk 已提交
691
 * Syntax:
692 693 694
 *	i2c probe {addr}
 *
 * Returns zero (success) if one or more I2C devices was found
W
wdenk 已提交
695
 */
696
static int do_i2c_probe (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
W
wdenk 已提交
697 698
{
	int j;
699 700
	int addr = -1;
	int found = 0;
701
#if defined(CONFIG_SYS_I2C_NOPROBES)
W
wdenk 已提交
702
	int k, skip;
B
Ben Warren 已提交
703 704
	uchar bus = GET_BUS_NUM;
#endif	/* NOPROBES */
W
wdenk 已提交
705

706 707 708
	if (argc == 2)
		addr = simple_strtol(argv[1], 0, 16);

709
	puts ("Valid chip addresses:");
710
	for (j = 0; j < 128; j++) {
711 712 713
		if ((0 <= addr) && (j != addr))
			continue;

714
#if defined(CONFIG_SYS_I2C_NOPROBES)
W
wdenk 已提交
715
		skip = 0;
716 717
		for (k=0; k < NUM_ELEMENTS_NOPROBE; k++) {
			if (COMPARE_BUS(bus, k) && COMPARE_ADDR(j, k)) {
W
wdenk 已提交
718 719 720 721 722 723 724
				skip = 1;
				break;
			}
		}
		if (skip)
			continue;
#endif
725
		if (i2c_probe(j) == 0) {
W
wdenk 已提交
726
			printf(" %02X", j);
727 728
			found++;
		}
W
wdenk 已提交
729
	}
730
	putc ('\n');
W
wdenk 已提交
731

732
#if defined(CONFIG_SYS_I2C_NOPROBES)
W
wdenk 已提交
733
	puts ("Excluded chip addresses:");
734 735
	for (k=0; k < NUM_ELEMENTS_NOPROBE; k++) {
		if (COMPARE_BUS(bus,k))
B
Ben Warren 已提交
736 737
			printf(" %02X", NO_PROBE_ADDR(k));
	}
738
	putc ('\n');
W
wdenk 已提交
739 740
#endif

741
	return (0 == found);
W
wdenk 已提交
742 743
}

744 745 746 747 748 749 750 751 752 753
/**
 * do_i2c_loop() - Handle the "i2c loop" command-line command
 * @cmdtp:	Command data struct pointer
 * @flag:	Command flag
 * @argc:	Command-line argument count
 * @argv:	Array of command-line arguments
 *
 * Returns zero on success, CMD_RET_USAGE in case of misuse and negative
 * on error.
 *
W
wdenk 已提交
754
 * Syntax:
755
 *	i2c loop {i2c_chip} {addr}{.0, .1, .2} [{length}] [{delay}]
W
wdenk 已提交
756 757 758
 *	{length} - Number of bytes to read
 *	{delay}  - A DECIMAL number and defaults to 1000 uSec
 */
759
static int do_i2c_loop(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
W
wdenk 已提交
760 761 762 763 764 765 766 767
{
	u_char	chip;
	ulong	alen;
	uint	addr;
	uint	length;
	u_char	bytes[16];
	int	delay;

768
	if (argc < 3)
769
		return CMD_RET_USAGE;
W
wdenk 已提交
770 771 772 773 774 775 776 777 778 779

	/*
	 * Chip is always specified.
	 */
	chip = simple_strtoul(argv[1], NULL, 16);

	/*
	 * Address is always specified.
	 */
	addr = simple_strtoul(argv[2], NULL, 16);
780
	alen = get_alen(argv[2]);
R
Reinhard Meyer 已提交
781
	if (alen > 3)
782
		return CMD_RET_USAGE;
W
wdenk 已提交
783 784 785 786 787 788

	/*
	 * Length is the number of objects, not number of bytes.
	 */
	length = 1;
	length = simple_strtoul(argv[3], NULL, 16);
789
	if (length > sizeof(bytes))
W
wdenk 已提交
790 791 792 793 794 795
		length = sizeof(bytes);

	/*
	 * The delay time (uSec) is optional.
	 */
	delay = 1000;
796
	if (argc > 3)
W
wdenk 已提交
797 798 799 800
		delay = simple_strtoul(argv[4], NULL, 10);
	/*
	 * Run the loop...
	 */
801 802
	while (1) {
		if (i2c_read(chip, addr, alen, bytes, length) != 0)
803
			puts ("Error reading the chip.\n");
W
wdenk 已提交
804 805 806 807 808 809 810 811 812 813
		udelay(delay);
	}

	/* NOTREACHED */
	return 0;
}

/*
 * The SDRAM command is separately configured because many
 * (most?) embedded boards don't use SDRAM DIMMs.
814 815
 *
 * FIXME: Document and probably move elsewhere!
W
wdenk 已提交
816
 */
817
#if defined(CONFIG_CMD_SDRAM)
818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863
static void print_ddr2_tcyc (u_char const b)
{
	printf ("%d.", (b >> 4) & 0x0F);
	switch (b & 0x0F) {
	case 0x0:
	case 0x1:
	case 0x2:
	case 0x3:
	case 0x4:
	case 0x5:
	case 0x6:
	case 0x7:
	case 0x8:
	case 0x9:
		printf ("%d ns\n", b & 0x0F);
		break;
	case 0xA:
		puts ("25 ns\n");
		break;
	case 0xB:
		puts ("33 ns\n");
		break;
	case 0xC:
		puts ("66 ns\n");
		break;
	case 0xD:
		puts ("75 ns\n");
		break;
	default:
		puts ("?? ns\n");
		break;
	}
}

static void decode_bits (u_char const b, char const *str[], int const do_once)
{
	u_char mask;

	for (mask = 0x80; mask != 0x00; mask >>= 1, ++str) {
		if (b & mask) {
			puts (*str);
			if (do_once)
				return;
		}
	}
}
W
wdenk 已提交
864 865 866

/*
 * Syntax:
867
 *	i2c sdram {i2c_chip}
W
wdenk 已提交
868
 */
869
static int do_sdram (cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
W
wdenk 已提交
870
{
871 872
	enum { unknown, EDO, SDRAM, DDR2 } type;

W
wdenk 已提交
873 874 875 876 877
	u_char	chip;
	u_char	data[128];
	u_char	cksum;
	int	j;

878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921
	static const char *decode_CAS_DDR2[] = {
		" TBD", " 6", " 5", " 4", " 3", " 2", " TBD", " TBD"
	};

	static const char *decode_CAS_default[] = {
		" TBD", " 7", " 6", " 5", " 4", " 3", " 2", " 1"
	};

	static const char *decode_CS_WE_default[] = {
		" TBD", " 6", " 5", " 4", " 3", " 2", " 1", " 0"
	};

	static const char *decode_byte21_default[] = {
		"  TBD (bit 7)\n",
		"  Redundant row address\n",
		"  Differential clock input\n",
		"  Registerd DQMB inputs\n",
		"  Buffered DQMB inputs\n",
		"  On-card PLL\n",
		"  Registered address/control lines\n",
		"  Buffered address/control lines\n"
	};

	static const char *decode_byte22_DDR2[] = {
		"  TBD (bit 7)\n",
		"  TBD (bit 6)\n",
		"  TBD (bit 5)\n",
		"  TBD (bit 4)\n",
		"  TBD (bit 3)\n",
		"  Supports partial array self refresh\n",
		"  Supports 50 ohm ODT\n",
		"  Supports weak driver\n"
	};

	static const char *decode_row_density_DDR2[] = {
		"512 MiB", "256 MiB", "128 MiB", "16 GiB",
		"8 GiB", "4 GiB", "2 GiB", "1 GiB"
	};

	static const char *decode_row_density_default[] = {
		"512 MiB", "256 MiB", "128 MiB", "64 MiB",
		"32 MiB", "16 MiB", "8 MiB", "4 MiB"
	};

922
	if (argc < 2)
923
		return CMD_RET_USAGE;
924

W
wdenk 已提交
925 926
	/*
	 * Chip is always specified.
927 928
	 */
	chip = simple_strtoul (argv[1], NULL, 16);
W
wdenk 已提交
929

930
	if (i2c_read (chip, 0, 1, data, sizeof (data)) != 0) {
931
		puts ("No SDRAM Serial Presence Detect found.\n");
W
wdenk 已提交
932 933 934 935 936 937 938
		return 1;
	}

	cksum = 0;
	for (j = 0; j < 63; j++) {
		cksum += data[j];
	}
939
	if (cksum != data[63]) {
W
wdenk 已提交
940
		printf ("WARNING: Configuration data checksum failure:\n"
941
			"  is 0x%02x, calculated 0x%02x\n", data[63], cksum);
W
wdenk 已提交
942
	}
943
	printf ("SPD data revision            %d.%d\n",
W
wdenk 已提交
944
		(data[62] >> 4) & 0x0F, data[62] & 0x0F);
945 946 947
	printf ("Bytes used                   0x%02X\n", data[0]);
	printf ("Serial memory size           0x%02X\n", 1 << data[1]);

948
	puts ("Memory type                  ");
949
	switch (data[2]) {
950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965
	case 2:
		type = EDO;
		puts ("EDO\n");
		break;
	case 4:
		type = SDRAM;
		puts ("SDRAM\n");
		break;
	case 8:
		type = DDR2;
		puts ("DDR2\n");
		break;
	default:
		type = unknown;
		puts ("unknown\n");
		break;
W
wdenk 已提交
966
	}
967

968
	puts ("Row address bits             ");
969
	if ((data[3] & 0x00F0) == 0)
970
		printf ("%d\n", data[3] & 0x0F);
971
	else
972 973
		printf ("%d/%d\n", data[3] & 0x0F, (data[3] >> 4) & 0x0F);

974
	puts ("Column address bits          ");
975
	if ((data[4] & 0x00F0) == 0)
976
		printf ("%d\n", data[4] & 0x0F);
977
	else
978
		printf ("%d/%d\n", data[4] & 0x0F, (data[4] >> 4) & 0x0F);
979 980 981

	switch (type) {
	case DDR2:
982 983
		printf ("Number of ranks              %d\n",
			(data[5] & 0x07) + 1);
984 985
		break;
	default:
986
		printf ("Module rows                  %d\n", data[5]);
987 988 989 990 991
		break;
	}

	switch (type) {
	case DDR2:
992
		printf ("Module data width            %d bits\n", data[6]);
993 994
		break;
	default:
995 996
		printf ("Module data width            %d bits\n",
			(data[7] << 8) | data[6]);
997 998 999
		break;
	}

1000
	puts ("Interface signal levels      ");
W
wdenk 已提交
1001
	switch(data[8]) {
1002
		case 0:  puts ("TTL 5.0 V\n");	break;
1003
		case 1:  puts ("LVTTL\n");	break;
1004 1005 1006 1007
		case 2:  puts ("HSTL 1.5 V\n");	break;
		case 3:  puts ("SSTL 3.3 V\n");	break;
		case 4:  puts ("SSTL 2.5 V\n");	break;
		case 5:  puts ("SSTL 1.8 V\n");	break;
1008
		default: puts ("unknown\n");	break;
W
wdenk 已提交
1009
	}
1010 1011 1012

	switch (type) {
	case DDR2:
1013 1014
		printf ("SDRAM cycle time             ");
		print_ddr2_tcyc (data[9]);
1015 1016
		break;
	default:
1017 1018
		printf ("SDRAM cycle time             %d.%d ns\n",
			(data[9] >> 4) & 0x0F, data[9] & 0x0F);
1019 1020 1021 1022 1023
		break;
	}

	switch (type) {
	case DDR2:
1024 1025
		printf ("SDRAM access time            0.%d%d ns\n",
			(data[10] >> 4) & 0x0F, data[10] & 0x0F);
1026 1027
		break;
	default:
1028 1029
		printf ("SDRAM access time            %d.%d ns\n",
			(data[10] >> 4) & 0x0F, data[10] & 0x0F);
1030 1031 1032
		break;
	}

1033
	puts ("EDC configuration            ");
1034
	switch (data[11]) {
1035 1036 1037 1038
		case 0:  puts ("None\n");	break;
		case 1:  puts ("Parity\n");	break;
		case 2:  puts ("ECC\n");	break;
		default: puts ("unknown\n");	break;
W
wdenk 已提交
1039
	}
1040

1041
	if ((data[12] & 0x80) == 0)
1042
		puts ("No self refresh, rate        ");
1043
	else
1044
		puts ("Self refresh, rate           ");
1045

W
wdenk 已提交
1046
	switch(data[12] & 0x7F) {
1047 1048 1049 1050 1051 1052
		case 0:  puts ("15.625 us\n");	break;
		case 1:  puts ("3.9 us\n");	break;
		case 2:  puts ("7.8 us\n");	break;
		case 3:  puts ("31.3 us\n");	break;
		case 4:  puts ("62.5 us\n");	break;
		case 5:  puts ("125 us\n");	break;
1053
		default: puts ("unknown\n");	break;
W
wdenk 已提交
1054
	}
1055 1056 1057

	switch (type) {
	case DDR2:
1058
		printf ("SDRAM width (primary)        %d\n", data[13]);
1059 1060
		break;
	default:
1061
		printf ("SDRAM width (primary)        %d\n", data[13] & 0x7F);
1062
		if ((data[13] & 0x80) != 0) {
1063 1064
			printf ("  (second bank)              %d\n",
				2 * (data[13] & 0x7F));
1065 1066 1067 1068 1069 1070 1071
		}
		break;
	}

	switch (type) {
	case DDR2:
		if (data[14] != 0)
1072
			printf ("EDC width                    %d\n", data[14]);
1073 1074 1075
		break;
	default:
		if (data[14] != 0) {
1076 1077
			printf ("EDC width                    %d\n",
				data[14] & 0x7F);
1078 1079

			if ((data[14] & 0x80) != 0) {
1080 1081
				printf ("  (second bank)              %d\n",
					2 * (data[14] & 0x7F));
1082 1083 1084
			}
		}
		break;
W
wdenk 已提交
1085
	}
1086

1087 1088 1089
	if (DDR2 != type) {
		printf ("Min clock delay, back-to-back random column addresses "
			"%d\n", data[15]);
1090 1091
	}

1092 1093 1094 1095 1096 1097 1098
	puts ("Burst length(s)             ");
	if (data[16] & 0x80) puts (" Page");
	if (data[16] & 0x08) puts (" 8");
	if (data[16] & 0x04) puts (" 4");
	if (data[16] & 0x02) puts (" 2");
	if (data[16] & 0x01) puts (" 1");
	putc ('\n');
1099
	printf ("Number of banks              %d\n", data[17]);
1100 1101 1102 1103

	switch (type) {
	case DDR2:
		puts ("CAS latency(s)              ");
1104
		decode_bits (data[18], decode_CAS_DDR2, 0);
1105 1106 1107 1108
		putc ('\n');
		break;
	default:
		puts ("CAS latency(s)              ");
1109
		decode_bits (data[18], decode_CAS_default, 0);
1110 1111 1112 1113 1114 1115
		putc ('\n');
		break;
	}

	if (DDR2 != type) {
		puts ("CS latency(s)               ");
1116
		decode_bits (data[19], decode_CS_WE_default, 0);
1117 1118 1119 1120 1121
		putc ('\n');
	}

	if (DDR2 != type) {
		puts ("WE latency(s)               ");
1122
		decode_bits (data[20], decode_CS_WE_default, 0);
1123 1124 1125 1126 1127 1128 1129 1130 1131 1132 1133 1134 1135 1136
		putc ('\n');
	}

	switch (type) {
	case DDR2:
		puts ("Module attributes:\n");
		if (data[21] & 0x80)
			puts ("  TBD (bit 7)\n");
		if (data[21] & 0x40)
			puts ("  Analysis probe installed\n");
		if (data[21] & 0x20)
			puts ("  TBD (bit 5)\n");
		if (data[21] & 0x10)
			puts ("  FET switch external enable\n");
1137
		printf ("  %d PLLs on DIMM\n", (data[21] >> 2) & 0x03);
1138
		if (data[20] & 0x11) {
1139 1140
			printf ("  %d active registers on DIMM\n",
				(data[21] & 0x03) + 1);
1141 1142 1143 1144 1145 1146
		}
		break;
	default:
		puts ("Module attributes:\n");
		if (!data[21])
			puts ("  (none)\n");
1147 1148
		else
			decode_bits (data[21], decode_byte21_default, 0);
1149 1150 1151 1152 1153
		break;
	}

	switch (type) {
	case DDR2:
1154
		decode_bits (data[22], decode_byte22_DDR2, 0);
1155 1156 1157 1158 1159 1160 1161 1162 1163 1164 1165 1166 1167 1168 1169 1170 1171 1172
		break;
	default:
		puts ("Device attributes:\n");
		if (data[22] & 0x80) puts ("  TBD (bit 7)\n");
		if (data[22] & 0x40) puts ("  TBD (bit 6)\n");
		if (data[22] & 0x20) puts ("  Upper Vcc tolerance 5%\n");
		else                 puts ("  Upper Vcc tolerance 10%\n");
		if (data[22] & 0x10) puts ("  Lower Vcc tolerance 5%\n");
		else                 puts ("  Lower Vcc tolerance 10%\n");
		if (data[22] & 0x08) puts ("  Supports write1/read burst\n");
		if (data[22] & 0x04) puts ("  Supports precharge all\n");
		if (data[22] & 0x02) puts ("  Supports auto precharge\n");
		if (data[22] & 0x01) puts ("  Supports early RAS# precharge\n");
		break;
	}

	switch (type) {
	case DDR2:
1173 1174
		printf ("SDRAM cycle time (2nd highest CAS latency)        ");
		print_ddr2_tcyc (data[23]);
1175 1176
		break;
	default:
1177 1178
		printf ("SDRAM cycle time (2nd highest CAS latency)        %d."
			"%d ns\n", (data[23] >> 4) & 0x0F, data[23] & 0x0F);
1179 1180 1181 1182 1183
		break;
	}

	switch (type) {
	case DDR2:
1184 1185
		printf ("SDRAM access from clock (2nd highest CAS latency) 0."
			"%d%d ns\n", (data[24] >> 4) & 0x0F, data[24] & 0x0F);
1186 1187
		break;
	default:
1188 1189
		printf ("SDRAM access from clock (2nd highest CAS latency) %d."
			"%d ns\n", (data[24] >> 4) & 0x0F, data[24] & 0x0F);
1190 1191 1192 1193 1194
		break;
	}

	switch (type) {
	case DDR2:
1195 1196
		printf ("SDRAM cycle time (3rd highest CAS latency)        ");
		print_ddr2_tcyc (data[25]);
1197 1198
		break;
	default:
1199 1200
		printf ("SDRAM cycle time (3rd highest CAS latency)        %d."
			"%d ns\n", (data[25] >> 4) & 0x0F, data[25] & 0x0F);
1201 1202 1203 1204 1205
		break;
	}

	switch (type) {
	case DDR2:
1206 1207
		printf ("SDRAM access from clock (3rd highest CAS latency) 0."
			"%d%d ns\n", (data[26] >> 4) & 0x0F, data[26] & 0x0F);
1208 1209
		break;
	default:
1210 1211
		printf ("SDRAM access from clock (3rd highest CAS latency) %d."
			"%d ns\n", (data[26] >> 4) & 0x0F, data[26] & 0x0F);
1212 1213 1214 1215 1216
		break;
	}

	switch (type) {
	case DDR2:
1217 1218
		printf ("Minimum row precharge        %d.%02d ns\n",
			(data[27] >> 2) & 0x3F, 25 * (data[27] & 0x03));
1219 1220
		break;
	default:
1221
		printf ("Minimum row precharge        %d ns\n", data[27]);
1222 1223 1224 1225 1226
		break;
	}

	switch (type) {
	case DDR2:
1227 1228
		printf ("Row active to row active min %d.%02d ns\n",
			(data[28] >> 2) & 0x3F, 25 * (data[28] & 0x03));
1229 1230
		break;
	default:
1231
		printf ("Row active to row active min %d ns\n", data[28]);
1232 1233 1234 1235 1236
		break;
	}

	switch (type) {
	case DDR2:
1237 1238
		printf ("RAS to CAS delay min         %d.%02d ns\n",
			(data[29] >> 2) & 0x3F, 25 * (data[29] & 0x03));
1239 1240
		break;
	default:
1241
		printf ("RAS to CAS delay min         %d ns\n", data[29]);
1242 1243 1244
		break;
	}

1245
	printf ("Minimum RAS pulse width      %d ns\n", data[30]);
1246 1247 1248

	switch (type) {
	case DDR2:
1249 1250 1251
		puts ("Density of each row          ");
		decode_bits (data[31], decode_row_density_DDR2, 1);
		putc ('\n');
1252 1253
		break;
	default:
1254 1255 1256
		puts ("Density of each row          ");
		decode_bits (data[31], decode_row_density_default, 1);
		putc ('\n');
1257 1258 1259 1260 1261
		break;
	}

	switch (type) {
	case DDR2:
1262
		puts ("Command and Address setup    ");
1263
		if (data[32] >= 0xA0) {
1264 1265
			printf ("1.%d%d ns\n",
				((data[32] >> 4) & 0x0F) - 10, data[32] & 0x0F);
1266
		} else {
1267 1268
			printf ("0.%d%d ns\n",
				((data[32] >> 4) & 0x0F), data[32] & 0x0F);
1269 1270 1271
		}
		break;
	default:
1272 1273 1274
		printf ("Command and Address setup    %c%d.%d ns\n",
			(data[32] & 0x80) ? '-' : '+',
			(data[32] >> 4) & 0x07, data[32] & 0x0F);
1275 1276 1277 1278 1279
		break;
	}

	switch (type) {
	case DDR2:
1280
		puts ("Command and Address hold     ");
1281
		if (data[33] >= 0xA0) {
1282 1283
			printf ("1.%d%d ns\n",
				((data[33] >> 4) & 0x0F) - 10, data[33] & 0x0F);
1284
		} else {
1285 1286
			printf ("0.%d%d ns\n",
				((data[33] >> 4) & 0x0F), data[33] & 0x0F);
1287 1288 1289
		}
		break;
	default:
1290 1291 1292
		printf ("Command and Address hold     %c%d.%d ns\n",
			(data[33] & 0x80) ? '-' : '+',
			(data[33] >> 4) & 0x07, data[33] & 0x0F);
1293 1294 1295 1296 1297
		break;
	}

	switch (type) {
	case DDR2:
1298 1299
		printf ("Data signal input setup      0.%d%d ns\n",
			(data[34] >> 4) & 0x0F, data[34] & 0x0F);
1300 1301
		break;
	default:
1302 1303 1304
		printf ("Data signal input setup      %c%d.%d ns\n",
			(data[34] & 0x80) ? '-' : '+',
			(data[34] >> 4) & 0x07, data[34] & 0x0F);
1305 1306 1307 1308 1309
		break;
	}

	switch (type) {
	case DDR2:
1310 1311
		printf ("Data signal input hold       0.%d%d ns\n",
			(data[35] >> 4) & 0x0F, data[35] & 0x0F);
1312 1313
		break;
	default:
1314 1315 1316
		printf ("Data signal input hold       %c%d.%d ns\n",
			(data[35] & 0x80) ? '-' : '+',
			(data[35] >> 4) & 0x07, data[35] & 0x0F);
1317 1318 1319
		break;
	}

1320
	puts ("Manufacturer's JEDEC ID      ");
1321
	for (j = 64; j <= 71; j++)
1322
		printf ("%02X ", data[j]);
1323
	putc ('\n');
1324
	printf ("Manufacturing Location       %02X\n", data[72]);
1325
	puts ("Manufacturer's Part Number   ");
1326
	for (j = 73; j <= 90; j++)
1327
		printf ("%02X ", data[j]);
1328
	putc ('\n');
1329 1330
	printf ("Revision Code                %02X %02X\n", data[91], data[92]);
	printf ("Manufacturing Date           %02X %02X\n", data[93], data[94]);
1331
	puts ("Assembly Serial Number       ");
1332
	for (j = 95; j <= 98; j++)
1333
		printf ("%02X ", data[j]);
1334
	putc ('\n');
W
wdenk 已提交
1335

1336
	if (DDR2 != type) {
1337 1338
		printf ("Speed rating                 PC%d\n",
			data[126] == 0x66 ? 66 : data[126]);
1339
	}
W
wdenk 已提交
1340 1341
	return 0;
}
1342
#endif
W
wdenk 已提交
1343

1344 1345 1346 1347 1348 1349 1350 1351 1352 1353 1354 1355 1356 1357 1358 1359 1360 1361 1362 1363 1364 1365 1366 1367 1368 1369 1370 1371 1372 1373 1374 1375
/*
 * Syntax:
 *	i2c edid {i2c_chip}
 */
#if defined(CONFIG_I2C_EDID)
int do_edid(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
{
	u_char chip;
	struct edid1_info edid;

	if (argc < 2) {
		cmd_usage(cmdtp);
		return 1;
	}

	chip = simple_strtoul(argv[1], NULL, 16);
	if (i2c_read(chip, 0, 1, (uchar *)&edid, sizeof(edid)) != 0) {
		puts("Error reading EDID content.\n");
		return 1;
	}

	if (edid_check_info(&edid)) {
		puts("Content isn't valid EDID.\n");
		return 1;
	}

	edid_print_info(&edid);
	return 0;

}
#endif /* CONFIG_I2C_EDID */

1376
#if defined(CONFIG_I2C_MUX)
1377 1378 1379 1380 1381 1382 1383 1384 1385
/**
 * do_i2c_add_bus() - Handle the "i2c bus" command-line command
 * @cmdtp:	Command data struct pointer
 * @flag:	Command flag
 * @argc:	Command-line argument count
 * @argv:	Array of command-line arguments
 *
 * Returns zero always.
 */
1386
static int do_i2c_add_bus(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
1387 1388 1389 1390 1391 1392 1393 1394 1395 1396 1397 1398 1399 1400 1401 1402 1403 1404 1405 1406
{
	int ret=0;

	if (argc == 1) {
		/* show all busses */
		I2C_MUX		*mux;
		I2C_MUX_DEVICE	*device = i2c_mux_devices;

		printf ("Busses reached over muxes:\n");
		while (device != NULL) {
			printf ("Bus ID: %x\n", device->busid);
			printf ("  reached over Mux(es):\n");
			mux = device->mux;
			while (mux != NULL) {
				printf ("    %s@%x ch: %x\n", mux->name, mux->chip, mux->channel);
				mux = mux->next;
			}
			device = device->next;
		}
	} else {
1407
		(void)i2c_mux_ident_muxstring ((uchar *)argv[1]);
1408 1409 1410 1411 1412 1413
		ret = 0;
	}
	return ret;
}
#endif  /* CONFIG_I2C_MUX */

B
Ben Warren 已提交
1414
#if defined(CONFIG_I2C_MULTI_BUS)
1415 1416 1417 1418 1419 1420 1421 1422 1423 1424
/**
 * do_i2c_bus_num() - Handle the "i2c dev" command-line command
 * @cmdtp:	Command data struct pointer
 * @flag:	Command flag
 * @argc:	Command-line argument count
 * @argv:	Array of command-line arguments
 *
 * Returns zero on success, CMD_RET_USAGE in case of misuse and negative
 * on error.
 */
1425
static int do_i2c_bus_num(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
B
Ben Warren 已提交
1426 1427 1428
{
	int bus_idx, ret=0;

1429 1430
	if (argc == 1)
		/* querying current setting */
B
Ben Warren 已提交
1431
		printf("Current bus is %d\n", i2c_get_bus_num());
1432
	else {
B
Ben Warren 已提交
1433 1434 1435
		bus_idx = simple_strtoul(argv[1], NULL, 10);
		printf("Setting bus to %d\n", bus_idx);
		ret = i2c_set_bus_num(bus_idx);
1436
		if (ret)
B
Ben Warren 已提交
1437 1438 1439 1440 1441 1442
			printf("Failure changing bus number (%d)\n", ret);
	}
	return ret;
}
#endif  /* CONFIG_I2C_MULTI_BUS */

1443 1444 1445 1446 1447 1448 1449 1450 1451 1452
/**
 * do_i2c_bus_speed() - Handle the "i2c speed" command-line command
 * @cmdtp:	Command data struct pointer
 * @flag:	Command flag
 * @argc:	Command-line argument count
 * @argv:	Array of command-line arguments
 *
 * Returns zero on success, CMD_RET_USAGE in case of misuse and negative
 * on error.
 */
1453
static int do_i2c_bus_speed(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
B
Ben Warren 已提交
1454 1455 1456
{
	int speed, ret=0;

1457 1458
	if (argc == 1)
		/* querying current speed */
B
Ben Warren 已提交
1459
		printf("Current bus speed=%d\n", i2c_get_bus_speed());
1460
	else {
B
Ben Warren 已提交
1461 1462 1463
		speed = simple_strtoul(argv[1], NULL, 10);
		printf("Setting bus speed to %d Hz\n", speed);
		ret = i2c_set_bus_speed(speed);
1464
		if (ret)
B
Ben Warren 已提交
1465 1466 1467 1468 1469
			printf("Failure changing bus speed (%d)\n", ret);
	}
	return ret;
}

1470 1471 1472 1473 1474 1475 1476 1477 1478 1479
/**
 * do_i2c_mm() - Handle the "i2c mm" command-line command
 * @cmdtp:	Command data struct pointer
 * @flag:	Command flag
 * @argc:	Command-line argument count
 * @argv:	Array of command-line arguments
 *
 * Returns zero on success, CMD_RET_USAGE in case of misuse and negative
 * on error.
 */
1480
static int do_i2c_mm(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
B
Ben Warren 已提交
1481
{
1482 1483 1484
	return mod_i2c_mem (cmdtp, 1, flag, argc, argv);
}

1485 1486 1487 1488 1489 1490 1491 1492 1493 1494
/**
 * do_i2c_nm() - Handle the "i2c nm" command-line command
 * @cmdtp:	Command data struct pointer
 * @flag:	Command flag
 * @argc:	Command-line argument count
 * @argv:	Array of command-line arguments
 *
 * Returns zero on success, CMD_RET_USAGE in case of misuse and negative
 * on error.
 */
1495
static int do_i2c_nm(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
1496 1497 1498
{
	return mod_i2c_mem (cmdtp, 0, flag, argc, argv);
}
1499

1500 1501 1502 1503 1504 1505 1506 1507 1508
/**
 * do_i2c_reset() - Handle the "i2c reset" command-line command
 * @cmdtp:	Command data struct pointer
 * @flag:	Command flag
 * @argc:	Command-line argument count
 * @argv:	Array of command-line arguments
 *
 * Returns zero always.
 */
1509
static int do_i2c_reset(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
1510 1511 1512 1513 1514 1515
{
	i2c_init(CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE);
	return 0;
}

static cmd_tbl_t cmd_i2c_sub[] = {
1516
#if defined(CONFIG_I2C_MUX)
1517
	U_BOOT_CMD_MKENT(bus, 1, 1, do_i2c_add_bus, "", ""),
1518
#endif  /* CONFIG_I2C_MUX */
1519
	U_BOOT_CMD_MKENT(crc32, 3, 1, do_i2c_crc, "", ""),
B
Ben Warren 已提交
1520
#if defined(CONFIG_I2C_MULTI_BUS)
1521
	U_BOOT_CMD_MKENT(dev, 1, 1, do_i2c_bus_num, "", ""),
B
Ben Warren 已提交
1522
#endif  /* CONFIG_I2C_MULTI_BUS */
1523 1524 1525
#if defined(CONFIG_I2C_EDID)
	U_BOOT_CMD_MKENT(edid, 1, 1, do_edid, "", ""),
#endif  /* CONFIG_I2C_EDID */
1526 1527 1528 1529 1530 1531
	U_BOOT_CMD_MKENT(loop, 3, 1, do_i2c_loop, "", ""),
	U_BOOT_CMD_MKENT(md, 3, 1, do_i2c_md, "", ""),
	U_BOOT_CMD_MKENT(mm, 2, 1, do_i2c_mm, "", ""),
	U_BOOT_CMD_MKENT(mw, 3, 1, do_i2c_mw, "", ""),
	U_BOOT_CMD_MKENT(nm, 2, 1, do_i2c_nm, "", ""),
	U_BOOT_CMD_MKENT(probe, 0, 1, do_i2c_probe, "", ""),
1532
	U_BOOT_CMD_MKENT(read, 5, 1, do_i2c_read, "", ""),
Y
York Sun 已提交
1533
	U_BOOT_CMD_MKENT(write, 5, 0, do_i2c_write, "", ""),
1534
	U_BOOT_CMD_MKENT(reset, 0, 1, do_i2c_reset, "", ""),
1535
#if defined(CONFIG_CMD_SDRAM)
1536
	U_BOOT_CMD_MKENT(sdram, 1, 1, do_sdram, "", ""),
1537
#endif
1538 1539 1540
	U_BOOT_CMD_MKENT(speed, 1, 1, do_i2c_bus_speed, "", ""),
};

1541
#ifdef CONFIG_NEEDS_MANUAL_RELOC
H
Heiko Schocher 已提交
1542 1543 1544 1545 1546
void i2c_reloc(void) {
	fixup_cmdtable(cmd_i2c_sub, ARRAY_SIZE(cmd_i2c_sub));
}
#endif

1547 1548 1549 1550 1551 1552 1553 1554 1555 1556
/**
 * do_i2c() - Handle the "i2c" command-line command
 * @cmdtp:	Command data struct pointer
 * @flag:	Command flag
 * @argc:	Command-line argument count
 * @argv:	Array of command-line arguments
 *
 * Returns zero on success, CMD_RET_USAGE in case of misuse and negative
 * on error.
 */
1557
static int do_i2c(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
1558 1559 1560
{
	cmd_tbl_t *c;

H
Heiko Schocher 已提交
1561
	if (argc < 2)
1562
		return CMD_RET_USAGE;
H
Heiko Schocher 已提交
1563

1564 1565 1566 1567 1568 1569
	/* Strip off leading 'i2c' command argument */
	argc--;
	argv++;

	c = find_cmd_tbl(argv[0], &cmd_i2c_sub[0], ARRAY_SIZE(cmd_i2c_sub));

1570
	if (c)
1571
		return c->cmd(cmdtp, flag, argc, argv);
1572
	else
1573
		return CMD_RET_USAGE;
B
Ben Warren 已提交
1574
}
W
wdenk 已提交
1575 1576

/***************************************************/
K
Kim Phillips 已提交
1577 1578
#ifdef CONFIG_SYS_LONGHELP
static char i2c_help_text[] =
1579
#if defined(CONFIG_I2C_MUX)
1580
	"bus [muxtype:muxaddr:muxchannel] - add a new bus reached over muxes\ni2c "
1581
#endif  /* CONFIG_I2C_MUX */
1582
	"crc32 chip address[.0, .1, .2] count - compute CRC32 checksum\n"
1583
#if defined(CONFIG_I2C_MULTI_BUS)
1584
	"i2c dev [dev] - show or set current I2C bus\n"
1585
#endif  /* CONFIG_I2C_MULTI_BUS */
1586 1587 1588
#if defined(CONFIG_I2C_EDID)
	"i2c edid chip - print EDID configuration information\n"
#endif  /* CONFIG_I2C_EDID */
1589
	"i2c loop chip address[.0, .1, .2] [# of objects] - looping read of device\n"
1590 1591 1592 1593
	"i2c md chip address[.0, .1, .2] [# of objects] - read from I2C device\n"
	"i2c mm chip address[.0, .1, .2] - write to I2C device (auto-incrementing)\n"
	"i2c mw chip address[.0, .1, .2] value [count] - write to I2C device (fill)\n"
	"i2c nm chip address[.0, .1, .2] - write to I2C device (constant address)\n"
1594
	"i2c probe [address] - test for and show device(s) on the I2C bus\n"
1595
	"i2c read chip address[.0, .1, .2] length memaddress - read to memory \n"
Y
York Sun 已提交
1596
	"i2c write memaddress chip address[.0, .1, .2] length - write memory to i2c\n"
H
Heiko Schocher 已提交
1597
	"i2c reset - re-init the I2C Controller\n"
1598
#if defined(CONFIG_CMD_SDRAM)
1599
	"i2c sdram chip - print SDRAM configuration information\n"
1600
#endif
K
Kim Phillips 已提交
1601 1602 1603 1604 1605 1606 1607
	"i2c speed [speed] - show or set I2C bus speed";
#endif

U_BOOT_CMD(
	i2c, 6, 1, do_i2c,
	"I2C sub-system",
	i2c_help_text
1608
);
1609 1610

#if defined(CONFIG_I2C_MUX)
1611
static int i2c_mux_add_device(I2C_MUX_DEVICE *dev)
1612 1613 1614 1615 1616 1617 1618 1619 1620 1621 1622 1623 1624 1625 1626 1627 1628 1629 1630 1631 1632 1633 1634 1635 1636 1637 1638 1639 1640 1641 1642 1643 1644 1645 1646 1647 1648 1649 1650 1651 1652 1653 1654 1655 1656 1657 1658 1659 1660 1661 1662 1663
{
	I2C_MUX_DEVICE	*devtmp = i2c_mux_devices;

	if (i2c_mux_devices == NULL) {
		i2c_mux_devices = dev;
		return 0;
	}
	while (devtmp->next != NULL)
		devtmp = devtmp->next;

	devtmp->next = dev;
	return 0;
}

I2C_MUX_DEVICE	*i2c_mux_search_device(int id)
{
	I2C_MUX_DEVICE	*device = i2c_mux_devices;

	while (device != NULL) {
		if (device->busid == id)
			return device;
		device = device->next;
	}
	return NULL;
}

/* searches in the buf from *pos the next ':'.
 * returns:
 *     0 if found (with *pos = where)
 *   < 0 if an error occured
 *   > 0 if the end of buf is reached
 */
static int i2c_mux_search_next (int *pos, uchar	*buf, int len)
{
	while ((buf[*pos] != ':') && (*pos < len)) {
		*pos += 1;
	}
	if (*pos >= len)
		return 1;
	if (buf[*pos] != ':')
		return -1;
	return 0;
}

static int i2c_mux_get_busid (void)
{
	int	tmp = i2c_mux_busid;

	i2c_mux_busid ++;
	return tmp;
}

M
Michael Jones 已提交
1664 1665
/* Analyses a Muxstring and immediately sends the
   commands to the muxes. Runs from flash.
1666 1667 1668 1669 1670 1671 1672 1673 1674 1675 1676 1677 1678 1679 1680 1681 1682 1683 1684 1685 1686 1687 1688 1689 1690 1691 1692 1693 1694 1695 1696 1697 1698 1699 1700 1701 1702 1703 1704 1705 1706 1707 1708 1709 1710 1711 1712 1713 1714
 */
int i2c_mux_ident_muxstring_f (uchar *buf)
{
	int	pos = 0;
	int	oldpos;
	int	ret = 0;
	int	len = strlen((char *)buf);
	int	chip;
	uchar	channel;
	int	was = 0;

	while (ret == 0) {
		oldpos = pos;
		/* search name */
		ret = i2c_mux_search_next(&pos, buf, len);
		if (ret != 0)
			printf ("ERROR\n");
		/* search address */
		pos ++;
		oldpos = pos;
		ret = i2c_mux_search_next(&pos, buf, len);
		if (ret != 0)
			printf ("ERROR\n");
		buf[pos] = 0;
		chip = simple_strtoul((char *)&buf[oldpos], NULL, 16);
		buf[pos] = ':';
		/* search channel */
		pos ++;
		oldpos = pos;
		ret = i2c_mux_search_next(&pos, buf, len);
		if (ret < 0)
			printf ("ERROR\n");
		was = 0;
		if (buf[pos] != 0) {
			buf[pos] = 0;
			was = 1;
		}
		channel = simple_strtoul((char *)&buf[oldpos], NULL, 16);
		if (was)
			buf[pos] = ':';
		if (i2c_write(chip, 0, 0, &channel, 1) != 0) {
			printf ("Error setting Mux: chip:%x channel: \
				%x\n", chip, channel);
			return -1;
		}
		pos ++;
		oldpos = pos;

	}
1715
	i2c_init_board();
1716 1717 1718 1719 1720 1721 1722 1723 1724 1725 1726 1727 1728 1729 1730 1731 1732 1733 1734 1735 1736 1737 1738 1739 1740 1741 1742 1743 1744 1745 1746 1747 1748 1749 1750 1751 1752 1753 1754 1755 1756 1757 1758 1759 1760 1761 1762 1763 1764 1765 1766 1767 1768 1769 1770 1771 1772 1773 1774 1775 1776 1777 1778 1779 1780 1781 1782 1783 1784 1785 1786 1787 1788 1789 1790 1791 1792 1793 1794 1795 1796 1797 1798

	return 0;
}

/* Analyses a Muxstring and if this String is correct
 * adds a new I2C Bus.
 */
I2C_MUX_DEVICE *i2c_mux_ident_muxstring (uchar *buf)
{
	I2C_MUX_DEVICE	*device;
	I2C_MUX		*mux;
	int	pos = 0;
	int	oldpos;
	int	ret = 0;
	int	len = strlen((char *)buf);
	int	was = 0;

	device = (I2C_MUX_DEVICE *)malloc (sizeof(I2C_MUX_DEVICE));
	device->mux = NULL;
	device->busid = i2c_mux_get_busid ();
	device->next = NULL;
	while (ret == 0) {
		mux = (I2C_MUX *)malloc (sizeof(I2C_MUX));
		mux->next = NULL;
		/* search name of mux */
		oldpos = pos;
		ret = i2c_mux_search_next(&pos, buf, len);
		if (ret != 0)
			printf ("%s no name.\n", __FUNCTION__);
		mux->name = (char *)malloc (pos - oldpos + 1);
		memcpy (mux->name, &buf[oldpos], pos - oldpos);
		mux->name[pos - oldpos] = 0;
		/* search address */
		pos ++;
		oldpos = pos;
		ret = i2c_mux_search_next(&pos, buf, len);
		if (ret != 0)
			printf ("%s no mux address.\n", __FUNCTION__);
		buf[pos] = 0;
		mux->chip = simple_strtoul((char *)&buf[oldpos], NULL, 16);
		buf[pos] = ':';
		/* search channel */
		pos ++;
		oldpos = pos;
		ret = i2c_mux_search_next(&pos, buf, len);
		if (ret < 0)
			printf ("%s no mux channel.\n", __FUNCTION__);
		was = 0;
		if (buf[pos] != 0) {
			buf[pos] = 0;
			was = 1;
		}
		mux->channel = simple_strtoul((char *)&buf[oldpos], NULL, 16);
		if (was)
			buf[pos] = ':';
		if (device->mux == NULL)
			device->mux = mux;
		else {
			I2C_MUX		*muxtmp = device->mux;
			while (muxtmp->next != NULL) {
				muxtmp = muxtmp->next;
			}
			muxtmp->next = mux;
		}
		pos ++;
		oldpos = pos;
	}
	if (ret > 0) {
		/* Add Device */
		i2c_mux_add_device (device);
		return device;
	}

	return NULL;
}

int i2x_mux_select_mux(int bus)
{
	I2C_MUX_DEVICE  *dev;
	I2C_MUX		*mux;

	if ((gd->flags & GD_FLG_RELOC) != GD_FLG_RELOC) {
		/* select Default Mux Bus */
1799 1800
#if defined(CONFIG_SYS_I2C_IVM_BUS)
		i2c_mux_ident_muxstring_f ((uchar *)CONFIG_SYS_I2C_IVM_BUS);
1801 1802 1803 1804 1805 1806 1807 1808 1809 1810 1811 1812 1813 1814 1815 1816
#else
		{
		unsigned char *buf;
		buf = (unsigned char *) getenv("EEprom_ivm");
		if (buf != NULL)
			i2c_mux_ident_muxstring_f (buf);
		}
#endif
		return 0;
	}
	dev = i2c_mux_search_device(bus);
	if (dev == NULL)
		return -1;

	mux = dev->mux;
	while (mux != NULL) {
1817 1818
		/* do deblocking on each level of mux, before mux config */
		i2c_init_board();
1819 1820 1821 1822 1823 1824 1825
		if (i2c_write(mux->chip, 0, 0, &mux->channel, 1) != 0) {
			printf ("Error setting Mux: chip:%x channel: \
				%x\n", mux->chip, mux->channel);
			return -1;
		}
		mux = mux->next;
	}
1826 1827
	/* do deblocking on each level of mux and after mux config */
	i2c_init_board();
1828 1829 1830
	return 0;
}
#endif /* CONFIG_I2C_MUX */