[v4,01/30] ti: common: board_detect: Allow settings board detection variables manually

Message ID 20170616222533.25008-2-fcooper@ti.com
State New
Headers show
Series
  • [v4,01/30] ti: common: board_detect: Allow settings board detection variables manually
Related show

Commit Message

Franklin S Cooper Jr June 16, 2017, 10:25 p.m.
From: Nishanth Menon <nm@ti.com>

In some situations the EEPROM used for board detection may not be
programmed or simply programmed incorrectly. Therefore, it may be
necessary to "simulate" reading the contents of the EEPROM to set
appropriate variables used in the board detection code.

This may also be helpful in certain boot modes where doing i2c reads
may be costly and the config supports running only a specific board.

Signed-off-by: Nishanth Menon <nm@ti.com>
Signed-off-by: Tero Kristo <t-kristo@ti.com>
Signed-off-by: Keerthy <j-keerthy@ti.com>
Signed-off-by: Franklin S Cooper Jr. <fcooper@ti.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
---
 board/ti/common/board_detect.c | 24 ++++++++++++++++++++++++
 board/ti/common/board_detect.h | 17 +++++++++++++++++
 2 files changed, 41 insertions(+)

Comments

Tom Rini July 11, 2017, 12:38 p.m. | #1
On Fri, Jun 16, 2017 at 05:25:04PM -0500, Cooper Jr., Franklin wrote:

> From: Nishanth Menon <nm@ti.com>

> 

> In some situations the EEPROM used for board detection may not be

> programmed or simply programmed incorrectly. Therefore, it may be

> necessary to "simulate" reading the contents of the EEPROM to set

> appropriate variables used in the board detection code.

> 

> This may also be helpful in certain boot modes where doing i2c reads

> may be costly and the config supports running only a specific board.

> 

> Signed-off-by: Nishanth Menon <nm@ti.com>

> Signed-off-by: Tero Kristo <t-kristo@ti.com>

> Signed-off-by: Keerthy <j-keerthy@ti.com>

> Signed-off-by: Franklin S Cooper Jr. <fcooper@ti.com>

> Reviewed-by: Tom Rini <trini@konsulko.com>


Applied to u-boot/master, thanks!

-- 
Tom

Patch

diff --git a/board/ti/common/board_detect.c b/board/ti/common/board_detect.c
index 6fdcb61..bf594cb 100644
--- a/board/ti/common/board_detect.c
+++ b/board/ti/common/board_detect.c
@@ -173,6 +173,30 @@  static int __maybe_unused ti_i2c_eeprom_get(int bus_addr, int dev_addr,
 	return 0;
 }
 
+int __maybe_unused ti_i2c_eeprom_am_set(const char *name, const char *rev)
+{
+	struct ti_common_eeprom *ep;
+
+	if (!name || !rev)
+		return -1;
+
+	ep = TI_EEPROM_DATA;
+	if (ep->header == TI_EEPROM_HEADER_MAGIC)
+		goto already_set;
+
+	/* Set to 0 all fields */
+	memset(ep, 0, sizeof(*ep));
+	strncpy(ep->name, name, TI_EEPROM_HDR_NAME_LEN);
+	strncpy(ep->version, rev, TI_EEPROM_HDR_REV_LEN);
+	/* Some dummy serial number to identify the platform */
+	strncpy(ep->serial, "0000", TI_EEPROM_HDR_SERIAL_LEN);
+	/* Mark it with a valid header */
+	ep->header = TI_EEPROM_HEADER_MAGIC;
+
+already_set:
+	return 0;
+}
+
 int __maybe_unused ti_i2c_eeprom_am_get(int bus_addr, int dev_addr)
 {
 	int rc;
diff --git a/board/ti/common/board_detect.h b/board/ti/common/board_detect.h
index 88b0a59..e8d9484 100644
--- a/board/ti/common/board_detect.h
+++ b/board/ti/common/board_detect.h
@@ -205,4 +205,21 @@  void set_board_info_env(char *name);
  */
 void board_ti_set_ethaddr(int index);
 
+/**
+ * ti_i2c_eeprom_am_set() - Setup the eeprom data with predefined values
+ * @name:	Name of the board
+ * @rev:	Revision of the board
+ *
+ * In some cases such as in RTC-only mode, we are able to skip reading eeprom
+ * and wasting i2c based initialization time by using predefined flags for
+ * detecting what platform we are booting on. For those platforms, provide
+ * a handy function to pre-program information.
+ *
+ * NOTE: many eeprom information such as serial number, mac address etc is not
+ * available.
+ *
+ * Return: 0 if all went fine, else return error.
+ */
+int ti_i2c_eeprom_am_set(const char *name, const char *rev);
+
 #endif	/* __BOARD_DETECT_H */