Blame view

cmd/i2c.c 48.5 KB
83d290c56   Tom Rini   SPDX: Convert all...
1
  // SPDX-License-Identifier: GPL-2.0+
81a8824f2   wdenk   Initial revision
2
  /*
3f4978c71   Heiko Schocher   i2c: common chang...
3
4
5
6
7
   * (C) Copyright 2009
   * Sergey Kubushyn, himself, ksi@koi8.net
   *
   * Changes for unified multibus/multiadapter I2C support.
   *
81a8824f2   wdenk   Initial revision
8
9
   * (C) Copyright 2001
   * Gerald Van Baren, Custom IDEAS, vanbaren@cideas.com.
81a8824f2   wdenk   Initial revision
10
11
12
13
14
15
16
17
   */
  
  /*
   * I2C Functions similar to the standard memory functions.
   *
   * There are several parameters in many of the commands that bear further
   * explanations:
   *
81a8824f2   wdenk   Initial revision
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
   * {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
6d0f6bcf3   Jean-Christophe PLAGNIOL-VILLARD   rename CFG_ macro...
51
   *   CONFIG_SYS_I2C_EEPROM_ADDR_OVERFLOW and using the .1 modifier on the
81a8824f2   wdenk   Initial revision
52
53
54
   *   {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...
0f89c54be   Peter Tyser   i2c: Update refer...
55
   *     i2c md 50 0 10   display 16 bytes starting at 0x000
81a8824f2   wdenk   Initial revision
56
   *                      On the bus: <S> A0 00 <E> <S> A1 <rd> ... <rd>
0f89c54be   Peter Tyser   i2c: Update refer...
57
   *     i2c md 50 100 10 display 16 bytes starting at 0x100
81a8824f2   wdenk   Initial revision
58
   *                      On the bus: <S> A2 00 <E> <S> A3 <rd> ... <rd>
0f89c54be   Peter Tyser   i2c: Update refer...
59
   *     i2c md 50 210 10 display 16 bytes starting at 0x210
81a8824f2   wdenk   Initial revision
60
61
62
63
64
65
66
67
   *                      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>
0098e179e   Simon Glass   Move bootretry co...
68
  #include <bootretry.h>
18d66533a   Simon Glass   move CLI prototyp...
69
  #include <cli.h>
81a8824f2   wdenk   Initial revision
70
  #include <command.h>
24b852a7a   Simon Glass   Move console defi...
71
  #include <console.h>
63656b762   Simon Glass   dm: i2c: Implemen...
72
  #include <dm.h>
735987c5a   Tom Wai-Hong Tam   edid: Add I2C com...
73
  #include <edid.h>
67b23a322   Heiko Schocher   I2C: adding new "...
74
  #include <environment.h>
63656b762   Simon Glass   dm: i2c: Implemen...
75
  #include <errno.h>
81a8824f2   wdenk   Initial revision
76
  #include <i2c.h>
67b23a322   Heiko Schocher   I2C: adding new "...
77
  #include <malloc.h>
81a8824f2   wdenk   Initial revision
78
  #include <asm/byteorder.h>
2515d8437   Marek Vasut   i2c: Use __weak i...
79
  #include <linux/compiler.h>
81a8824f2   wdenk   Initial revision
80

81a8824f2   wdenk   Initial revision
81
82
83
  /* Display values from last command.
   * Memory modify remembered values are different from display memory.
   */
5468461d1   Masahiro Yamada   cmd_i2c: change v...
84
  static uint	i2c_dp_last_chip;
81a8824f2   wdenk   Initial revision
85
86
87
  static uint	i2c_dp_last_addr;
  static uint	i2c_dp_last_alen;
  static uint	i2c_dp_last_length = 0x10;
5468461d1   Masahiro Yamada   cmd_i2c: change v...
88
  static uint	i2c_mm_last_chip;
81a8824f2   wdenk   Initial revision
89
90
  static uint	i2c_mm_last_addr;
  static uint	i2c_mm_last_alen;
bb99ad6d8   Ben Warren   Add support for m...
91
92
93
94
  /* 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 */
6d0f6bcf3   Jean-Christophe PLAGNIOL-VILLARD   rename CFG_ macro...
95
  #if defined(CONFIG_SYS_I2C_NOPROBES)
9a2accb44   Heiko Schocher   i2c, multibus: ge...
96
  #if defined(CONFIG_SYS_I2C) || defined(CONFIG_I2C_MULTI_BUS)
bb99ad6d8   Ben Warren   Add support for m...
97
98
99
100
  static struct
  {
  	uchar	bus;
  	uchar	addr;
6d0f6bcf3   Jean-Christophe PLAGNIOL-VILLARD   rename CFG_ macro...
101
  } i2c_no_probes[] = CONFIG_SYS_I2C_NOPROBES;
bb99ad6d8   Ben Warren   Add support for m...
102
103
104
105
106
  #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 */
6d0f6bcf3   Jean-Christophe PLAGNIOL-VILLARD   rename CFG_ macro...
107
  static uchar i2c_no_probes[] = CONFIG_SYS_I2C_NOPROBES;
bb99ad6d8   Ben Warren   Add support for m...
108
109
110
111
  #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)]
3f4978c71   Heiko Schocher   i2c: common chang...
112
  #endif	/* defined(CONFIG_SYS_I2C) */
67b23a322   Heiko Schocher   I2C: adding new "...
113
  #endif
a266fe955   Frans Meulenbroeks   cmd_i2c: moved a ...
114
  #define DISP_LINE_LEN	16
63656b762   Simon Glass   dm: i2c: Implemen...
115
116
117
118
119
120
121
122
123
124
125
126
127
  /*
   * Default for driver model is to use the chip's existing address length.
   * For legacy code, this is not stored, so we need to use a suitable
   * default.
   */
  #ifdef CONFIG_DM_I2C
  #define DEFAULT_ADDR_LEN	(-1)
  #else
  #define DEFAULT_ADDR_LEN	1
  #endif
  
  #ifdef CONFIG_DM_I2C
  static struct udevice *i2c_cur_bus;
f9a4c2da7   Simon Glass   dm: i2c: Rename d...
128
  static int cmd_i2c_set_bus_num(unsigned int busnum)
