cm-t35: move the eeprom code to common place

Compulab boards use the same eeprom code, so move the eeprom related
code to live under board/compulab/common directory.
Also make several adjustments to eeprom functions namespace, so it will
be generic for compulab boards.

Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
Tested-by: Nikita Kiryanov <nikita@compulab.co.il>

4 files changed, 3 insertions, 150 deletions

diff --git a/board/compulab/cm_t35/Makefile b/board/compulab/cm_t35/Makefile
index 6d07947d51..8b922b3d7e 100644
--- a/board/compulab/cm_t35/Makefile
+++ b/board/compulab/cm_t35/Makefile
@@ -11,7 +11,6 @@ include $(TOPDIR)/config.mk
 
 LIB	= $(obj)lib$(BOARD).o
 
-COBJS-$(CONFIG_DRIVER_OMAP34XX_I2C) += eeprom.o
 COBJS-$(CONFIG_LCD) += display.o
 
 COBJS	:= cm_t35.o leds.o $(COBJS-y)
diff --git a/board/compulab/cm_t35/cm_t35.c b/board/compulab/cm_t35/cm_t35.c
index 3caa5be845..a6d4aba250 100644
--- a/board/compulab/cm_t35/cm_t35.c
+++ b/board/compulab/cm_t35/cm_t35.c
@@ -33,7 +33,7 @@
 #include <asm/ehci-omap.h>
 #include <asm/gpio.h>
 
-#include "eeprom.h"
+#include "../common/eeprom.h"
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -160,7 +160,7 @@ static u32 cm_t3x_rev;
 u32 get_board_rev(void)
 {
 	if (!cm_t3x_rev)
-		cm_t3x_rev = cm_t3x_eeprom_get_board_rev();
+		cm_t3x_rev = cl_eeprom_get_board_rev();
 
 	return cm_t3x_rev;
 };
@@ -509,7 +509,7 @@ static int handle_mac_address(void)
 	if (rc)
 		return 0;
 
-	rc = cm_t3x_eeprom_read_mac_addr(enetaddr);
+	rc = cl_eeprom_read_mac_addr(enetaddr);
 	if (rc)
 		return rc;
 
@@ -598,5 +598,4 @@ int ehci_hcd_stop(void)
 {
 	return omap_ehci_hcd_stop();
 }
-
 #endif /* CONFIG_USB_EHCI_OMAP */
