Skip to contentSkip to conversation

83xx, kmeter1: add I2C, dtt, eeprom support

PATCH New Heiko Schocher 2 participants 4 messages Feb 24, 2009 – Feb 26, 2009

lore
Share & tools
lore
#0 lore raw

PATCH v4 2/7 83xx, kmeter1: add I2C, dtt, eeprom support

This patch adds I2C support for the Keymile kmeter1 board. It uses the First I2C Controller from the CPU, for accessing 4 temperature sensors, an eeprom with IVM data and the booteeprom over a pca9547 mux.

---
 board/keymile/common/common.c    |    2 +-
 board/keymile/kmeter1/kmeter1.c  |   33 +++++++++++++++++++++++++++++++++
 include/configs/keymile-common.h |    7 -------
 include/configs/kmeter1.h        |   35 +++++++++++++++++++++++++++++++++++
 4 files changed, 69 insertions(+), 8 deletions(-)
board/keymile/common/common.c +1 -1
index 1338950..48ce613 100644
@@ -318,7 +318,7 @@ int ivm_read_eeprom (void)
 	if (buf != NULL)
 		dev_addr = simple_strtoul ((char *)buf, NULL, 16);
 
-	if (eeprom_read (dev_addr, 0, i2c_buffer, CONFIG_SYS_IVM_EEPROM_MAX_LEN) != 0) {
+	if (i2c_read(dev_addr, 0, 1, i2c_buffer, CONFIG_SYS_IVM_EEPROM_MAX_LEN) != 0) {
 		printf ("Error reading EEprom\n");
 		return -2;
 	}
board/keymile/kmeter1/kmeter1.c +33 -0
index f04a57a..a3c58ae 100644
@@ -59,6 +59,23 @@ const qe_iop_conf_t qe_iop_conf_tab[] = {
 	{0,  0, 0, 0, QE_IOP_TAB_END},
 };
 
+static int board_init_i2c_busses (void)
+{
+	I2C_MUX_DEVICE *dev = NULL;
+	uchar	*buf;
+
+	/* Set up the Bus for the DTTs */
+	buf = (unsigned char *) getenv ("dtt_bus");
+	if (buf != NULL)
+		dev = i2c_mux_ident_muxstring (buf);
+	if (dev == NULL) {
+		printf ("Error couldn't add Bus for DTT\n");
+		printf ("please setup dtt_bus to where your\n");
+		printf ("DTT is found.\n");
+	}
+	return 0;
+}
+
 int board_early_init_r (void)
 {
 	void *reg = (void *)(CONFIG_SYS_IMMR + 0x14a8);
@@ -80,6 +97,13 @@ int board_early_init_r (void)
 	return 0;
 }
 
+int misc_init_r (void)
+{
+	/* add board specific i2c busses */
+	board_init_i2c_busses ();
+	return 0;
+}
+
 int fixed_sdram(void)
 {
 	volatile immap_t *im = (immap_t *)CONFIG_SYS_IMMR;
@@ -156,3 +180,12 @@ void ft_board_setup (void *blob, bd_t *bd)
 	ft_cpu_setup (blob, bd);
 }
 #endif
+
+#if defined(CONFIG_HUSH_INIT_VAR)
+extern int ivm_read_eeprom (void);
+int hush_init_var (void)
+{
+	ivm_read_eeprom ();
+	return 0;
+}
+#endif
include/configs/keymile-common.h +0 -7
index d70bc48..c7f6ba3 100644
@@ -42,13 +42,9 @@
 #define CONFIG_CMD_IMMAP
 #define CONFIG_CMD_MII
 #define CONFIG_CMD_PING
-
-/* should go away, if kmeter I2C support is enabled */
-#if defined(CONFIG_MGCOGE) || defined(CONFIG_MGSUVD)
 #define CONFIG_CMD_DTT
 #define CONFIG_CMD_EEPROM
 #define CONFIG_CMD_I2C
-#endif
 
 #undef	CONFIG_WATCHDOG			/* disable platform specific watchdog */
 
@@ -73,10 +69,7 @@
 #define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE	/* Boot Argument Buffer Size  */
 #define CONFIG_CMDLINE_EDITING		1	/* add command line history     */
 
-/* should go away, if kmeter I2C support is enabled */
-#if defined(CONFIG_MGCOGE) || defined(CONFIG_MGSUVD)
 #define CONFIG_HUSH_INIT_VAR	1
-#endif
 
 #define CONFIG_SYS_ALT_MEMTEST		/* memory test, takes time */
 #define CONFIG_SYS_MEMTEST_START	0x00100000	/* memtest works on */
include/configs/kmeter1.h +35 -0
index b86c61d..a23c9ed 100644
@@ -32,6 +32,7 @@
 /* include common defines/options for all Keymile boards */
 #include "keymile-common.h"
 
+#define CONFIG_MISC_INIT_R	1
 /*
  * System Clock Setup
  */
@@ -300,6 +301,38 @@
 #define CONFIG_ENV_SIZE		0x2000
 #endif /* CFG_RAMBOOT */
 
+/* I2C */
+#define CONFIG_HARD_I2C		/* I2C with hardware support */
+#undef	CONFIG_SOFT_I2C		/* I2C bit-banged */
+#define CONFIG_FSL_I2C
+#define CONFIG_SYS_I2C_SPEED	200000	/* I2C speed and slave address */
+#define CONFIG_SYS_I2C_SLAVE	0x7F
+#define CONFIG_SYS_I2C_OFFSET	0x3000
+#define CONFIG_I2C_MULTI_BUS	1
+#define CONFIG_I2C_CMD_TREE	1
+#define CONFIG_SYS_MAX_I2C_BUS		2
+#define CONFIG_I2C_MUX		1
+
+/* EEprom support */
+#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN	2
+#define CONFIG_SYS_I2C_MULTI_EEPROMS	1
+#define CONFIG_SYS_EEPROM_PAGE_WRITE_ENABLE
+#define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS 3
+#define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS 10
+
+/* Support the IVM EEprom */
+#define	CONFIG_SYS_IVM_EEPROM_ADR	0x50
+#define CONFIG_SYS_IVM_EEPROM_MAX_LEN	0x400
+#define CONFIG_SYS_IVM_EEPROM_PAGE_LEN	0x100
+
+/* I2C SYSMON (LM75, AD7414 is almost compatible)			*/
+#define CONFIG_DTT_LM75		1	/* ON Semi's LM75		*/
+#define CONFIG_DTT_SENSORS	{0, 1, 2, 3}	/* Sensor addresses		*/
+#define CONFIG_SYS_DTT_MAX_TEMP	70
+#define CONFIG_SYS_DTT_LOW_TEMP	-30
+#define CONFIG_SYS_DTT_HYSTERESIS	3
+#define CONFIG_SYS_DTT_BUS_NUM		(2)
+
 #if defined(CONFIG_PCI)
 #define CONFIG_CMD_PCI
 #endif
@@ -452,6 +485,8 @@
 	"loadfdt=tftp ${fdt_addr_r} ${fdt_file}\0"			\
 	"loadkernel=tftp ${kernel_addr_r} ${boot_file}\0"		\
 	"unlock=yes\0"							\
+	"EEprom_ivm=pca9547:70:9\0"					\
+	"dtt_bus=pca9547:70:a\0"					\
    ""
 
 #endif /* __CONFIG_H */
Signature · 5 lines
1.6.0.6

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
#1 lore raw

PATCH v4 2/7 83xx, kmeter1: add I2C, dtt, eeprom support

Quoted 5 lines · On Tue, 24 Feb 2009 11:30:34 +0100 Heiko Schocher <[email protected]> wrote:
board/keymile/kmeter1/kmeter1.c +0 -0
index f04a57a..a3c58ae 100644

board/keymile/kmeter1/kmeter1.c const qe_iop_conf_t qe_iop_conf_tab[] = { · line 68

Quoted 10 lines
board/keymile/kmeter1/kmeter1.c +7 -0
@@ -59,6 +59,23 @@ const qe_iop_conf_t qe_iop_conf_tab[] = {
 	{0,  0, 0, 0, QE_IOP_TAB_END},
 };
 
+static int board_init_i2c_busses (void)
+{
+	I2C_MUX_DEVICE *dev = NULL;
+	uchar	*buf;
+
+	/* Set up the Bus for the DTTs */
+	buf = (unsigned char *) getenv ("dtt_bus");

Heiko, what am I missing here? I thought any reference to environment pollution in the form of "dtt_bus" would have been gone by now. Did we misunderstand each other here? If its value changes between boards (and not boots), then there is no reason for this to be an environment variable. No?

Kim

#2 lore raw

PATCH v4 2/7 83xx, kmeter1: add I2C, dtt, eeprom support

Hello Kim,

Quoted 11 lines · Kim Phillips
Quoted 8 lines · On Tue, 24 Feb 2009 11:30:34 +0100 Heiko Schocher <[email protected]> wrote:
board/keymile/kmeter1/kmeter1.c +0 -0
index f04a57a..a3c58ae 100644
@@ -59,6 +59,23 @@ const qe_iop_conf_t qe_iop_conf_tab[] = {
 	{0,  0, 0, 0, QE_IOP_TAB_END},
 };
 
Quoted 11 lines

board/keymile/kmeter1/kmeter1.c const qe_iop_conf_t qe_iop_conf_tab[] = { · line 68

Quoted 7 lines
board/keymile/kmeter1/kmeter1.c +7 -0
+static int board_init_i2c_busses (void)
+{
+	I2C_MUX_DEVICE *dev = NULL;
+	uchar	*buf;
+
+	/* Set up the Bus for the DTTs */
+	buf = (unsigned char *) getenv ("dtt_bus");

Heiko, what am I missing here? I thought any reference to environment pollution in the form of "dtt_bus" would have been gone by now. Did we misunderstand each other here? If its value changes between boards

Yes, I think so ...

Quoted 2 lines

(and not boots), then there is no reason for this to be an environment variable. No?

There is a reason, because if it is an environment variable, we (or better the board manufacturer) can use one u-boot binary for all variants of his hardware (as I said, they differ only in the i2c bus topology)

bye
Heiko

Signature · 2 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
#3 lore raw

PATCH v4 2/7 83xx, kmeter1: add I2C, dtt, eeprom support

Quoted 6 lines · On Wed, 25 Feb 2009 08:11:18 +0100 Heiko Schocher <[email protected]> wrote:
Quoted 2 lines

(and not boots), then there is no reason for this to be an environment variable. No?

There is a reason, because if it is an environment variable, we (or better the board manufacturer) can use one u-boot binary for all variants of his hardware (as I said, they differ only in the i2c bus topology)

ok - I'm assuming then that the board cannot be easily detected by s/w.

Kim