63656b762   Simon Glass   dm: i2c: Implemen...
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
  {
  	struct udevice *bus;
  	int ret;
  
  	ret = uclass_get_device_by_seq(UCLASS_I2C, busnum, &bus);
  	if (ret) {
  		debug("%s: No bus %d
  ", __func__, busnum);
  		return ret;
  	}
  	i2c_cur_bus = bus;
  
  	return 0;
  }
  
  static int i2c_get_cur_bus(struct udevice **busp)
  {
e46f8a330   Lukasz Majewski   i2c: Set default ...
146
147
148
149
150
151
152
153
154
155
  #ifdef CONFIG_I2C_SET_DEFAULT_BUS_NUM
  	if (!i2c_cur_bus) {
  		if (cmd_i2c_set_bus_num(CONFIG_I2C_DEFAULT_BUS_NUMBER)) {
  			printf("Default I2C bus %d not found
  ",
  			       CONFIG_I2C_DEFAULT_BUS_NUMBER);
  			return -ENODEV;
  		}
  	}
  #endif
63656b762   Simon Glass   dm: i2c: Implemen...
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
  	if (!i2c_cur_bus) {
  		puts("No I2C bus selected
  ");
  		return -ENODEV;
  	}
  	*busp = i2c_cur_bus;
  
  	return 0;
  }
  
  static int i2c_get_cur_bus_chip(uint chip_addr, struct udevice **devp)
  {
  	struct udevice *bus;
  	int ret;
  
  	ret = i2c_get_cur_bus(&bus);
  	if (ret)
  		return ret;
25ab4b030   Simon Glass   dm: i2c: Provide ...
174
  	return i2c_get_chip(bus, chip_addr, 1, devp);
63656b762   Simon Glass   dm: i2c: Implemen...
175
176
177
  }
  
  #endif
06afa388b   Marek Vasut   i2c: kerneldoc: A...
178
179
180
181
  /**
   * i2c_init_board() - Board-specific I2C bus init
   *
   * This function is the default no-op implementation of I2C bus
62a3b7dd0   Robert P. J. Day   Various, unrelate...
182
   * initialization. This function can be overridden by board-specific
06afa388b   Marek Vasut   i2c: kerneldoc: A...
183
184
   * implementation if needed.
   */
2515d8437   Marek Vasut   i2c: Use __weak i...
185
186
  __weak
  void i2c_init_board(void)
c649dda53   Stefan Bigler   i2c: add i2c debl...
187
  {
c649dda53   Stefan Bigler   i2c: add i2c debl...
188
  }
c649dda53   Stefan Bigler   i2c: add i2c debl...
189

655b34a78   Peter Tyser   i2c: Create commo...
190
  /* TODO: Implement architecture-specific get/set functions */
06afa388b   Marek Vasut   i2c: kerneldoc: A...
191
192
193
194
195
196
197
198
199
200
201
202
203
  
  /**
   * 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.
   */
63656b762   Simon Glass   dm: i2c: Implemen...
204
  #if !defined(CONFIG_SYS_I2C) && !defined(CONFIG_DM_I2C)
3f4978c71   Heiko Schocher   i2c: common chang...
205
206
207
208
  /*
   * TODO: Implement architecture-specific get/set functions
   * Should go away, if we switched completely to new multibus support
   */
2515d8437   Marek Vasut   i2c: Use __weak i...
209
210
  __weak
  unsigned int i2c_get_bus_speed(void)
655b34a78   Peter Tyser   i2c: Create commo...
211
212
213
  {
  	return CONFIG_SYS_I2C_SPEED;
  }
655b34a78   Peter Tyser   i2c: Create commo...
214

06afa388b   Marek Vasut   i2c: kerneldoc: A...
215
216
217
218
219
220
221
222
223
224
225
226
227
  /**
   * 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.
   */
2515d8437   Marek Vasut   i2c: Use __weak i...
228
229
  __weak
  int i2c_set_bus_speed(unsigned int speed)
655b34a78   Peter Tyser   i2c: Create commo...
230
231
232
233
234
235
  {
  	if (speed != CONFIG_SYS_I2C_SPEED)
  		return -1;
  
  	return 0;
  }
3f4978c71   Heiko Schocher   i2c: common chang...
236
  #endif
655b34a78   Peter Tyser   i2c: Create commo...
237

06afa388b   Marek Vasut   i2c: kerneldoc: A...
238
239
240
241
  /**
   * get_alen() - Small parser helper function to get address length
   *
   * Returns the address length.
2c0dc9902   Frans Meulenbroeks   cmd_i2c: introduc...
242
   */
63656b762   Simon Glass   dm: i2c: Implemen...
243
  static uint get_alen(char *arg, int default_len)
2c0dc9902   Frans Meulenbroeks   cmd_i2c: introduc...
244
245
246
  {
  	int	j;
  	int	alen;
63656b762   Simon Glass   dm: i2c: Implemen...
247
  	alen = default_len;
2c0dc9902   Frans Meulenbroeks   cmd_i2c: introduc...
248
249
250
  	for (j = 0; j < 8; j++) {
  		if (arg[j] == '.') {
  			alen = arg[j+1] - '0';
2c0dc9902   Frans Meulenbroeks   cmd_i2c: introduc...
251
252
253
254
255
256
  			break;
  		} else if (arg[j] == '\0')
  			break;
  	}
  	return alen;
  }
c1a6f371a   Simon Glass   dm: i2c: Move err...
257
258
259
260
261
262
263
264
265
266
267
268
269
  enum i2c_err_op {
  	I2C_ERR_READ,
  	I2C_ERR_WRITE,
  };
  
  static int i2c_report_err(int ret, enum i2c_err_op op)
  {
  	printf("Error %s the chip: %d
  ",
  	       op == I2C_ERR_READ ? "reading" : "writing", ret);
  
  	return CMD_RET_FAILURE;
  }
06afa388b   Marek Vasut   i2c: kerneldoc: A...
270
271
272
273
274
275
276
277
278
279
  /**
   * 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.
   *
652e53546   Frans Meulenbroeks   cmd_i2c.c: added ...
280
281
282
   * Syntax:
   *	i2c read {i2c_chip} {devaddr}{.0, .1, .2} {len} {memaddr}
   */
54841ab50   Wolfgang Denk   Make sure that ar...
283
  static int do_i2c_read ( cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
652e53546   Frans Meulenbroeks   cmd_i2c.c: added ...
284
  {
5468461d1   Masahiro Yamada   cmd_i2c: change v...
285
  	uint	chip;
63656b762   Simon Glass   dm: i2c: Implemen...
286
287
  	uint	devaddr, length;
  	int alen;
652e53546   Frans Meulenbroeks   cmd_i2c.c: added ...
288
  	u_char  *memaddr;
63656b762   Simon Glass   dm: i2c: Implemen...
289
290
291
292
  	int ret;
  #ifdef CONFIG_DM_I2C
  	struct udevice *dev;
  #endif
652e53546   Frans Meulenbroeks   cmd_i2c.c: added ...
293

47e26b1bf   Wolfgang Denk   cmd_usage(): simp...
294
  	if (argc != 5)
4c12eeb8b   Simon Glass   Convert cmd_usage...
295
  		return CMD_RET_USAGE;
652e53546   Frans Meulenbroeks   cmd_i2c.c: added ...
296
297
298
299
300
301
302
303
304
305
306
  
  	/*
  	 * 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);
63656b762   Simon Glass   dm: i2c: Implemen...
307
  	alen = get_alen(argv[2], DEFAULT_ADDR_LEN);
7a92e53cd   Reinhard Meyer   CMD_I2C: make ale...
308
  	if (alen > 3)
4c12eeb8b   Simon Glass   Convert cmd_usage...
309
  		return CMD_RET_USAGE;
652e53546   Frans Meulenbroeks   cmd_i2c.c: added ...
310
311
312
313
314
315
316
317
318
319
  
  	/*
  	 * 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);
63656b762   Simon Glass   dm: i2c: Implemen...
320
321
322
323
324
  #ifdef CONFIG_DM_I2C
  	ret = i2c_get_cur_bus_chip(chip, &dev);
  	if (!ret && alen != -1)
  		ret = i2c_set_chip_offset_len(dev, alen);
  	if (!ret)
f9a4c2da7   Simon Glass   dm: i2c: Rename d...
325
  		ret = dm_i2c_read(dev, devaddr, memaddr, length);
63656b762   Simon Glass   dm: i2c: Implemen...
326
327
328
329
330
  #else
  	ret = i2c_read(chip, devaddr, alen, memaddr, length);
  #endif
  	if (ret)
  		return i2c_report_err(ret, I2C_ERR_READ);
652e53546   Frans Meulenbroeks   cmd_i2c.c: added ...
331
332
  	return 0;
  }
ff5d2dce1   York Sun   common/i2c: Add i...
333
334
  static int do_i2c_write(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
  {
5468461d1   Masahiro Yamada   cmd_i2c: change v...
335
  	uint	chip;
63656b762   Simon Glass   dm: i2c: Implemen...
336
337
  	uint	devaddr, length;
  	int alen;
ff5d2dce1   York Sun   common/i2c: Add i...
338
  	u_char  *memaddr;
63656b762   Simon Glass   dm: i2c: Implemen...
339
340
341
  	int ret;
  #ifdef CONFIG_DM_I2C
  	struct udevice *dev;
ed16f1468   Lubomir Popov   cmd_i2c: Provide ...
342
  	struct dm_i2c_chip *i2c_chip;
63656b762   Simon Glass   dm: i2c: Implemen...
343
  #endif
ff5d2dce1   York Sun   common/i2c: Add i...
344

ed16f1468   Lubomir Popov   cmd_i2c: Provide ...
345
  	if ((argc < 5) || (argc > 6))
ff5d2dce1   York Sun   common/i2c: Add i...
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
  		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);
63656b762   Simon Glass   dm: i2c: Implemen...
363
  	alen = get_alen(argv[3], DEFAULT_ADDR_LEN);
ff5d2dce1   York Sun   common/i2c: Add i...
364
365
366
367
  	if (alen > 3)
  		return cmd_usage(cmdtp);
  
  	/*
ed16f1468   Lubomir Popov   cmd_i2c: Provide ...
368
  	 * Length is the number of bytes.
ff5d2dce1   York Sun   common/i2c: Add i...
369
370
  	 */
  	length = simple_strtoul(argv[4], NULL, 16);
63656b762   Simon Glass   dm: i2c: Implemen...
371
372
373
374
375
376
  #ifdef CONFIG_DM_I2C
  	ret = i2c_get_cur_bus_chip(chip, &dev);
  	if (!ret && alen != -1)
  		ret = i2c_set_chip_offset_len(dev, alen);
  	if (ret)
  		return i2c_report_err(ret, I2C_ERR_WRITE);
ed16f1468   Lubomir Popov   cmd_i2c: Provide ...
377
378
379
  	i2c_chip = dev_get_parent_platdata(dev);
  	if (!i2c_chip)
  		return i2c_report_err(ret, I2C_ERR_WRITE);
63656b762   Simon Glass   dm: i2c: Implemen...
380
  #endif
ed16f1468   Lubomir Popov   cmd_i2c: Provide ...
381
382
383
384
385
386
387
  	if (argc == 6 && !strcmp(argv[5], "-s")) {
  		/*
  		 * Write all bytes in a single I2C transaction. If the target
  		 * device is an EEPROM, it is your responsibility to not cross
  		 * a page boundary. No write delay upon completion, take this
  		 * into account if linking commands.
  		 */
63656b762   Simon Glass   dm: i2c: Implemen...
388
  #ifdef CONFIG_DM_I2C
ed16f1468   Lubomir Popov   cmd_i2c: Provide ...
389
390
  		i2c_chip->flags &= ~DM_I2C_CHIP_WR_ADDRESS;
  		ret = dm_i2c_write(dev, devaddr, memaddr, length);
63656b762   Simon Glass   dm: i2c: Implemen...
391
  #else
ed16f1468   Lubomir Popov   cmd_i2c: Provide ...
392
  		ret = i2c_write(chip, devaddr, alen, memaddr, length);
63656b762   Simon Glass   dm: i2c: Implemen...
393
394
395
  #endif
  		if (ret)
  			return i2c_report_err(ret, I2C_ERR_WRITE);
ed16f1468   Lubomir Popov   cmd_i2c: Provide ...
396
397
398
399
400
401
402
403
404
405
406
407
408
409
  	} else {
  		/*
  		 * Repeated addressing - perform <length> separate
  		 * write transactions of one byte each
  		 */
  		while (length-- > 0) {
  #ifdef CONFIG_DM_I2C
  			i2c_chip->flags |= DM_I2C_CHIP_WR_ADDRESS;
  			ret = dm_i2c_write(dev, devaddr++, memaddr++, 1);
  #else
  			ret = i2c_write(chip, devaddr++, alen, memaddr++, 1);
  #endif
  			if (ret)
  				return i2c_report_err(ret, I2C_ERR_WRITE);
ff5d2dce1   York Sun   common/i2c: Add i...
410
411
412
413
  /*
   * No write delay with FRAM devices.
   */
  #if !defined(CONFIG_SYS_I2C_FRAM)
ed16f1468   Lubomir Popov   cmd_i2c: Provide ...
414
  			udelay(11000);
ff5d2dce1   York Sun   common/i2c: Add i...
415
  #endif
ed16f1468   Lubomir Popov   cmd_i2c: Provide ...
416
  		}
ff5d2dce1   York Sun   common/i2c: Add i...
417
418
419
  	}
  	return 0;
  }
63656b762   Simon Glass   dm: i2c: Implemen...
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
  #ifdef CONFIG_DM_I2C
  static int do_i2c_flags(cmd_tbl_t *cmdtp, int flag, int argc,
  			char *const argv[])
  {
  	struct udevice *dev;
  	uint flags;
  	int chip;
  	int ret;
  
  	if (argc < 2)
  		return CMD_RET_USAGE;
  
  	chip = simple_strtoul(argv[1], NULL, 16);
  	ret = i2c_get_cur_bus_chip(chip, &dev);
  	if (ret)
  		return i2c_report_err(ret, I2C_ERR_READ);
  
  	if (argc > 2) {
  		flags = simple_strtoul(argv[2], NULL, 16);
  		ret = i2c_set_chip_flags(dev, flags);
  	} else  {
  		ret = i2c_get_chip_flags(dev, &flags);
  		if (!ret)
  			printf("%x
  ", flags);
  	}
  	if (ret)
  		return i2c_report_err(ret, I2C_ERR_READ);
  
  	return 0;
  }
c10c8e313   Simon Glass   dm: i2c: Add a co...
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
  
  static int do_i2c_olen(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
  {
  	struct udevice *dev;
  	uint olen;
  	int chip;
  	int ret;
  
  	if (argc < 2)
  		return CMD_RET_USAGE;
  
  	chip = simple_strtoul(argv[1], NULL, 16);
  	ret = i2c_get_cur_bus_chip(chip, &dev);
  	if (ret)
  		return i2c_report_err(ret, I2C_ERR_READ);
  
  	if (argc > 2) {
  		olen = simple_strtoul(argv[2], NULL, 16);
  		ret = i2c_set_chip_offset_len(dev, olen);
  	} else  {
  		ret = i2c_get_chip_offset_len(dev);
  		if (ret >= 0) {
  			printf("%x
  ", ret);
  			ret = 0;
  		}
  	}
  	if (ret)
  		return i2c_report_err(ret, I2C_ERR_READ);
  
  	return 0;
  }
63656b762   Simon Glass   dm: i2c: Implemen...
483
  #endif
06afa388b   Marek Vasut   i2c: kerneldoc: A...
484
485
486
487
488
489
490
491
492
493
  /**
   * 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.
   *
4a8cf3382   Frans Meulenbroeks   cmd_i2c: moved mi...
494
495
496
   * Syntax:
   *	i2c md {i2c_chip} {addr}{.0, .1, .2} {len}
   */
54841ab50   Wolfgang Denk   Make sure that ar...
497
  static int do_i2c_md ( cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
81a8824f2   wdenk   Initial revision
498
  {
5468461d1   Masahiro Yamada   cmd_i2c: change v...
499
  	uint	chip;
63656b762   Simon Glass   dm: i2c: Implemen...
500
501
  	uint	addr, length;
  	int alen;
81a8824f2   wdenk   Initial revision
502
  	int	j, nbytes, linebytes;
63656b762   Simon Glass   dm: i2c: Implemen...
503
504
505
506
  	int ret;
  #ifdef CONFIG_DM_I2C
  	struct udevice *dev;
  #endif
81a8824f2   wdenk   Initial revision
507
508
509
510
511
512
513
514
  
  	/* 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;
47e26b1bf   Wolfgang Denk   cmd_usage(): simp...
515
  	if (argc < 3)
4c12eeb8b   Simon Glass   Convert cmd_usage...
516
  		return CMD_RET_USAGE;
81a8824f2   wdenk   Initial revision
517
518
519
520
521
  
  	if ((flag & CMD_FLAG_REPEAT) == 0) {
  		/*
  		 * New command specified.
  		 */
81a8824f2   wdenk   Initial revision
522
523
524
525
526
527
528
529
530
531
532
  
  		/*
  		 * 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);
63656b762   Simon Glass   dm: i2c: Implemen...
533
  		alen = get_alen(argv[2], DEFAULT_ADDR_LEN);
7a92e53cd   Reinhard Meyer   CMD_I2C: make ale...
534
  		if (alen > 3)
4c12eeb8b   Simon Glass   Convert cmd_usage...
535
  			return CMD_RET_USAGE;
81a8824f2   wdenk   Initial revision
536
537
538
539
540
541
542
543
  
  		/*
  		 * 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);
  	}
63656b762   Simon Glass   dm: i2c: Implemen...
544
545
546
547
548
549
550
  #ifdef CONFIG_DM_I2C
  	ret = i2c_get_cur_bus_chip(chip, &dev);
  	if (!ret && alen != -1)
  		ret = i2c_set_chip_offset_len(dev, alen);
  	if (ret)
  		return i2c_report_err(ret, I2C_ERR_READ);
  #endif
81a8824f2   wdenk   Initial revision
551
552
553
554
555
556
557
558
559
560
561
562
  	/*
  	 * 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;
63656b762   Simon Glass   dm: i2c: Implemen...
563
  #ifdef CONFIG_DM_I2C
f9a4c2da7   Simon Glass   dm: i2c: Rename d...
564
  		ret = dm_i2c_read(dev, addr, linebuf, linebytes);
63656b762   Simon Glass   dm: i2c: Implemen...
565
566
567
568
  #else
  		ret = i2c_read(chip, addr, alen, linebuf, linebytes);
  #endif
  		if (ret)
9e533cb04   Masahiro Yamada   cmd_i2c: quit I2C...
569
  			return i2c_report_err(ret, I2C_ERR_READ);
e857a5bdb   Timur Tabi   mpc83xx: Miscella...
570
  		else {
81a8824f2   wdenk   Initial revision
571
572
573
574
575
576
  			printf("%04x:", addr);
  			cp = linebuf;
  			for (j=0; j<linebytes; j++) {
  				printf(" %02x", *cp++);
  				addr++;
  			}
4b9206ed5   wdenk   * Patches by Thom...
577
  			puts ("    ");
81a8824f2   wdenk   Initial revision
578
579
580
  			cp = linebuf;
  			for (j=0; j<linebytes; j++) {
  				if ((*cp < 0x20) || (*cp > 0x7e))
4b9206ed5   wdenk   * Patches by Thom...
581
  					puts (".");
81a8824f2   wdenk   Initial revision
582
583
584
585
  				else
  					printf("%c", *cp);
  				cp++;
  			}
4b9206ed5   wdenk   * Patches by Thom...
586
587
  			putc ('
  ');
81a8824f2   wdenk   Initial revision
588
589
590
591
592
593
594
595
596
597
598
  		}
  		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;
  }
06afa388b   Marek Vasut   i2c: kerneldoc: A...
599
600
601
602
603
604
605
606
607
  /**
   * 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.
81a8824f2   wdenk   Initial revision
608
609
   *
   * Syntax:
0f89c54be   Peter Tyser   i2c: Update refer...
610
   *	i2c mw {i2c_chip} {addr}{.0, .1, .2} {data} [{count}]
81a8824f2   wdenk   Initial revision
611
   */
54841ab50   Wolfgang Denk   Make sure that ar...
612
  static int do_i2c_mw ( cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
81a8824f2   wdenk   Initial revision
613
  {
5468461d1   Masahiro Yamada   cmd_i2c: change v...
614
  	uint	chip;
81a8824f2   wdenk   Initial revision
615
  	ulong	addr;
63656b762   Simon Glass   dm: i2c: Implemen...
616
  	int	alen;
81a8824f2   wdenk   Initial revision
617
618
  	uchar	byte;
  	int	count;
63656b762   Simon Glass   dm: i2c: Implemen...
619
620
621
622
  	int ret;
  #ifdef CONFIG_DM_I2C
  	struct udevice *dev;
  #endif
81a8824f2   wdenk   Initial revision
623

47e26b1bf   Wolfgang Denk   cmd_usage(): simp...
624
  	if ((argc < 4) || (argc > 5))
4c12eeb8b   Simon Glass   Convert cmd_usage...
625
  		return CMD_RET_USAGE;
81a8824f2   wdenk   Initial revision
626
627
  
  	/*
53677ef18   Wolfgang Denk   Big white-space c...
628
629
  	 * Chip is always specified.
  	 */
81a8824f2   wdenk   Initial revision
630
631
632
633
634
635
  	chip = simple_strtoul(argv[1], NULL, 16);
  
  	/*
  	 * Address is always specified.
  	 */
  	addr = simple_strtoul(argv[2], NULL, 16);
63656b762   Simon Glass   dm: i2c: Implemen...
636
  	alen = get_alen(argv[2], DEFAULT_ADDR_LEN);
7a92e53cd   Reinhard Meyer   CMD_I2C: make ale...
637
  	if (alen > 3)
4c12eeb8b   Simon Glass   Convert cmd_usage...
638
  		return CMD_RET_USAGE;
81a8824f2   wdenk   Initial revision
639

63656b762   Simon Glass   dm: i2c: Implemen...
640
641
642
643
644
645
646
  #ifdef CONFIG_DM_I2C
  	ret = i2c_get_cur_bus_chip(chip, &dev);
  	if (!ret && alen != -1)
  		ret = i2c_set_chip_offset_len(dev, alen);
  	if (ret)
  		return i2c_report_err(ret, I2C_ERR_WRITE);
  #endif
81a8824f2   wdenk   Initial revision
647
648
649
650
651
652
653
654
  	/*
  	 * Value to write is always specified.
  	 */
  	byte = simple_strtoul(argv[3], NULL, 16);
  
  	/*
  	 * Optional count
  	 */
e857a5bdb   Timur Tabi   mpc83xx: Miscella...
655
  	if (argc == 5)
81a8824f2   wdenk   Initial revision
656
  		count = simple_strtoul(argv[4], NULL, 16);
e857a5bdb   Timur Tabi   mpc83xx: Miscella...
657
  	else
81a8824f2   wdenk   Initial revision
658
  		count = 1;
81a8824f2   wdenk   Initial revision
659
660
  
  	while (count-- > 0) {
63656b762   Simon Glass   dm: i2c: Implemen...
661
  #ifdef CONFIG_DM_I2C
f9a4c2da7   Simon Glass   dm: i2c: Rename d...
662
  		ret = dm_i2c_write(dev, addr++, &byte, 1);
63656b762   Simon Glass   dm: i2c: Implemen...
663
664
665
666
  #else
  		ret = i2c_write(chip, addr++, alen, &byte, 1);
  #endif
  		if (ret)
9e533cb04   Masahiro Yamada   cmd_i2c: quit I2C...
667
  			return i2c_report_err(ret, I2C_ERR_WRITE);
81a8824f2   wdenk   Initial revision
668
669
670
  		/*
  		 * Wait for the write to complete.  The write can take
  		 * up to 10mSec (we allow a little more time).
81a8824f2   wdenk   Initial revision
671
  		 */
d4f5c7289     FRAM memory acces...
672
673
674
  /*
   * No write delay with FRAM devices.
   */
6d0f6bcf3   Jean-Christophe PLAGNIOL-VILLARD   rename CFG_ macro...
675
  #if !defined(CONFIG_SYS_I2C_FRAM)
81a8824f2   wdenk   Initial revision
676
  		udelay(11000);
d4f5c7289     FRAM memory acces...
677
  #endif
81a8824f2   wdenk   Initial revision
678
  	}
06afa388b   Marek Vasut   i2c: kerneldoc: A...
679
  	return 0;
81a8824f2   wdenk   Initial revision
680
  }
06afa388b   Marek Vasut   i2c: kerneldoc: A...
681
682
683
684
685
686
687
688
689
690
691
  /**
   * 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.
81a8824f2   wdenk   Initial revision
692
693
   *
   * Syntax:
0f89c54be   Peter Tyser   i2c: Update refer...
694
   *	i2c crc32 {i2c_chip} {addr}{.0, .1, .2} {count}
81a8824f2   wdenk   Initial revision
695
   */
54841ab50   Wolfgang Denk   Make sure that ar...
696
  static int do_i2c_crc (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
81a8824f2   wdenk   Initial revision
697
  {
5468461d1   Masahiro Yamada   cmd_i2c: change v...
698
  	uint	chip;
81a8824f2   wdenk   Initial revision
699
  	ulong	addr;
63656b762   Simon Glass   dm: i2c: Implemen...
700
  	int	alen;
81a8824f2   wdenk   Initial revision
701
702
703
704
  	int	count;
  	uchar	byte;
  	ulong	crc;
  	ulong	err;
63656b762   Simon Glass   dm: i2c: Implemen...
705
706
707
708
  	int ret = 0;
  #ifdef CONFIG_DM_I2C
  	struct udevice *dev;
  #endif
81a8824f2   wdenk   Initial revision
709

47e26b1bf   Wolfgang Denk   cmd_usage(): simp...
710
  	if (argc < 4)
4c12eeb8b   Simon Glass   Convert cmd_usage...
711
  		return CMD_RET_USAGE;
81a8824f2   wdenk   Initial revision
712
713
  
  	/*
53677ef18   Wolfgang Denk   Big white-space c...
714
715
  	 * Chip is always specified.
  	 */
81a8824f2   wdenk   Initial revision
716
717
718
719
720
721
  	chip = simple_strtoul(argv[1], NULL, 16);
  
  	/*
  	 * Address is always specified.
  	 */
  	addr = simple_strtoul(argv[2], NULL, 16);
63656b762   Simon Glass   dm: i2c: Implemen...
722
  	alen = get_alen(argv[2], DEFAULT_ADDR_LEN);
7a92e53cd   Reinhard Meyer   CMD_I2C: make ale...
723
  	if (alen > 3)
4c12eeb8b   Simon Glass   Convert cmd_usage...
724
  		return CMD_RET_USAGE;
81a8824f2   wdenk   Initial revision
725

63656b762   Simon Glass   dm: i2c: Implemen...
726
727
728
729
730
731
732
  #ifdef CONFIG_DM_I2C
  	ret = i2c_get_cur_bus_chip(chip, &dev);
  	if (!ret && alen != -1)
  		ret = i2c_set_chip_offset_len(dev, alen);
  	if (ret)
  		return i2c_report_err(ret, I2C_ERR_READ);
  #endif
81a8824f2   wdenk   Initial revision
733
734
735
736
737
738
739
740
741
742
743
744
  	/*
  	 * 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;
e857a5bdb   Timur Tabi   mpc83xx: Miscella...
745
  	while (count-- > 0) {
63656b762   Simon Glass   dm: i2c: Implemen...
746
  #ifdef CONFIG_DM_I2C
f9a4c2da7   Simon Glass   dm: i2c: Rename d...
747
  		ret = dm_i2c_read(dev, addr, &byte, 1);
63656b762   Simon Glass   dm: i2c: Implemen...
748
749
750
751
  #else
  		ret = i2c_read(chip, addr, alen, &byte, 1);
  #endif
  		if (ret)
81a8824f2   wdenk   Initial revision
752
  			err++;
81a8824f2   wdenk   Initial revision
753
754
755
  		crc = crc32 (crc, &byte, 1);
  		addr++;
  	}
e857a5bdb   Timur Tabi   mpc83xx: Miscella...
756
  	if (err > 0)
63656b762   Simon Glass   dm: i2c: Implemen...
757
  		i2c_report_err(ret, I2C_ERR_READ);
e857a5bdb   Timur Tabi   mpc83xx: Miscella...
758
  	else
81a8824f2   wdenk   Initial revision
759
760
  		printf ("%08lx
  ", crc);
81a8824f2   wdenk   Initial revision
761
762
763
  
  	return 0;
  }
06afa388b   Marek Vasut   i2c: kerneldoc: A...
764
765
766
767
768
769
770
771
772
773
774
  /**
   * 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.
81a8824f2   wdenk   Initial revision
775
776
   *
   * Syntax:
0f89c54be   Peter Tyser   i2c: Update refer...
777
778
   *	i2c mm{.b, .w, .l} {i2c_chip} {addr}{.0, .1, .2}
   *	i2c nm{.b, .w, .l} {i2c_chip} {addr}{.0, .1, .2}
81a8824f2   wdenk   Initial revision
779
   */
81a8824f2   wdenk   Initial revision
780
  static int
54841ab50   Wolfgang Denk   Make sure that ar...
781
  mod_i2c_mem(cmd_tbl_t *cmdtp, int incrflag, int flag, int argc, char * const argv[])
81a8824f2   wdenk   Initial revision
782
  {
5468461d1   Masahiro Yamada   cmd_i2c: change v...
783
  	uint	chip;
81a8824f2   wdenk   Initial revision
784
  	ulong	addr;
63656b762   Simon Glass   dm: i2c: Implemen...
785
  	int	alen;
81a8824f2   wdenk   Initial revision
786
787
788
  	ulong	data;
  	int	size = 1;
  	int	nbytes;
63656b762   Simon Glass   dm: i2c: Implemen...
789
790
791
792
  	int ret;
  #ifdef CONFIG_DM_I2C
  	struct udevice *dev;
  #endif
81a8824f2   wdenk   Initial revision
793

47e26b1bf   Wolfgang Denk   cmd_usage(): simp...
794
  	if (argc != 3)
4c12eeb8b   Simon Glass   Convert cmd_usage...
795
  		return CMD_RET_USAGE;
81a8824f2   wdenk   Initial revision
796

b26440f1f   Simon Glass   Rename bootretry ...
797
  	bootretry_reset_cmd_timeout();	/* got a good command to get here */
81a8824f2   wdenk   Initial revision
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
  	/*
  	 * 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);
  
  		/*
53677ef18   Wolfgang Denk   Big white-space c...
814
815
  		 * Chip is always specified.
  		 */
81a8824f2   wdenk   Initial revision
816
817
818
819
820
821
  		chip = simple_strtoul(argv[1], NULL, 16);
  
  		/*
  		 * Address is always specified.
  		 */
  		addr = simple_strtoul(argv[2], NULL, 16);
63656b762   Simon Glass   dm: i2c: Implemen...
822
  		alen = get_alen(argv[2], DEFAULT_ADDR_LEN);
7a92e53cd   Reinhard Meyer   CMD_I2C: make ale...
823
  		if (alen > 3)
4c12eeb8b   Simon Glass   Convert cmd_usage...
824
  			return CMD_RET_USAGE;
81a8824f2   wdenk   Initial revision
825
  	}
63656b762   Simon Glass   dm: i2c: Implemen...
826
827
828
829
830
831
832
  #ifdef CONFIG_DM_I2C
  	ret = i2c_get_cur_bus_chip(chip, &dev);
  	if (!ret && alen != -1)
  		ret = i2c_set_chip_offset_len(dev, alen);
  	if (ret)
  		return i2c_report_err(ret, I2C_ERR_WRITE);
  #endif
81a8824f2   wdenk   Initial revision
833
834
835
836
837
838
  	/*
  	 * Print the address, followed by value.  Then accept input for
  	 * the next value.  A non-converted value exits.
  	 */
  	do {
  		printf("%08lx:", addr);
63656b762   Simon Glass   dm: i2c: Implemen...
839
  #ifdef CONFIG_DM_I2C
f9a4c2da7   Simon Glass   dm: i2c: Rename d...
840
  		ret = dm_i2c_read(dev, addr, (uchar *)&data, size);
63656b762   Simon Glass   dm: i2c: Implemen...
841
842
843
844
  #else
  		ret = i2c_read(chip, addr, alen, (uchar *)&data, size);
  #endif
  		if (ret)
9e533cb04   Masahiro Yamada   cmd_i2c: quit I2C...
845
846
847
848
849
850
851
852
853
  			return i2c_report_err(ret, I2C_ERR_READ);
  
  		data = cpu_to_be32(data);
  		if (size == 1)
  			printf(" %02lx", (data >> 24) & 0x000000FF);
  		else if (size == 2)
  			printf(" %04lx", (data >> 16) & 0x0000FFFF);
  		else
  			printf(" %08lx", data);
81a8824f2   wdenk   Initial revision
854

e1bf824df   Simon Glass   Add cli_ prefix t...
855
  		nbytes = cli_readline(" ? ");
81a8824f2   wdenk   Initial revision
856
857
858
859
860
861
862
863
  		if (nbytes == 0) {
  			/*
  			 * <CR> pressed as only input, don't modify current
  			 * location and move to next.
  			 */
  			if (incrflag)
  				addr += size;
  			nbytes = size;
b26440f1f   Simon Glass   Rename bootretry ...
864
865
  			/* good enough to not time out */
  			bootretry_reset_cmd_timeout();
81a8824f2   wdenk   Initial revision
866
867
  		}
  #ifdef CONFIG_BOOT_RETRY_TIME
e857a5bdb   Timur Tabi   mpc83xx: Miscella...
868
  		else if (nbytes == -2)
81a8824f2   wdenk   Initial revision
869
  			break;	/* timed out, exit the command	*/
81a8824f2   wdenk   Initial revision
870
871
872
873
874
  #endif
  		else {
  			char *endp;
  
  			data = simple_strtoul(console_buffer, &endp, 16);
e857a5bdb   Timur Tabi   mpc83xx: Miscella...
875
  			if (size == 1)
81a8824f2   wdenk   Initial revision
876
  				data = data << 24;
e857a5bdb   Timur Tabi   mpc83xx: Miscella...
877
  			else if (size == 2)
81a8824f2   wdenk   Initial revision
878
  				data = data << 16;
81a8824f2   wdenk   Initial revision
879
880
881
  			data = be32_to_cpu(data);
  			nbytes = endp - console_buffer;
  			if (nbytes) {
81a8824f2   wdenk   Initial revision
882
883
884
  				/*
  				 * good enough to not time out
  				 */
b26440f1f   Simon Glass   Rename bootretry ...
885
  				bootretry_reset_cmd_timeout();
63656b762   Simon Glass   dm: i2c: Implemen...
886
  #ifdef CONFIG_DM_I2C
f9a4c2da7   Simon Glass   dm: i2c: Rename d...
887
888
  				ret = dm_i2c_write(dev, addr, (uchar *)&data,
  						   size);
63656b762   Simon Glass   dm: i2c: Implemen...
889
890
891
892
893
  #else
  				ret = i2c_write(chip, addr, alen,
  						(uchar *)&data, size);
  #endif
  				if (ret)
9e533cb04   Masahiro Yamada   cmd_i2c: quit I2C...
894
895
  					return i2c_report_err(ret,
  							      I2C_ERR_WRITE);
6d0f6bcf3   Jean-Christophe PLAGNIOL-VILLARD   rename CFG_ macro...
896
897
  #ifdef CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS
  				udelay(CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS * 1000);
2535d6027   wdenk   * Patch by Martin...
898
  #endif
81a8824f2   wdenk   Initial revision
899
900
901
902
903
  				if (incrflag)
  					addr += size;
  			}
  		}
  	} while (nbytes);
0800707b6   Peter Tyser   mod_i2c_mem() bugfix
904
905
906
  	i2c_mm_last_chip = chip;
  	i2c_mm_last_addr = addr;
  	i2c_mm_last_alen = alen;
81a8824f2   wdenk   Initial revision
907
908
909
  
  	return 0;
  }
06afa388b   Marek Vasut   i2c: kerneldoc: A...
910
911
912
913
914
915
916
917
918
919
  /**
   * 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.
   *
81a8824f2   wdenk   Initial revision
920
   * Syntax:
54b99e51a   Eric Nelson   i2c_probe: update...
921
922
923
   *	i2c probe {addr}
   *
   * Returns zero (success) if one or more I2C devices was found
81a8824f2   wdenk   Initial revision
924
   */
54841ab50   Wolfgang Denk   Make sure that ar...
925
  static int do_i2c_probe (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
81a8824f2   wdenk   Initial revision
926
927
  {
  	int j;
54b99e51a   Eric Nelson   i2c_probe: update...
928
929
  	int addr = -1;
  	int found = 0;
6d0f6bcf3   Jean-Christophe PLAGNIOL-VILLARD   rename CFG_ macro...
930
  #if defined(CONFIG_SYS_I2C_NOPROBES)
81a8824f2   wdenk   Initial revision
931
  	int k, skip;
3f4978c71   Heiko Schocher   i2c: common chang...
932
  	unsigned int bus = GET_BUS_NUM;
bb99ad6d8   Ben Warren   Add support for m...
933
  #endif	/* NOPROBES */
63656b762   Simon Glass   dm: i2c: Implemen...
934
935
936
937
938
939
940
  	int ret;
  #ifdef CONFIG_DM_I2C
  	struct udevice *bus, *dev;
  
  	if (i2c_get_cur_bus(&bus))
  		return CMD_RET_FAILURE;
  #endif
81a8824f2   wdenk   Initial revision
941

54b99e51a   Eric Nelson   i2c_probe: update...
942
943
  	if (argc == 2)
  		addr = simple_strtol(argv[1], 0, 16);
4b9206ed5   wdenk   * Patches by Thom...
944
  	puts ("Valid chip addresses:");
e857a5bdb   Timur Tabi   mpc83xx: Miscella...
945
  	for (j = 0; j < 128; j++) {
54b99e51a   Eric Nelson   i2c_probe: update...
946
947
  		if ((0 <= addr) && (j != addr))
  			continue;
6d0f6bcf3   Jean-Christophe PLAGNIOL-VILLARD   rename CFG_ macro...
948
  #if defined(CONFIG_SYS_I2C_NOPROBES)
81a8824f2   wdenk   Initial revision
949
  		skip = 0;
cfb25cc40   Axel Lin   cmd_i2c: Use ARRA...
950
  		for (k = 0; k < ARRAY_SIZE(i2c_no_probes); k++) {
e857a5bdb   Timur Tabi   mpc83xx: Miscella...
951
  			if (COMPARE_BUS(bus, k) && COMPARE_ADDR(j, k)) {
81a8824f2   wdenk   Initial revision
952
953
954
955
956
957
958
  				skip = 1;
  				break;
  			}
  		}
  		if (skip)
  			continue;
  #endif
63656b762   Simon Glass   dm: i2c: Implemen...
959
  #ifdef CONFIG_DM_I2C
f9a4c2da7   Simon Glass   dm: i2c: Rename d...
960
  		ret = dm_i2c_probe(bus, j, 0, &dev);
63656b762   Simon Glass   dm: i2c: Implemen...
961
962
963
964
  #else
  		ret = i2c_probe(j);
  #endif
  		if (ret == 0) {
81a8824f2   wdenk   Initial revision
965
  			printf(" %02X", j);
54b99e51a   Eric Nelson   i2c_probe: update...
966
967
  			found++;
  		}
81a8824f2   wdenk   Initial revision
968
  	}
4b9206ed5   wdenk   * Patches by Thom...
969
970
  	putc ('
  ');
81a8824f2   wdenk   Initial revision
971

6d0f6bcf3   Jean-Christophe PLAGNIOL-VILLARD   rename CFG_ macro...
972
  #if defined(CONFIG_SYS_I2C_NOPROBES)
81a8824f2   wdenk   Initial revision
973
  	puts ("Excluded chip addresses:");
cfb25cc40   Axel Lin   cmd_i2c: Use ARRA...
974
  	for (k = 0; k < ARRAY_SIZE(i2c_no_probes); k++) {
e857a5bdb   Timur Tabi   mpc83xx: Miscella...
975
  		if (COMPARE_BUS(bus,k))
bb99ad6d8   Ben Warren   Add support for m...
976
977
  			printf(" %02X", NO_PROBE_ADDR(k));
  	}
4b9206ed5   wdenk   * Patches by Thom...
978
979
  	putc ('
  ');
81a8824f2   wdenk   Initial revision
980
  #endif
54b99e51a   Eric Nelson   i2c_probe: update...
981
  	return (0 == found);
81a8824f2   wdenk   Initial revision
982
  }
06afa388b   Marek Vasut   i2c: kerneldoc: A...
983
984
985
986
987
988
989
990
991
992
  /**
   * 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.
   *
81a8824f2   wdenk   Initial revision
993
   * Syntax:
0f89c54be   Peter Tyser   i2c: Update refer...
994
   *	i2c loop {i2c_chip} {addr}{.0, .1, .2} [{length}] [{delay}]
81a8824f2   wdenk   Initial revision
995
996
997
   *	{length} - Number of bytes to read
   *	{delay}  - A DECIMAL number and defaults to 1000 uSec
   */
54841ab50   Wolfgang Denk   Make sure that ar...
998
  static int do_i2c_loop(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
81a8824f2   wdenk   Initial revision
999
  {
5468461d1   Masahiro Yamada   cmd_i2c: change v...
1000
  	uint	chip;
63656b762   Simon Glass   dm: i2c: Implemen...
1001
  	int alen;
81a8824f2   wdenk   Initial revision
1002
1003
1004
1005
  	uint	addr;
  	uint	length;
  	u_char	bytes[16];
  	int	delay;
63656b762   Simon Glass   dm: i2c: Implemen...
1006
1007
1008
1009
  	int ret;
  #ifdef CONFIG_DM_I2C
  	struct udevice *dev;
  #endif
81a8824f2   wdenk   Initial revision
1010

47e26b1bf   Wolfgang Denk   cmd_usage(): simp...
1011
  	if (argc < 3)
4c12eeb8b   Simon Glass   Convert cmd_usage...
1012
  		return CMD_RET_USAGE;
81a8824f2   wdenk   Initial revision
1013
1014
1015
1016
1017
1018
1019
1020
1021
1022
  
  	/*
  	 * Chip is always specified.
  	 */
  	chip = simple_strtoul(argv[1], NULL, 16);
  
  	/*
  	 * Address is always specified.
  	 */
  	addr = simple_strtoul(argv[2], NULL, 16);
63656b762   Simon Glass   dm: i2c: Implemen...
1023
  	alen = get_alen(argv[2], DEFAULT_ADDR_LEN);
7a92e53cd   Reinhard Meyer   CMD_I2C: make ale...
1024
  	if (alen > 3)
4c12eeb8b   Simon Glass   Convert cmd_usage...
1025
  		return CMD_RET_USAGE;
63656b762   Simon Glass   dm: i2c: Implemen...
1026
1027
1028
1029
1030
1031
1032
  #ifdef CONFIG_DM_I2C
  	ret = i2c_get_cur_bus_chip(chip, &dev);
  	if (!ret && alen != -1)
  		ret = i2c_set_chip_offset_len(dev, alen);
  	if (ret)
  		return i2c_report_err(ret, I2C_ERR_WRITE);
  #endif
81a8824f2   wdenk   Initial revision
1033
1034
1035
1036
1037
1038
  
  	/*
  	 * Length is the number of objects, not number of bytes.
  	 */
  	length = 1;
  	length = simple_strtoul(argv[3], NULL, 16);
e857a5bdb   Timur Tabi   mpc83xx: Miscella...
1039
  	if (length > sizeof(bytes))
81a8824f2   wdenk   Initial revision
1040
  		length = sizeof(bytes);
81a8824f2   wdenk   Initial revision
1041
1042
1043
1044
1045
  
  	/*
  	 * The delay time (uSec) is optional.
  	 */
  	delay = 1000;
e857a5bdb   Timur Tabi   mpc83xx: Miscella...
1046
  	if (argc > 3)
81a8824f2   wdenk   Initial revision
1047
  		delay = simple_strtoul(argv[4], NULL, 10);
81a8824f2   wdenk   Initial revision
1048
1049
1050
  	/*
  	 * Run the loop...
  	 */
e857a5bdb   Timur Tabi   mpc83xx: Miscella...
1051
  	while (1) {
63656b762   Simon Glass   dm: i2c: Implemen...
1052
  #ifdef CONFIG_DM_I2C
f9a4c2da7   Simon Glass   dm: i2c: Rename d...
1053
  		ret = dm_i2c_read(dev, addr, bytes, length);
63656b762   Simon Glass   dm: i2c: Implemen...
1054
1055
1056
1057
1058
  #else
  		ret = i2c_read(chip, addr, alen, bytes, length);
  #endif
  		if (ret)
  			i2c_report_err(ret, I2C_ERR_READ);
81a8824f2   wdenk   Initial revision
1059
1060
1061
1062
1063
1064
  		udelay(delay);
  	}
  
  	/* NOTREACHED */
  	return 0;
  }
81a8824f2   wdenk   Initial revision
1065
1066
1067
  /*
   * The SDRAM command is separately configured because many
   * (most?) embedded boards don't use SDRAM DIMMs.
06afa388b   Marek Vasut   i2c: kerneldoc: A...
1068
1069
   *
   * FIXME: Document and probably move elsewhere!
81a8824f2   wdenk   Initial revision
1070
   */
c76fe4742   Jon Loeliger   common/cmd_[i-n]*...
1071
  #if defined(CONFIG_CMD_SDRAM)
632de0672   Larry Johnson   Refactor code for...
1072
1073
1074
1075
1076
1077
1078
1079
1080
1081
1082
1083
1084
1085
1086
1087
1088
1089
1090
1091
1092
1093
1094
1095
1096
1097
1098
1099
1100
1101
1102
1103
1104
1105
1106
1107
1108
1109
1110
1111
1112
1113
1114
1115
1116
1117
1118
1119
1120
1121
1122
1123
  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
  ", b & 0x0F);
  		break;
  	case 0xA:
  		puts ("25 ns
  ");
  		break;
  	case 0xB:
  		puts ("33 ns
  ");
  		break;
  	case 0xC:
  		puts ("66 ns
  ");
  		break;
  	case 0xD:
  		puts ("75 ns
  ");
  		break;
  	default:
  		puts ("?? ns
  ");
  		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;
  		}
  	}
  }
81a8824f2   wdenk   Initial revision
1124
1125
1126
  
  /*
   * Syntax:
0f89c54be   Peter Tyser   i2c: Update refer...
1127
   *	i2c sdram {i2c_chip}
81a8824f2   wdenk   Initial revision
1128
   */
54841ab50   Wolfgang Denk   Make sure that ar...
1129
  static int do_sdram (cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
81a8824f2   wdenk   Initial revision
1130
  {
18c4e7f71   Michal Simek   i2c: spd: Extend ...
1131
  	enum { unknown, EDO, SDRAM, DDR, DDR2, DDR3, DDR4 } type;
632de0672   Larry Johnson   Refactor code for...
1132

5468461d1   Masahiro Yamada   cmd_i2c: change v...
1133
  	uint	chip;
81a8824f2   wdenk   Initial revision
1134
1135
  	u_char	data[128];
  	u_char	cksum;
28df8ed07   Nobuhiro Iwamatsu   cmd: i2c: Fix use...
1136
1137
1138
1139
  	int	j, ret;
  #ifdef CONFIG_DM_I2C
  	struct udevice *dev;
  #endif
81a8824f2   wdenk   Initial revision
1140

632de0672   Larry Johnson   Refactor code for...
1141
1142
1143
1144
1145
1146
1147
1148
1149
1150
1151
1152
1153
1154
1155
1156
1157
1158
1159
1160
1161
1162
1163
1164
1165
1166
1167
1168
1169
1170
1171
1172
1173
1174
1175
1176
1177
1178
1179
1180
1181
1182
1183
1184
1185
1186
1187
1188
1189
1190
1191
1192
1193
1194
1195
1196
1197
1198
1199
  	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)
  ",
  		"  Redundant row address
  ",
  		"  Differential clock input
  ",
  		"  Registerd DQMB inputs
  ",
  		"  Buffered DQMB inputs
  ",
  		"  On-card PLL
  ",
  		"  Registered address/control lines
  ",
  		"  Buffered address/control lines
  "
  	};
  
  	static const char *decode_byte22_DDR2[] = {
  		"  TBD (bit 7)
  ",
  		"  TBD (bit 6)
  ",
  		"  TBD (bit 5)
  ",
  		"  TBD (bit 4)
  ",
  		"  TBD (bit 3)
  ",
  		"  Supports partial array self refresh
  ",
  		"  Supports 50 ohm ODT
  ",
  		"  Supports weak driver
  "
  	};
  
  	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"
  	};
47e26b1bf   Wolfgang Denk   cmd_usage(): simp...
1200
  	if (argc < 2)
4c12eeb8b   Simon Glass   Convert cmd_usage...
1201
  		return CMD_RET_USAGE;
47e26b1bf   Wolfgang Denk   cmd_usage(): simp...
1202

81a8824f2   wdenk   Initial revision
1203
1204
  	/*
  	 * Chip is always specified.
632de0672   Larry Johnson   Refactor code for...
1205
1206
  	 */
  	chip = simple_strtoul (argv[1], NULL, 16);
81a8824f2   wdenk   Initial revision
1207

28df8ed07   Nobuhiro Iwamatsu   cmd: i2c: Fix use...
1208
1209
1210
1211
1212
1213
1214
1215
  #ifdef CONFIG_DM_I2C
  	ret = i2c_get_cur_bus_chip(chip, &dev);
  	if (!ret)
  		ret = dm_i2c_read(dev, 0, data, sizeof(data));
  #else
  	ret = i2c_read(chip, 0, 1, data, sizeof(data));
  #endif
  	if (ret) {
4b9206ed5   wdenk   * Patches by Thom...
1216
1217
  		puts ("No SDRAM Serial Presence Detect found.
  ");
81a8824f2   wdenk   Initial revision
1218
1219
1220
1221
1222
1223
1224
  		return 1;
  	}
  
  	cksum = 0;
  	for (j = 0; j < 63; j++) {
  		cksum += data[j];
  	}
e857a5bdb   Timur Tabi   mpc83xx: Miscella...
1225
  	if (cksum != data[63]) {
81a8824f2   wdenk   Initial revision
1226
1227
  		printf ("WARNING: Configuration data checksum failure:
  "
632de0672   Larry Johnson   Refactor code for...
1228
1229
  			"  is 0x%02x, calculated 0x%02x
  ", data[63], cksum);
81a8824f2   wdenk   Initial revision
1230
  	}
632de0672   Larry Johnson   Refactor code for...
1231
1232
  	printf ("SPD data revision            %d.%d
  ",
81a8824f2   wdenk   Initial revision
1233
  		(data[62] >> 4) & 0x0F, data[62] & 0x0F);
632de0672   Larry Johnson   Refactor code for...
1234
1235
1236
1237
  	printf ("Bytes used                   0x%02X
  ", data[0]);
  	printf ("Serial memory size           0x%02X
  ", 1 << data[1]);
4b9206ed5   wdenk   * Patches by Thom...
1238
  	puts ("Memory type                  ");
632de0672   Larry Johnson   Refactor code for...
1239
  	switch (data[2]) {
0df6b8446   Larry Johnson   Fix "i2c sdram" c...
1240
1241
1242
1243
1244
1245
1246
1247
1248
1249
  	case 2:
  		type = EDO;
  		puts ("EDO
  ");
  		break;
  	case 4:
  		type = SDRAM;
  		puts ("SDRAM
  ");
  		break;
18c4e7f71   Michal Simek   i2c: spd: Extend ...
1250
1251
1252
1253
1254
  	case 7:
  		type = DDR;
  		puts("DDR
  ");
  		break;
0df6b8446   Larry Johnson   Fix "i2c sdram" c...
1255
1256
1257
1258
1259
  	case 8:
  		type = DDR2;
  		puts ("DDR2
  ");
  		break;
18c4e7f71   Michal Simek   i2c: spd: Extend ...
1260
1261
1262
1263
1264
1265
1266
1267
1268
1269
  	case 11:
  		type = DDR3;
  		puts("DDR3
  ");
  		break;
  	case 12:
  		type = DDR4;
  		puts("DDR4
  ");
  		break;
0df6b8446   Larry Johnson   Fix "i2c sdram" c...
1270
1271
1272
1273
1274
  	default:
  		type = unknown;
  		puts ("unknown
  ");
  		break;
81a8824f2   wdenk   Initial revision
1275
  	}
632de0672   Larry Johnson   Refactor code for...
1276

4b9206ed5   wdenk   * Patches by Thom...
1277
  	puts ("Row address bits             ");
e857a5bdb   Timur Tabi   mpc83xx: Miscella...
1278
  	if ((data[3] & 0x00F0) == 0)
632de0672   Larry Johnson   Refactor code for...
1279
1280
  		printf ("%d
  ", data[3] & 0x0F);
e857a5bdb   Timur Tabi   mpc83xx: Miscella...
1281
  	else
632de0672   Larry Johnson   Refactor code for...
1282
1283
  		printf ("%d/%d
  ", data[3] & 0x0F, (data[3] >> 4) & 0x0F);
4b9206ed5   wdenk   * Patches by Thom...
1284
  	puts ("Column address bits          ");
e857a5bdb   Timur Tabi   mpc83xx: Miscella...
1285
  	if ((data[4] & 0x00F0) == 0)
632de0672   Larry Johnson   Refactor code for...
1286
1287
  		printf ("%d
  ", data[4] & 0x0F);
e857a5bdb   Timur Tabi   mpc83xx: Miscella...
1288
  	else
632de0672   Larry Johnson   Refactor code for...
1289
1290
  		printf ("%d/%d
  ", data[4] & 0x0F, (data[4] >> 4) & 0x0F);
0df6b8446   Larry Johnson   Fix "i2c sdram" c...
1291
1292
1293
  
  	switch (type) {
  	case DDR2:
632de0672   Larry Johnson   Refactor code for...
1294
1295
1296
  		printf ("Number of ranks              %d
  ",
  			(data[5] & 0x07) + 1);
0df6b8446   Larry Johnson   Fix "i2c sdram" c...
1297
1298
  		break;
  	default:
632de0672   Larry Johnson   Refactor code for...
1299
1300
  		printf ("Module rows                  %d
  ", data[5]);
0df6b8446   Larry Johnson   Fix "i2c sdram" c...
1301
1302
1303
1304
1305
  		break;
  	}
  
  	switch (type) {
  	case DDR2:
632de0672   Larry Johnson   Refactor code for...
1306
1307
  		printf ("Module data width            %d bits
  ", data[6]);
0df6b8446   Larry Johnson   Fix "i2c sdram" c...
1308
1309
  		break;
  	default:
632de0672   Larry Johnson   Refactor code for...
1310
1311
1312
  		printf ("Module data width            %d bits
  ",
  			(data[7] << 8) | data[6]);
0df6b8446   Larry Johnson   Fix "i2c sdram" c...
1313
1314
  		break;
  	}
4b9206ed5   wdenk   * Patches by Thom...
1315
  	puts ("Interface signal levels      ");
81a8824f2   wdenk   Initial revision
1316
  	switch(data[8]) {
0df6b8446   Larry Johnson   Fix "i2c sdram" c...
1317
1318
  		case 0:  puts ("TTL 5.0 V
  ");	break;
4b9206ed5   wdenk   * Patches by Thom...
1319
1320
  		case 1:  puts ("LVTTL
  ");	break;
0df6b8446   Larry Johnson   Fix "i2c sdram" c...
1321
1322
1323
1324
1325
1326
1327
1328
  		case 2:  puts ("HSTL 1.5 V
  ");	break;
  		case 3:  puts ("SSTL 3.3 V
  ");	break;
  		case 4:  puts ("SSTL 2.5 V
  ");	break;
  		case 5:  puts ("SSTL 1.8 V
  ");	break;
4b9206ed5   wdenk   * Patches by Thom...
1329
1330
  		default: puts ("unknown
  ");	break;
81a8824f2   wdenk   Initial revision
1331
  	}
0df6b8446   Larry Johnson   Fix "i2c sdram" c...
1332
1333
1334
  
  	switch (type) {
  	case DDR2:
632de0672   Larry Johnson   Refactor code for...
1335
1336
  		printf ("SDRAM cycle time             ");
  		print_ddr2_tcyc (data[9]);
0df6b8446   Larry Johnson   Fix "i2c sdram" c...
1337
1338
  		break;
  	default:
632de0672   Larry Johnson   Refactor code for...
1339
1340
1341
  		printf ("SDRAM cycle time             %d.%d ns
  ",
  			(data[9] >> 4) & 0x0F, data[9] & 0x0F);
0df6b8446   Larry Johnson   Fix "i2c sdram" c...
1342
1343
1344
1345
1346
  		break;
  	}
  
  	switch (type) {
  	case DDR2:
632de0672   Larry Johnson   Refactor code for...
1347
1348
1349
  		printf ("SDRAM access time            0.%d%d ns
  ",
  			(data[10] >> 4) & 0x0F, data[10] & 0x0F);
0df6b8446   Larry Johnson   Fix "i2c sdram" c...
1350
1351
  		break;
  	default:
632de0672   Larry Johnson   Refactor code for...
1352
1353
1354
  		printf ("SDRAM access time            %d.%d ns
  ",
  			(data[10] >> 4) & 0x0F, data[10] & 0x0F);
0df6b8446   Larry Johnson   Fix "i2c sdram" c...
1355
1356
  		break;
  	}
4b9206ed5   wdenk   * Patches by Thom...
1357
  	puts ("EDC configuration            ");
632de0672   Larry Johnson   Refactor code for...
1358
  	switch (data[11]) {
4b9206ed5   wdenk   * Patches by Thom...
1359
1360
1361
1362
1363
1364
1365
1366
  		case 0:  puts ("None
  ");	break;
  		case 1:  puts ("Parity
  ");	break;
  		case 2:  puts ("ECC
  ");	break;
  		default: puts ("unknown
  ");	break;
81a8824f2   wdenk   Initial revision
1367
  	}
632de0672   Larry Johnson   Refactor code for...
1368

e857a5bdb   Timur Tabi   mpc83xx: Miscella...
1369
  	if ((data[12] & 0x80) == 0)
4b9206ed5   wdenk   * Patches by Thom...
1370
  		puts ("No self refresh, rate        ");
e857a5bdb   Timur Tabi   mpc83xx: Miscella...
1371
  	else
4b9206ed5   wdenk   * Patches by Thom...
1372
  		puts ("Self refresh, rate           ");
632de0672   Larry Johnson   Refactor code for...
1373

81a8824f2   wdenk   Initial revision
1374
  	switch(data[12] & 0x7F) {
632de0672   Larry Johnson   Refactor code for...
1375
1376
1377
1378
1379
1380
1381
1382
1383
1384
1385
1386
  		case 0:  puts ("15.625 us
  ");	break;
  		case 1:  puts ("3.9 us
  ");	break;
  		case 2:  puts ("7.8 us
  ");	break;
  		case 3:  puts ("31.3 us
  ");	break;
  		case 4:  puts ("62.5 us
  ");	break;
  		case 5:  puts ("125 us
  ");	break;
4b9206ed5   wdenk   * Patches by Thom...
1387
1388
  		default: puts ("unknown
  ");	break;
81a8824f2   wdenk   Initial revision
1389
  	}
0df6b8446   Larry Johnson   Fix "i2c sdram" c...
1390
1391
1392
  
  	switch (type) {
  	case DDR2:
632de0672   Larry Johnson   Refactor code for...
1393
1394
  		printf ("SDRAM width (primary)        %d
  ", data[13]);
0df6b8446   Larry Johnson   Fix "i2c sdram" c...
1395
1396
  		break;
  	default:
632de0672   Larry Johnson   Refactor code for...
1397
1398
  		printf ("SDRAM width (primary)        %d
  ", data[13] & 0x7F);
0df6b8446   Larry Johnson   Fix "i2c sdram" c...
1399
  		if ((data[13] & 0x80) != 0) {
632de0672   Larry Johnson   Refactor code for...
1400
1401
1402
  			printf ("  (second bank)              %d
  ",
  				2 * (data[13] & 0x7F));
0df6b8446   Larry Johnson   Fix "i2c sdram" c...
1403
1404
1405
1406
1407
1408
1409
  		}
  		break;
  	}
  
  	switch (type) {
  	case DDR2:
  		if (data[14] != 0)
632de0672   Larry Johnson   Refactor code for...
1410
1411
  			printf ("EDC width                    %d
  ", data[14]);
0df6b8446   Larry Johnson   Fix "i2c sdram" c...
1412
1413
1414
  		break;
  	default:
  		if (data[14] != 0) {
632de0672   Larry Johnson   Refactor code for...
1415
1416
1417
  			printf ("EDC width                    %d
  ",
  				data[14] & 0x7F);
0df6b8446   Larry Johnson   Fix "i2c sdram" c...
1418
1419
  
  			if ((data[14] & 0x80) != 0) {
632de0672   Larry Johnson   Refactor code for...
1420
1421
1422
  				printf ("  (second bank)              %d
  ",
  					2 * (data[14] & 0x7F));
0df6b8446   Larry Johnson   Fix "i2c sdram" c...
1423
1424
1425
  			}
  		}
  		break;
81a8824f2   wdenk   Initial revision
1426
  	}
0df6b8446   Larry Johnson   Fix "i2c sdram" c...
1427

632de0672   Larry Johnson   Refactor code for...
1428
1429
1430
1431
  	if (DDR2 != type) {
  		printf ("Min clock delay, back-to-back random column addresses "
  			"%d
  ", data[15]);
0df6b8446   Larry Johnson   Fix "i2c sdram" c...
1432
  	}
4b9206ed5   wdenk   * Patches by Thom...
1433
1434
1435
1436
1437
1438
1439
1440
  	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 ('
  ');
632de0672   Larry Johnson   Refactor code for...
1441
1442
  	printf ("Number of banks              %d
  ", data[17]);
0df6b8446   Larry Johnson   Fix "i2c sdram" c...
1443
1444
1445
1446
  
  	switch (type) {
  	case DDR2:
  		puts ("CAS latency(s)              ");
632de0672   Larry Johnson   Refactor code for...
1447
  		decode_bits (data[18], decode_CAS_DDR2, 0);
0df6b8446   Larry Johnson   Fix "i2c sdram" c...
1448
1449
1450
1451
1452
  		putc ('
  ');
  		break;
  	default:
  		puts ("CAS latency(s)              ");
632de0672   Larry Johnson   Refactor code for...
1453
  		decode_bits (data[18], decode_CAS_default, 0);
0df6b8446   Larry Johnson   Fix "i2c sdram" c...
1454
1455
1456
1457
1458
1459
1460
  		putc ('
  ');
  		break;
  	}
  
  	if (DDR2 != type) {
  		puts ("CS latency(s)               ");
632de0672   Larry Johnson   Refactor code for...
1461
  		decode_bits (data[19], decode_CS_WE_default, 0);
0df6b8446   Larry Johnson   Fix "i2c sdram" c...
1462
1463
1464
1465
1466
1467
  		putc ('
  ');
  	}
  
  	if (DDR2 != type) {
  		puts ("WE latency(s)               ");
632de0672   Larry Johnson   Refactor code for...
1468
  		decode_bits (data[20], decode_CS_WE_default, 0);
0df6b8446   Larry Johnson   Fix "i2c sdram" c...
1469
1470
1471
1472
1473
1474
1475
1476
1477
1478
1479
1480
1481
1482
1483
1484
1485
1486
1487
1488
  		putc ('
  ');
  	}
  
  	switch (type) {
  	case DDR2:
  		puts ("Module attributes:
  ");
  		if (data[21] & 0x80)
  			puts ("  TBD (bit 7)
  ");
  		if (data[21] & 0x40)
  			puts ("  Analysis probe installed
  ");
  		if (data[21] & 0x20)
  			puts ("  TBD (bit 5)
  ");
  		if (data[21] & 0x10)
  			puts ("  FET switch external enable
  ");
632de0672   Larry Johnson   Refactor code for...
1489
1490
  		printf ("  %d PLLs on DIMM
  ", (data[21] >> 2) & 0x03);
0df6b8446   Larry Johnson   Fix "i2c sdram" c...
1491
  		if (data[20] & 0x11) {
632de0672   Larry Johnson   Refactor code for...
1492
1493
1494
  			printf ("  %d active registers on DIMM
  ",
  				(data[21] & 0x03) + 1);
0df6b8446   Larry Johnson   Fix "i2c sdram" c...
1495
1496
1497
1498
1499
1500
1501
1502
  		}
  		break;
  	default:
  		puts ("Module attributes:
  ");
  		if (!data[21])
  			puts ("  (none)
  ");
632de0672   Larry Johnson   Refactor code for...
1503
1504
  		else
  			decode_bits (data[21], decode_byte21_default, 0);
0df6b8446   Larry Johnson   Fix "i2c sdram" c...
1505
1506
1507
1508
1509
  		break;
  	}
  
  	switch (type) {
  	case DDR2:
632de0672   Larry Johnson   Refactor code for...
1510
  		decode_bits (data[22], decode_byte22_DDR2, 0);
0df6b8446   Larry Johnson   Fix "i2c sdram" c...
1511
1512
1513
1514
1515
1516
1517
1518
1519
1520
1521
1522
1523
1524
1525
1526
1527
1528
1529
1530
1531
1532
1533
1534
1535
1536
1537
1538
1539
  		break;
  	default:
  		puts ("Device attributes:
  ");
  		if (data[22] & 0x80) puts ("  TBD (bit 7)
  ");
  		if (data[22] & 0x40) puts ("  TBD (bit 6)
  ");
  		if (data[22] & 0x20) puts ("  Upper Vcc tolerance 5%
  ");
  		else                 puts ("  Upper Vcc tolerance 10%
  ");
  		if (data[22] & 0x10) puts ("  Lower Vcc tolerance 5%
  ");
  		else                 puts ("  Lower Vcc tolerance 10%
  ");
  		if (data[22] & 0x08) puts ("  Supports write1/read burst
  ");
  		if (data[22] & 0x04) puts ("  Supports precharge all
  ");
  		if (data[22] & 0x02) puts ("  Supports auto precharge
  ");
  		if (data[22] & 0x01) puts ("  Supports early RAS# precharge
  ");
  		break;
  	}
  
  	switch (type) {
  	case DDR2:
632de0672   Larry Johnson   Refactor code for...
1540
1541
  		printf ("SDRAM cycle time (2nd highest CAS latency)        ");
  		print_ddr2_tcyc (data[23]);
0df6b8446   Larry Johnson   Fix "i2c sdram" c...
1542
1543
  		break;
  	default:
632de0672   Larry Johnson   Refactor code for...
1544
1545
1546
  		printf ("SDRAM cycle time (2nd highest CAS latency)        %d."
  			"%d ns
  ", (data[23] >> 4) & 0x0F, data[23] & 0x0F);
0df6b8446   Larry Johnson   Fix "i2c sdram" c...
1547
1548
1549
1550
1551
  		break;
  	}
  
  	switch (type) {
  	case DDR2:
632de0672   Larry Johnson   Refactor code for...
1552
1553
1554
  		printf ("SDRAM access from clock (2nd highest CAS latency) 0."
  			"%d%d ns
  ", (data[24] >> 4) & 0x0F, data[24] & 0x0F);
0df6b8446   Larry Johnson   Fix "i2c sdram" c...
1555
1556
  		break;
  	default:
632de0672   Larry Johnson   Refactor code for...
1557
1558
1559
  		printf ("SDRAM access from clock (2nd highest CAS latency) %d."
  			"%d ns
  ", (data[24] >> 4) & 0x0F, data[24] & 0x0F);
0df6b8446   Larry Johnson   Fix "i2c sdram" c...
1560
1561
1562
1563
1564
  		break;
  	}
  
  	switch (type) {
  	case DDR2:
632de0672   Larry Johnson   Refactor code for...
1565
1566
  		printf ("SDRAM cycle time (3rd highest CAS latency)        ");
  		print_ddr2_tcyc (data[25]);
0df6b8446   Larry Johnson   Fix "i2c sdram" c...
1567
1568
  		break;
  	default:
632de0672   Larry Johnson   Refactor code for...
1569
1570
1571
  		printf ("SDRAM cycle time (3rd highest CAS latency)        %d."
  			"%d ns
  ", (data[25] >> 4) & 0x0F, data[25] & 0x0F);
0df6b8446   Larry Johnson   Fix "i2c sdram" c...
1572
1573
1574
1575
1576
  		break;
  	}
  
  	switch (type) {
  	case DDR2:
632de0672   Larry Johnson   Refactor code for...
1577
1578
1579
  		printf ("SDRAM access from clock (3rd highest CAS latency) 0."
  			"%d%d ns
  ", (data[26] >> 4) & 0x0F, data[26] & 0x0F);
0df6b8446   Larry Johnson   Fix "i2c sdram" c...
1580
1581
  		break;
  	default:
632de0672   Larry Johnson   Refactor code for...
1582
1583
1584
  		printf ("SDRAM access from clock (3rd highest CAS latency) %d."
  			"%d ns
  ", (data[26] >> 4) & 0x0F, data[26] & 0x0F);
0df6b8446   Larry Johnson   Fix "i2c sdram" c...
1585
1586
1587
1588
1589
  		break;
  	}
  
  	switch (type) {
  	case DDR2:
632de0672   Larry Johnson   Refactor code for...
1590
1591
1592
  		printf ("Minimum row precharge        %d.%02d ns
  ",
  			(data[27] >> 2) & 0x3F, 25 * (data[27] & 0x03));
0df6b8446   Larry Johnson   Fix "i2c sdram" c...
1593
1594
  		break;
  	default:
632de0672   Larry Johnson   Refactor code for...
1595
1596
  		printf ("Minimum row precharge        %d ns
  ", data[27]);
0df6b8446   Larry Johnson   Fix "i2c sdram" c...
1597
1598
1599
1600
1601
  		break;
  	}
  
  	switch (type) {
  	case DDR2:
632de0672   Larry Johnson   Refactor code for...
1602
1603
1604
  		printf ("Row active to row active min %d.%02d ns
  ",
  			(data[28] >> 2) & 0x3F, 25 * (data[28] & 0x03));
0df6b8446   Larry Johnson   Fix "i2c sdram" c...
1605
1606
  		break;
  	default:
632de0672   Larry Johnson   Refactor code for...
1607
1608
  		printf ("Row active to row active min %d ns
  ", data[28]);
0df6b8446   Larry Johnson   Fix "i2c sdram" c...
1609
1610
1611
1612
1613
  		break;
  	}
  
  	switch (type) {
  	case DDR2:
632de0672   Larry Johnson   Refactor code for...
1614
1615
1616
  		printf ("RAS to CAS delay min         %d.%02d ns
  ",
  			(data[29] >> 2) & 0x3F, 25 * (data[29] & 0x03));
0df6b8446   Larry Johnson   Fix "i2c sdram" c...
1617
1618
  		break;
  	default:
632de0672   Larry Johnson   Refactor code for...
1619
1620
  		printf ("RAS to CAS delay min         %d ns
  ", data[29]);
0df6b8446   Larry Johnson   Fix "i2c sdram" c...
1621
1622
  		break;
  	}
632de0672   Larry Johnson   Refactor code for...
1623
1624
  	printf ("Minimum RAS pulse width      %d ns
  ", data[30]);
0df6b8446   Larry Johnson   Fix "i2c sdram" c...
1625
1626
1627
  
  	switch (type) {
  	case DDR2:
632de0672   Larry Johnson   Refactor code for...
1628
1629
1630
1631
  		puts ("Density of each row          ");
  		decode_bits (data[31], decode_row_density_DDR2, 1);
  		putc ('
  ');
0df6b8446   Larry Johnson   Fix "i2c sdram" c...
1632
1633
  		break;
  	default:
632de0672   Larry Johnson   Refactor code for...
1634
1635
1636
1637
  		puts ("Density of each row          ");
  		decode_bits (data[31], decode_row_density_default, 1);
  		putc ('
  ');
0df6b8446   Larry Johnson   Fix "i2c sdram" c...
1638
1639
1640
1641
1642
  		break;
  	}
  
  	switch (type) {
  	case DDR2:
632de0672   Larry Johnson   Refactor code for...
1643
  		puts ("Command and Address setup    ");
0df6b8446   Larry Johnson   Fix "i2c sdram" c...
1644
  		if (data[32] >= 0xA0) {
632de0672   Larry Johnson   Refactor code for...
1645
1646
1647
  			printf ("1.%d%d ns
  ",
  				((data[32] >> 4) & 0x0F) - 10, data[32] & 0x0F);
0df6b8446   Larry Johnson   Fix "i2c sdram" c...
1648
  		} else {
632de0672   Larry Johnson   Refactor code for...
1649
1650
1651
  			printf ("0.%d%d ns
  ",
  				((data[32] >> 4) & 0x0F), data[32] & 0x0F);
0df6b8446   Larry Johnson   Fix "i2c sdram" c...
1652
1653
1654
  		}
  		break;
  	default:
632de0672   Larry Johnson   Refactor code for...
1655
1656
1657
1658
  		printf ("Command and Address setup    %c%d.%d ns
  ",
  			(data[32] & 0x80) ? '-' : '+',
  			(data[32] >> 4) & 0x07, data[32] & 0x0F);
0df6b8446   Larry Johnson   Fix "i2c sdram" c...
1659
1660
1661
1662
1663
  		break;
  	}
  
  	switch (type) {
  	case DDR2:
632de0672   Larry Johnson   Refactor code for...
1664
  		puts ("Command and Address hold     ");
0df6b8446   Larry Johnson   Fix "i2c sdram" c...
1665
  		if (data[33] >= 0xA0) {
632de0672   Larry Johnson   Refactor code for...
1666
1667
1668
  			printf ("1.%d%d ns
  ",
  				((data[33] >> 4) & 0x0F) - 10, data[33] & 0x0F);
0df6b8446   Larry Johnson   Fix "i2c sdram" c...
1669
  		} else {
632de0672   Larry Johnson   Refactor code for...
1670
1671
1672
  			printf ("0.%d%d ns
  ",
  				((data[33] >> 4) & 0x0F), data[33] & 0x0F);
0df6b8446   Larry Johnson   Fix "i2c sdram" c...
1673
1674
1675
  		}
  		break;
  	default:
632de0672   Larry Johnson   Refactor code for...
1676
1677
1678
1679
  		printf ("Command and Address hold     %c%d.%d ns
  ",
  			(data[33] & 0x80) ? '-' : '+',
  			(data[33] >> 4) & 0x07, data[33] & 0x0F);
0df6b8446   Larry Johnson   Fix "i2c sdram" c...
1680
1681
1682
1683
1684
  		break;
  	}
  
  	switch (type) {
  	case DDR2:
632de0672   Larry Johnson   Refactor code for...
1685
1686
1687
  		printf ("Data signal input setup      0.%d%d ns
  ",
  			(data[34] >> 4) & 0x0F, data[34] & 0x0F);
0df6b8446   Larry Johnson   Fix "i2c sdram" c...
1688
1689
  		break;
  	default:
632de0672   Larry Johnson   Refactor code for...
1690
1691
1692
1693
  		printf ("Data signal input setup      %c%d.%d ns
  ",
  			(data[34] & 0x80) ? '-' : '+',
  			(data[34] >> 4) & 0x07, data[34] & 0x0F);
0df6b8446   Larry Johnson   Fix "i2c sdram" c...
1694
1695
1696
1697
1698
  		break;
  	}
  
  	switch (type) {
  	case DDR2:
632de0672   Larry Johnson   Refactor code for...
1699
1700
1701
  		printf ("Data signal input hold       0.%d%d ns
  ",
  			(data[35] >> 4) & 0x0F, data[35] & 0x0F);
0df6b8446   Larry Johnson   Fix "i2c sdram" c...
1702
1703
  		break;
  	default:
632de0672   Larry Johnson   Refactor code for...
1704
1705
1706
1707
  		printf ("Data signal input hold       %c%d.%d ns
  ",
  			(data[35] & 0x80) ? '-' : '+',
  			(data[35] >> 4) & 0x07, data[35] & 0x0F);
0df6b8446   Larry Johnson   Fix "i2c sdram" c...
1708
1709
  		break;
  	}
4b9206ed5   wdenk   * Patches by Thom...
1710
  	puts ("Manufacturer's JEDEC ID      ");
e857a5bdb   Timur Tabi   mpc83xx: Miscella...
1711
  	for (j = 64; j <= 71; j++)
632de0672   Larry Johnson   Refactor code for...
1712
  		printf ("%02X ", data[j]);
4b9206ed5   wdenk   * Patches by Thom...
1713
1714
  	putc ('
  ');
632de0672   Larry Johnson   Refactor code for...
1715
1716
  	printf ("Manufacturing Location       %02X
  ", data[72]);
4b9206ed5   wdenk   * Patches by Thom...
1717
  	puts ("Manufacturer's Part Number   ");
e857a5bdb   Timur Tabi   mpc83xx: Miscella...
1718
  	for (j = 73; j <= 90; j++)
632de0672   Larry Johnson   Refactor code for...
1719
  		printf ("%02X ", data[j]);
4b9206ed5   wdenk   * Patches by Thom...
1720
1721
  	putc ('
  ');
632de0672   Larry Johnson   Refactor code for...
1722
1723
1724
1725
  	printf ("Revision Code                %02X %02X
  ", data[91], data[92]);
  	printf ("Manufacturing Date           %02X %02X
  ", data[93], data[94]);
4b9206ed5   wdenk   * Patches by Thom...
1726
  	puts ("Assembly Serial Number       ");
e857a5bdb   Timur Tabi   mpc83xx: Miscella...
1727
  	for (j = 95; j <= 98; j++)
632de0672   Larry Johnson   Refactor code for...
1728
  		printf ("%02X ", data[j]);
4b9206ed5   wdenk   * Patches by Thom...
1729
1730
  	putc ('
  ');
81a8824f2   wdenk   Initial revision
1731

0df6b8446   Larry Johnson   Fix "i2c sdram" c...
1732
  	if (DDR2 != type) {
632de0672   Larry Johnson   Refactor code for...
1733
1734
1735
  		printf ("Speed rating                 PC%d
  ",
  			data[126] == 0x66 ? 66 : data[126]);
0df6b8446   Larry Johnson   Fix "i2c sdram" c...
1736
  	}
81a8824f2   wdenk   Initial revision
1737
1738
  	return 0;
  }
902531788   Jon Loeliger   common/: Remove l...
1739
  #endif
81a8824f2   wdenk   Initial revision
1740

735987c5a   Tom Wai-Hong Tam   edid: Add I2C com...
1741
1742
1743
1744
1745
1746
1747
  /*
   * Syntax:
   *	i2c edid {i2c_chip}
   */
  #if defined(CONFIG_I2C_EDID)
  int do_edid(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
  {
5468461d1   Masahiro Yamada   cmd_i2c: change v...
1748
  	uint chip;
735987c5a   Tom Wai-Hong Tam   edid: Add I2C com...
1749
  	struct edid1_info edid;
63656b762   Simon Glass   dm: i2c: Implemen...
1750
1751
1752
1753
  	int ret;
  #ifdef CONFIG_DM_I2C
  	struct udevice *dev;
  #endif
735987c5a   Tom Wai-Hong Tam   edid: Add I2C com...
1754
1755
1756
1757
1758
1759
1760
  
  	if (argc < 2) {
  		cmd_usage(cmdtp);
  		return 1;
  	}
  
  	chip = simple_strtoul(argv[1], NULL, 16);
63656b762   Simon Glass   dm: i2c: Implemen...
1761
1762
1763
  #ifdef CONFIG_DM_I2C
  	ret = i2c_get_cur_bus_chip(chip, &dev);
  	if (!ret)
f9a4c2da7   Simon Glass   dm: i2c: Rename d...
1764
  		ret = dm_i2c_read(dev, 0, (uchar *)&edid, sizeof(edid));
63656b762   Simon Glass   dm: i2c: Implemen...
1765
1766
1767
1768
1769
  #else
  	ret = i2c_read(chip, 0, 1, (uchar *)&edid, sizeof(edid));
  #endif
  	if (ret)
  		return i2c_report_err(ret, I2C_ERR_READ);
735987c5a   Tom Wai-Hong Tam   edid: Add I2C com...
1770
1771
1772
1773
1774
1775
1776
1777
1778
1779
1780
1781
  
  	if (edid_check_info(&edid)) {
  		puts("Content isn't valid EDID.
  ");
  		return 1;
  	}
  
  	edid_print_info(&edid);
  	return 0;
  
  }
  #endif /* CONFIG_I2C_EDID */
59aa9df38   Simon Glass   dm: i2c: Implemen...
1782
1783
1784
1785
1786
1787
1788
1789
1790
1791
1792
1793
1794
1795
1796
1797
1798
1799
1800
1801
1802
1803
  #ifdef CONFIG_DM_I2C
  static void show_bus(struct udevice *bus)
  {
  	struct udevice *dev;
  
  	printf("Bus %d:\t%s", bus->req_seq, bus->name);
  	if (device_active(bus))
  		printf("  (active %d)", bus->seq);
  	printf("
  ");
  	for (device_find_first_child(bus, &dev);
  	     dev;
  	     device_find_next_child(&dev)) {
  		struct dm_i2c_chip *chip = dev_get_parent_platdata(dev);
  
  		printf("   %02x: %s, offset len %x, flags %x
  ",
  		       chip->chip_addr, dev->name, chip->offset_len,
  		       chip->flags);
  	}
  }
  #endif
06afa388b   Marek Vasut   i2c: kerneldoc: A...
1804
  /**
3f4978c71   Heiko Schocher   i2c: common chang...
1805
   * do_i2c_show_bus() - Handle the "i2c bus" command-line command
06afa388b   Marek Vasut   i2c: kerneldoc: A...
1806
1807
1808
1809
1810
1811
1812
   * @cmdtp:	Command data struct pointer
   * @flag:	Command flag
   * @argc:	Command-line argument count
   * @argv:	Array of command-line arguments
   *
   * Returns zero always.
   */
59aa9df38   Simon Glass   dm: i2c: Implemen...
1813
  #if defined(CONFIG_SYS_I2C) || defined(CONFIG_DM_I2C)
0e350f81e   Jeroen Hofstee   common: commands:...
1814
1815
  static int do_i2c_show_bus(cmd_tbl_t *cmdtp, int flag, int argc,
  				char * const argv[])
67b23a322   Heiko Schocher   I2C: adding new "...
1816
  {
67b23a322   Heiko Schocher   I2C: adding new "...
1817
1818
  	if (argc == 1) {
  		/* show all busses */
59aa9df38   Simon Glass   dm: i2c: Implemen...
1819
1820
1821
1822
1823
1824
1825
1826
1827
1828
1829
1830
  #ifdef CONFIG_DM_I2C
  		struct udevice *bus;
  		struct uclass *uc;
  		int ret;
  
  		ret = uclass_get(UCLASS_I2C, &uc);
  		if (ret)
  			return CMD_RET_FAILURE;
  		uclass_foreach_dev(bus, uc)
  			show_bus(bus);
  #else
  		int i;
3f4978c71   Heiko Schocher   i2c: common chang...
1831
1832
1833
  		for (i = 0; i < CONFIG_SYS_NUM_I2C_BUSES; i++) {
  			printf("Bus %d:\t%s", i, I2C_ADAP_NR(i)->name);
  #ifndef CONFIG_SYS_I2C_DIRECT_BUS
59aa9df38   Simon Glass   dm: i2c: Implemen...
1834
  			int j;
3f4978c71   Heiko Schocher   i2c: common chang...
1835
1836
1837
1838
1839
1840
1841
  			for (j = 0; j < CONFIG_SYS_I2C_MAX_HOPS; j++) {
  				if (i2c_bus[i].next_hop[j].chip == 0)
  					break;
  				printf("->%s@0x%2x:%d",
  				       i2c_bus[i].next_hop[j].mux.name,
  				       i2c_bus[i].next_hop[j].chip,
  				       i2c_bus[i].next_hop[j].channel);
67b23a322   Heiko Schocher   I2C: adding new "...
1842
  			}
3f4978c71   Heiko Schocher   i2c: common chang...
1843
1844
1845
  #endif
  			printf("
  ");
67b23a322   Heiko Schocher   I2C: adding new "...
1846
  		}
59aa9df38   Simon Glass   dm: i2c: Implemen...
1847
  #endif
67b23a322   Heiko Schocher   I2C: adding new "...
1848
  	} else {
59aa9df38   Simon Glass   dm: i2c: Implemen...
1849
  		int i;
3f4978c71   Heiko Schocher   i2c: common chang...
1850
1851
  		/* show specific bus */
  		i = simple_strtoul(argv[1], NULL, 10);
59aa9df38   Simon Glass   dm: i2c: Implemen...
1852
1853
1854
1855
1856
1857
1858
1859
1860
1861
1862
1863
  #ifdef CONFIG_DM_I2C
  		struct udevice *bus;
  		int ret;
  
  		ret = uclass_get_device_by_seq(UCLASS_I2C, i, &bus);
  		if (ret) {
  			printf("Invalid bus %d: err=%d
  ", i, ret);
  			return CMD_RET_FAILURE;
  		}
  		show_bus(bus);
  #else
3f4978c71   Heiko Schocher   i2c: common chang...
1864
1865
1866
1867
1868
1869
1870
  		if (i >= CONFIG_SYS_NUM_I2C_BUSES) {
  			printf("Invalid bus %d
  ", i);
  			return -1;
  		}
  		printf("Bus %d:\t%s", i, I2C_ADAP_NR(i)->name);
  #ifndef CONFIG_SYS_I2C_DIRECT_BUS
59aa9df38   Simon Glass   dm: i2c: Implemen...
1871
  			int j;
3f4978c71   Heiko Schocher   i2c: common chang...
1872
1873
1874
1875
1876
1877
1878
1879
1880
1881
1882
  			for (j = 0; j < CONFIG_SYS_I2C_MAX_HOPS; j++) {
  				if (i2c_bus[i].next_hop[j].chip == 0)
  					break;
  				printf("->%s@0x%2x:%d",
  				       i2c_bus[i].next_hop[j].mux.name,
  				       i2c_bus[i].next_hop[j].chip,
  				       i2c_bus[i].next_hop[j].channel);
  			}
  #endif
  		printf("
  ");
59aa9df38   Simon Glass   dm: i2c: Implemen...
1883
  #endif
67b23a322   Heiko Schocher   I2C: adding new "...
1884
  	}
3f4978c71   Heiko Schocher   i2c: common chang...
1885
1886
  
  	return 0;
67b23a322   Heiko Schocher   I2C: adding new "...
1887
  }
3f4978c71   Heiko Schocher   i2c: common chang...
1888
  #endif
67b23a322   Heiko Schocher   I2C: adding new "...
1889

06afa388b   Marek Vasut   i2c: kerneldoc: A...
1890
1891
1892
1893
1894
1895
1896
1897
1898
1899
  /**
   * 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.
   */
63656b762   Simon Glass   dm: i2c: Implemen...
1900
1901
  #if defined(CONFIG_SYS_I2C) || defined(CONFIG_I2C_MULTI_BUS) || \
  		defined(CONFIG_DM_I2C)
0e350f81e   Jeroen Hofstee   common: commands:...
1902
1903
  static int do_i2c_bus_num(cmd_tbl_t *cmdtp, int flag, int argc,
  				char * const argv[])
bb99ad6d8   Ben Warren   Add support for m...
1904
  {
3f4978c71   Heiko Schocher   i2c: common chang...
1905
  	int		ret = 0;
63656b762   Simon Glass   dm: i2c: Implemen...
1906
  	int	bus_no;
bb99ad6d8   Ben Warren   Add support for m...
1907

63656b762   Simon Glass   dm: i2c: Implemen...
1908
  	if (argc == 1) {
e857a5bdb   Timur Tabi   mpc83xx: Miscella...
1909
  		/* querying current setting */
63656b762   Simon Glass   dm: i2c: Implemen...
1910
1911
1912
1913
1914
1915
1916
1917
1918
1919
1920
1921
1922
  #ifdef CONFIG_DM_I2C
  		struct udevice *bus;
  
  		if (!i2c_get_cur_bus(&bus))
  			bus_no = bus->seq;
  		else
  			bus_no = -1;
  #else
  		bus_no = i2c_get_bus_num();
  #endif
  		printf("Current bus is %d
  ", bus_no);
  	} else {
3f4978c71   Heiko Schocher   i2c: common chang...
1923
  		bus_no = simple_strtoul(argv[1], NULL, 10);
880a41273   Heiko Schocher   i2c: fix i2c dev ...
1924
  #if defined(CONFIG_SYS_I2C)
3f4978c71   Heiko Schocher   i2c: common chang...
1925
1926
1927
1928
1929
  		if (bus_no >= CONFIG_SYS_NUM_I2C_BUSES) {
  			printf("Invalid bus %d
  ", bus_no);
  			return -1;
  		}
880a41273   Heiko Schocher   i2c: fix i2c dev ...
1930
  #endif
3f4978c71   Heiko Schocher   i2c: common chang...
1931
1932
  		printf("Setting bus to %d
  ", bus_no);
f9a4c2da7   Simon Glass   dm: i2c: Rename d...
1933
1934
1935
  #ifdef CONFIG_DM_I2C
  		ret = cmd_i2c_set_bus_num(bus_no);
  #else
3f4978c71   Heiko Schocher   i2c: common chang...
1936
  		ret = i2c_set_bus_num(bus_no);
f9a4c2da7   Simon Glass   dm: i2c: Rename d...
1937
  #endif
e857a5bdb   Timur Tabi   mpc83xx: Miscella...
1938
  		if (ret)
bb99ad6d8   Ben Warren   Add support for m...
1939
1940
  			printf("Failure changing bus number (%d)
  ", ret);
bb99ad6d8   Ben Warren   Add support for m...
1941
  	}
4fbd258e6   Simon Glass   i2c: Correct comm...
1942
1943
  
  	return ret ? CMD_RET_FAILURE : 0;
bb99ad6d8   Ben Warren   Add support for m...
1944
  }
3f4978c71   Heiko Schocher   i2c: common chang...
1945
  #endif  /* defined(CONFIG_SYS_I2C) */
bb99ad6d8   Ben Warren   Add support for m...
1946

06afa388b   Marek Vasut   i2c: kerneldoc: A...
1947
1948
1949
1950
1951
1952
1953
1954
1955
1956
  /**
   * 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.
   */
54841ab50   Wolfgang Denk   Make sure that ar...
1957
  static int do_i2c_bus_speed(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
bb99ad6d8   Ben Warren   Add support for m...
1958
1959
  {
  	int speed, ret=0;
63656b762   Simon Glass   dm: i2c: Implemen...
1960
1961
1962
1963
1964
1965
1966
1967
  #ifdef CONFIG_DM_I2C
  	struct udevice *bus;
  
  	if (i2c_get_cur_bus(&bus))
  		return 1;
  #endif
  	if (argc == 1) {
  #ifdef CONFIG_DM_I2C
ca88b9b93   Simon Glass   dm: i2c: Add a dm...
1968
  		speed = dm_i2c_get_bus_speed(bus);
63656b762   Simon Glass   dm: i2c: Implemen...
1969
1970
1971
  #else
  		speed = i2c_get_bus_speed();
  #endif
e857a5bdb   Timur Tabi   mpc83xx: Miscella...
1972
  		/* querying current speed */
63656b762   Simon Glass   dm: i2c: Implemen...
1973
1974
1975
  		printf("Current bus speed=%d
  ", speed);
  	} else {
bb99ad6d8   Ben Warren   Add support for m...
1976
1977
1978
  		speed = simple_strtoul(argv[1], NULL, 10);
  		printf("Setting bus speed to %d Hz
  ", speed);
63656b762   Simon Glass   dm: i2c: Implemen...
1979
  #ifdef CONFIG_DM_I2C
ca88b9b93   Simon Glass   dm: i2c: Add a dm...
1980
  		ret = dm_i2c_set_bus_speed(bus, speed);
63656b762   Simon Glass   dm: i2c: Implemen...
1981
  #else
bb99ad6d8   Ben Warren   Add support for m...
1982
  		ret = i2c_set_bus_speed(speed);
63656b762   Simon Glass   dm: i2c: Implemen...
1983
  #endif
e857a5bdb   Timur Tabi   mpc83xx: Miscella...
1984
  		if (ret)
bb99ad6d8   Ben Warren   Add support for m...
1985
1986
  			printf("Failure changing bus speed (%d)
  ", ret);
bb99ad6d8   Ben Warren   Add support for m...
1987
  	}
4fbd258e6   Simon Glass   i2c: Correct comm...
1988
1989
  
  	return ret ? CMD_RET_FAILURE : 0;
bb99ad6d8   Ben Warren   Add support for m...
1990
  }
06afa388b   Marek Vasut   i2c: kerneldoc: A...
1991
1992
1993
1994
1995
1996
1997
1998
1999
2000
  /**
   * 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.
   */
54841ab50   Wolfgang Denk   Make sure that ar...
2001
  static int do_i2c_mm(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
bb99ad6d8   Ben Warren   Add support for m...
2002
  {
bfc3b77eb   Frans Meulenbroeks   cmd_i2c.c: rework...
2003
2004
  	return mod_i2c_mem (cmdtp, 1, flag, argc, argv);
  }
06afa388b   Marek Vasut   i2c: kerneldoc: A...
2005
2006
2007
2008
2009
2010
2011
2012
2013
2014
  /**
   * 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.
   */
54841ab50   Wolfgang Denk   Make sure that ar...
2015
  static int do_i2c_nm(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
bfc3b77eb   Frans Meulenbroeks   cmd_i2c.c: rework...
2016
2017
2018
  {
  	return mod_i2c_mem (cmdtp, 0, flag, argc, argv);
  }
e96ad5d3a   Peter Tyser   cmd_i2c: Clean up...
2019

06afa388b   Marek Vasut   i2c: kerneldoc: A...
2020
2021
2022
2023
2024
2025
2026
2027
2028
  /**
   * 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.
   */
54841ab50   Wolfgang Denk   Make sure that ar...
2029
  static int do_i2c_reset(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
bfc3b77eb   Frans Meulenbroeks   cmd_i2c.c: rework...
2030
  {
63656b762   Simon Glass   dm: i2c: Implemen...
2031
2032
2033
2034
2035
2036
2037
2038
2039
2040
2041
  #if defined(CONFIG_DM_I2C)
  	struct udevice *bus;
  
  	if (i2c_get_cur_bus(&bus))
  		return CMD_RET_FAILURE;
  	if (i2c_deblock(bus)) {
  		printf("Error: Not supported by the driver
  ");
  		return CMD_RET_FAILURE;
  	}
  #elif defined(CONFIG_SYS_I2C)
3f4978c71   Heiko Schocher   i2c: common chang...
2042
2043
  	i2c_init(I2C_ADAP->speed, I2C_ADAP->slaveaddr);
  #else
bfc3b77eb   Frans Meulenbroeks   cmd_i2c.c: rework...
2044
  	i2c_init(CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE);
3f4978c71   Heiko Schocher   i2c: common chang...
2045
  #endif
bfc3b77eb   Frans Meulenbroeks   cmd_i2c.c: rework...
2046
2047
2048
2049
  	return 0;
  }
  
  static cmd_tbl_t cmd_i2c_sub[] = {
59aa9df38   Simon Glass   dm: i2c: Implemen...
2050
  #if defined(CONFIG_SYS_I2C) || defined(CONFIG_DM_I2C)
3f4978c71   Heiko Schocher   i2c: common chang...
2051
  	U_BOOT_CMD_MKENT(bus, 1, 1, do_i2c_show_bus, "", ""),
9a2accb44   Heiko Schocher   i2c, multibus: ge...
2052
  #endif
bfc3b77eb   Frans Meulenbroeks   cmd_i2c.c: rework...
2053
  	U_BOOT_CMD_MKENT(crc32, 3, 1, do_i2c_crc, "", ""),
3f4978c71   Heiko Schocher   i2c: common chang...
2054
  #if defined(CONFIG_SYS_I2C) || \
63656b762   Simon Glass   dm: i2c: Implemen...
2055
  	defined(CONFIG_I2C_MULTI_BUS) || defined(CONFIG_DM_I2C)
bfc3b77eb   Frans Meulenbroeks   cmd_i2c.c: rework...
2056
  	U_BOOT_CMD_MKENT(dev, 1, 1, do_i2c_bus_num, "", ""),
bb99ad6d8   Ben Warren   Add support for m...
2057
  #endif  /* CONFIG_I2C_MULTI_BUS */
735987c5a   Tom Wai-Hong Tam   edid: Add I2C com...
2058
2059
2060
  #if defined(CONFIG_I2C_EDID)
  	U_BOOT_CMD_MKENT(edid, 1, 1, do_edid, "", ""),
  #endif  /* CONFIG_I2C_EDID */
bfc3b77eb   Frans Meulenbroeks   cmd_i2c.c: rework...
2061
2062
2063
2064
2065
2066
  	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, "", ""),
652e53546   Frans Meulenbroeks   cmd_i2c.c: added ...
2067
  	U_BOOT_CMD_MKENT(read, 5, 1, do_i2c_read, "", ""),
ed16f1468   Lubomir Popov   cmd_i2c: Provide ...
2068
  	U_BOOT_CMD_MKENT(write, 6, 0, do_i2c_write, "", ""),
63656b762   Simon Glass   dm: i2c: Implemen...
2069
2070
  #ifdef CONFIG_DM_I2C
  	U_BOOT_CMD_MKENT(flags, 2, 1, do_i2c_flags, "", ""),
c10c8e313   Simon Glass   dm: i2c: Add a co...
2071
  	U_BOOT_CMD_MKENT(olen, 2, 1, do_i2c_olen, "", ""),
63656b762   Simon Glass   dm: i2c: Implemen...
2072
  #endif
bfc3b77eb   Frans Meulenbroeks   cmd_i2c.c: rework...
2073
  	U_BOOT_CMD_MKENT(reset, 0, 1, do_i2c_reset, "", ""),
c76fe4742   Jon Loeliger   common/cmd_[i-n]*...
2074
  #if defined(CONFIG_CMD_SDRAM)
bfc3b77eb   Frans Meulenbroeks   cmd_i2c.c: rework...
2075
  	U_BOOT_CMD_MKENT(sdram, 1, 1, do_sdram, "", ""),
902531788   Jon Loeliger   common/: Remove l...
2076
  #endif
bfc3b77eb   Frans Meulenbroeks   cmd_i2c.c: rework...
2077
2078
  	U_BOOT_CMD_MKENT(speed, 1, 1, do_i2c_bus_speed, "", ""),
  };
e4099c8b8   Michal Simek   i2c: cmd: Relocat...
2079
2080
2081
2082
2083
2084
2085
2086
  static __maybe_unused void i2c_reloc(void)
  {
  	static int relocated;
  
  	if (!relocated) {
  		fixup_cmdtable(cmd_i2c_sub, ARRAY_SIZE(cmd_i2c_sub));
  		relocated = 1;
  	};
f1d2b313c   Heiko Schocher   ARM: add relocati...
2087
  }
f1d2b313c   Heiko Schocher   ARM: add relocati...
2088

06afa388b   Marek Vasut   i2c: kerneldoc: A...
2089
2090
2091
2092
2093
2094
2095
2096
2097
2098
  /**
   * 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.
   */
54841ab50   Wolfgang Denk   Make sure that ar...
2099
  static int do_i2c(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
bfc3b77eb   Frans Meulenbroeks   cmd_i2c.c: rework...
2100
2101
  {
  	cmd_tbl_t *c;
e4099c8b8   Michal Simek   i2c: cmd: Relocat...
2102
2103
2104
  #ifdef CONFIG_NEEDS_MANUAL_RELOC
  	i2c_reloc();
  #endif
4444b221f   Heiko Schocher   i2c: fix command ...
2105
  	if (argc < 2)
4c12eeb8b   Simon Glass   Convert cmd_usage...
2106
  		return CMD_RET_USAGE;
4444b221f   Heiko Schocher   i2c: fix command ...
2107

bfc3b77eb   Frans Meulenbroeks   cmd_i2c.c: rework...
2108
2109
2110
2111
2112
  	/* Strip off leading 'i2c' command argument */
  	argc--;
  	argv++;
  
  	c = find_cmd_tbl(argv[0], &cmd_i2c_sub[0], ARRAY_SIZE(cmd_i2c_sub));
47e26b1bf   Wolfgang Denk   cmd_usage(): simp...
2113
  	if (c)
4c12eeb8b   Simon Glass   Convert cmd_usage...
2114
  		return c->cmd(cmdtp, flag, argc, argv);
47e26b1bf   Wolfgang Denk   cmd_usage(): simp...
2115
  	else
4c12eeb8b   Simon Glass   Convert cmd_usage...
2116
  		return CMD_RET_USAGE;
bb99ad6d8   Ben Warren   Add support for m...
2117
  }
8bde7f776   wdenk   * Code cleanup:
2118
2119
  
  /***************************************************/
088f1b199   Kim Phillips   common/cmd_*.c: s...
2120
2121
  #ifdef CONFIG_SYS_LONGHELP
  static char i2c_help_text[] =
59aa9df38   Simon Glass   dm: i2c: Implemen...
2122
  #if defined(CONFIG_SYS_I2C) || defined(CONFIG_DM_I2C)
3f4978c71   Heiko Schocher   i2c: common chang...
2123
2124
  	"bus [muxtype:muxaddr:muxchannel] - show I2C bus info
  "
19f8c4dfb   Christoph Muellner   cmd: i2c: Fix hel...
2125
  	"i2c " /* That's the prefix for the crc32 command below. */
9a2accb44   Heiko Schocher   i2c, multibus: ge...
2126
  #endif
fb0070e91   Frans Meulenbroeks   cmd_i2c.c: sorted...
2127
2128
  	"crc32 chip address[.0, .1, .2] count - compute CRC32 checksum
  "
3f4978c71   Heiko Schocher   i2c: common chang...
2129
  #if defined(CONFIG_SYS_I2C) || \
63656b762   Simon Glass   dm: i2c: Implemen...
2130
  	defined(CONFIG_I2C_MULTI_BUS) || defined(CONFIG_DM_I2C)
9bc2e4eee   Peter Tyser   cmd_i2c: Fix help...
2131
2132
  	"i2c dev [dev] - show or set current I2C bus
  "
d9fc70324   Matthias Fuchs   [PATCH] I2C: disa...
2133
  #endif  /* CONFIG_I2C_MULTI_BUS */
735987c5a   Tom Wai-Hong Tam   edid: Add I2C com...
2134
2135
2136
2137
  #if defined(CONFIG_I2C_EDID)
  	"i2c edid chip - print EDID configuration information
  "
  #endif  /* CONFIG_I2C_EDID */
fb0070e91   Frans Meulenbroeks   cmd_i2c.c: sorted...
2138
2139
  	"i2c loop chip address[.0, .1, .2] [# of objects] - looping read of device
  "
d9fc70324   Matthias Fuchs   [PATCH] I2C: disa...
2140
2141
2142
2143
2144
2145
2146
2147
  	"i2c md chip address[.0, .1, .2] [# of objects] - read from I2C device
  "
  	"i2c mm chip address[.0, .1, .2] - write to I2C device (auto-incrementing)
  "
  	"i2c mw chip address[.0, .1, .2] value [count] - write to I2C device (fill)
  "
  	"i2c nm chip address[.0, .1, .2] - write to I2C device (constant address)
  "
54b99e51a   Eric Nelson   i2c_probe: update...
2148
2149
  	"i2c probe [address] - test for and show device(s) on the I2C bus
  "
63656b762   Simon Glass   dm: i2c: Implemen...
2150
2151
  	"i2c read chip address[.0, .1, .2] length memaddress - read to memory
  "
ed16f1468   Lubomir Popov   cmd_i2c: Provide ...
2152
2153
2154
2155
  	"i2c write memaddress chip address[.0, .1, .2] length [-s] - write memory
  "
  	"          to I2C; the -s option selects bulk write in a single transaction
  "
63656b762   Simon Glass   dm: i2c: Implemen...
2156
2157
2158
  #ifdef CONFIG_DM_I2C
  	"i2c flags chip [flags] - set or get chip flags
  "
c10c8e313   Simon Glass   dm: i2c: Add a co...
2159
2160
  	"i2c olen chip [offset_length] - set or get chip offset length
  "
63656b762   Simon Glass   dm: i2c: Implemen...
2161
  #endif
e43a27c49   Heiko Schocher   I2C: add new comm...
2162
2163
  	"i2c reset - re-init the I2C Controller
  "
c76fe4742   Jon Loeliger   common/cmd_[i-n]*...
2164
  #if defined(CONFIG_CMD_SDRAM)
fb0070e91   Frans Meulenbroeks   cmd_i2c.c: sorted...
2165
2166
  	"i2c sdram chip - print SDRAM configuration information
  "
902531788   Jon Loeliger   common/: Remove l...
2167
  #endif
088f1b199   Kim Phillips   common/cmd_*.c: s...
2168
2169
2170
2171
  	"i2c speed [speed] - show or set I2C bus speed";
  #endif
  
  U_BOOT_CMD(
ed16f1468   Lubomir Popov   cmd_i2c: Provide ...
2172
  	i2c, 7, 1, do_i2c,
088f1b199   Kim Phillips   common/cmd_*.c: s...
2173
2174
  	"I2C sub-system",
  	i2c_help_text
d9fc70324   Matthias Fuchs   [PATCH] I2C: disa...
2175
  );