diff --git a/board/compulab/cm_t35/eeprom.c b/board/compulab/cm_t35/eeprom.c
deleted file mode 100644
index df91acd4a7..0000000000
--- a/board/compulab/cm_t35/eeprom.c
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * (C) Copyright 2011 CompuLab, Ltd. <www.compulab.co.il>
- *
- * Authors: Nikita Kiryanov <nikita@compulab.co.il>
- *	    Igor Grinberg <grinberg@compulab.co.il>
- *
- * SPDX-License-Identifier:	GPL-2.0+
- */
-
-#include <common.h>
-#include <i2c.h>
-
-#define EEPROM_LAYOUT_VER_OFFSET	44
-#define BOARD_SERIAL_OFFSET		20
-#define BOARD_SERIAL_OFFSET_LEGACY	8
-#define BOARD_REV_OFFSET		0
-#define BOARD_REV_OFFSET_LEGACY		6
-#define BOARD_REV_SIZE			2
-#define MAC_ADDR_OFFSET			4
-#define MAC_ADDR_OFFSET_LEGACY		0
-
-#define LAYOUT_INVALID	0
-#define LAYOUT_LEGACY	0xff
-
-static int eeprom_layout; /* Implicitly LAYOUT_INVALID */
-
-static int cm_t3x_eeprom_read(uint offset, uchar *buf, int len)
-{
-	return i2c_read(CONFIG_SYS_I2C_EEPROM_ADDR, offset,
-			CONFIG_SYS_I2C_EEPROM_ADDR_LEN, buf, len);
-}
-
-static int eeprom_setup_layout(void)
-{
-	int res;
-
-	if (eeprom_layout != LAYOUT_INVALID)
-		return 0;
-
-	res = cm_t3x_eeprom_read(EEPROM_LAYOUT_VER_OFFSET,
-						(uchar *)&eeprom_layout, 1);
-	if (res) {
-		eeprom_layout = LAYOUT_INVALID;
-		return res;
-	}
-
-	if (eeprom_layout == 0 || eeprom_layout >= 0x20)
-		eeprom_layout = LAYOUT_LEGACY;
-
-	return 0;
-}
-
-void get_board_serial(struct tag_serialnr *serialnr)
-{
-	u32 serial[2];
-	uint offset;
-
-	memset(serialnr, 0, sizeof(*serialnr));
-	if (eeprom_setup_layout())
-		return;
-
-	offset = (eeprom_layout != LAYOUT_LEGACY) ?
-			BOARD_SERIAL_OFFSET : BOARD_SERIAL_OFFSET_LEGACY;
-	if (cm_t3x_eeprom_read(offset, (uchar *)serial, 8))
-		return;
-
-	if (serial[0] != 0xffffffff && serial[1] != 0xffffffff) {
-		serialnr->low = serial[0];
-		serialnr->high = serial[1];
-	}
-}
-
-/*
- * Routine: cm_t3x_eeprom_read_mac_addr
- * Description: read mac address and store it in buf.
- */
-int cm_t3x_eeprom_read_mac_addr(uchar *buf)
-{
-	uint offset;
-
-	if (eeprom_setup_layout())
-		return 0;
-
-	offset = (eeprom_layout != LAYOUT_LEGACY) ?
-			MAC_ADDR_OFFSET : MAC_ADDR_OFFSET_LEGACY;
-	return cm_t3x_eeprom_read(offset, buf, 6);
-}
-
-/*
- * Routine: cm_t3x_eeprom_get_board_rev
- * Description: read system revision from eeprom
- */
-u32 cm_t3x_eeprom_get_board_rev(void)
-{
-	u32 rev = 0;
-	char str[5]; /* Legacy representation can contain at most 4 digits */
-	uint offset = BOARD_REV_OFFSET_LEGACY;
-
-	if (eeprom_setup_layout())
-		return 0;
-
-	if (eeprom_layout != LAYOUT_LEGACY)
-		offset = BOARD_REV_OFFSET;
-
-	if (cm_t3x_eeprom_read(offset, (uchar *)&rev, BOARD_REV_SIZE))
-		return 0;
-
-	/*
-	 * Convert legacy syntactic representation to semantic
-	 * representation. i.e. for rev 1.00: 0x100 --> 0x64
-	 */
-	if (eeprom_layout == LAYOUT_LEGACY) {
-		sprintf(str, "%x", rev);
-		rev = simple_strtoul(str, NULL, 10);
-	}
-
-	return rev;
-};
diff --git a/board/compulab/cm_t35/eeprom.h b/board/compulab/cm_t35/eeprom.h
deleted file mode 100644
index 02ffbb1a99..0000000000
--- a/board/compulab/cm_t35/eeprom.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * (C) Copyright 2011 CompuLab, Ltd. <www.compulab.co.il>
- *
- * Authors: Nikita Kiryanov <nikita@compulab.co.il>
- *	    Igor Grinberg <grinberg@compulab.co.il>
- *
- * SPDX-License-Identifier:	GPL-2.0+
- */
-
-#ifndef _EEPROM_
-#define _EEPROM_
-
-#ifdef CONFIG_DRIVER_OMAP34XX_I2C
-int cm_t3x_eeprom_read_mac_addr(uchar *buf);
-u32 cm_t3x_eeprom_get_board_rev(void);
-#else
-static inline int cm_t3x_eeprom_read_mac_addr(uchar *buf)
-{
-	return 1;
-}
-static inline u32 cm_t3x_eeprom_get_board_rev(void)
-{
-	return 0;
-}
-#endif
-
-#endif