Skip to contentSkip to conversation

mpc83xx, kmeter1: extract common I2C options in keymile header

PATCH New Heiko Schocher 2 participants 3 messages Jan 28, 2009 – Jan 29, 2009

lore
Share & tools
lore
#0 lore raw

PATCH 20/31 mpc83xx, kmeter1: extract common I2C options in keymile header

---
 include/configs/keymile-common.h |    8 ++++----
 include/configs/kmeter1.h        |   19 -------------------
 2 files changed, 4 insertions(+), 23 deletions(-)
include/configs/keymile-common.h +4 -4
index 99c3380..4ff6fb7 100644
@@ -42,8 +42,6 @@
 #define CONFIG_CMD_IMMAP
 #define CONFIG_CMD_MII
 #define CONFIG_CMD_PING
-
-/* should go away, if kmeter I2C support is enabled */
 #define CONFIG_CMD_DTT
 #define CONFIG_CMD_EEPROM
 #define CONFIG_CMD_I2C
@@ -101,7 +99,6 @@
 #define CONFIG_SYS_SLOT_ID_OFF		(0x07)	/* register offset */
 #define CONFIG_SYS_SLOT_ID_MASK		(0x3f)	/* mask for slot ID bits */
 
-#if defined(CONFIG_MGCOGE) || defined(CONFIG_MGSUVD)
 #define CONFIG_I2C_MULTI_BUS	1
 #define CONFIG_I2C_CMD_TREE	1
 #define CONFIG_SYS_MAX_I2C_BUS		2
@@ -109,7 +106,11 @@
 #define CONFIG_I2C_MUX		1
 
 /* EEprom support */
+#if defined(CONFIG_MGCOGE) || defined(CONFIG_MGSUVD)
 #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN	1
+#else
+#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN	2
+#endif
 #define CONFIG_SYS_I2C_MULTI_EEPROMS	1
 #define CONFIG_SYS_EEPROM_PAGE_WRITE_ENABLE
 #define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS 3
@@ -119,7 +120,6 @@
 #define	CONFIG_SYS_IVM_EEPROM_ADR	0x50
 #define CONFIG_SYS_IVM_EEPROM_MAX_LEN	0x400
 #define CONFIG_SYS_IVM_EEPROM_PAGE_LEN	0x100
-#endif
 
 #define	CONFIG_SYS_FLASH_PROTECTION 1
 
include/configs/kmeter1.h +0 -19
index 31e5cd6..f6b4035 100644
@@ -309,29 +309,10 @@
 #define CONFIG_HARD_I2C		/* I2C with hardware support */
 #undef	CONFIG_SOFT_I2C		/* I2C bit-banged */
 #define CONFIG_FSL_I2C
-#define CONFIG_I2C_MULTI_BUS
-#define CONFIG_I2C_CMD_TREE
 #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_SYS_MAX_I2C_BUS		2
-#define CONFIG_SYS_I2C_INIT_BOARD	1
-#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
-
-#define CONFIG_HUSH_INIT_VAR	1
-/* 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		*/
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 20/31 mpc83xx, kmeter1: extract common I2C options in keymile header

Quoted 4 lines · On Wed, 28 Jan 2009 10:40:16 +0100 Heiko Schocher <[email protected]> wrote:
---
 include/configs/keymile-common.h |    8 ++++----
 include/configs/kmeter1.h        |   19 -------------------

a lot of patches in this patchseries touch a lot of the same files - can you please reorganize the series so that we don't have to review something that's going to change again in a subsequent patch?

Quoted 7 lines
 2 files changed, 4 insertions(+), 23 deletions(-)
include/configs/keymile-common.h +0 -0
index 99c3380..4ff6fb7 100644

include/configs/keymile-common.h line 47

Quoted 8 lines
include/configs/keymile-common.h +0 -2
@@ -42,8 +42,6 @@
 #define CONFIG_CMD_IMMAP
 #define CONFIG_CMD_MII
 #define CONFIG_CMD_PING
-
-/* should go away, if kmeter I2C support is enabled */
 #define CONFIG_CMD_DTT
 #define CONFIG_CMD_EEPROM
 #define CONFIG_CMD_I2C

the comment alludes that something should go away yet nothing's going away but the comment itself.

If there is indeed nothing to take away, then these are the types of things you need to state why in your commit message.

Quoted 9 lines
include/configs/keymile-common.h +0 -1
@@ -101,7 +99,6 @@
 #define CONFIG_SYS_SLOT_ID_OFF		(0x07)	/* register offset */
 #define CONFIG_SYS_SLOT_ID_MASK		(0x3f)	/* mask for slot ID bits */
 
-#if defined(CONFIG_MGCOGE) || defined(CONFIG_MGSUVD)
 #define CONFIG_I2C_MULTI_BUS	1
 #define CONFIG_I2C_CMD_TREE	1
 #define CONFIG_SYS_MAX_I2C_BUS		2

include/configs/keymile-common.h line 113

Quoted 8 lines
include/configs/keymile-common.h +4 -0
@@ -109,7 +106,11 @@
 #define CONFIG_I2C_MUX		1
 
 /* EEprom support */
+#if defined(CONFIG_MGCOGE) || defined(CONFIG_MGSUVD)
 #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN	1
+#else
+#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN	2
+#endif

if this differs per board, shouldn't it be set in the board config, and not the common config?

Kim

#2 lore raw

PATCH 20/31 mpc83xx, kmeter1: extract common I2C options in keymile header

Hello Kim,

Quoted 11 lines · Kim Phillips
Quoted 4 lines · On Wed, 28 Jan 2009 10:40:16 +0100 Heiko Schocher <[email protected]> wrote:
---
 include/configs/keymile-common.h |    8 ++++----
 include/configs/kmeter1.h        |   19 -------------------

a lot of patches in this patchseries touch a lot of the same files - can you please reorganize the series so that we don't have to review something that's going to change again in a subsequent patch?

Yes, I will reorganize this patchset complete.

Quoted 19 lines
Quoted 7 lines
 2 files changed, 4 insertions(+), 23 deletions(-)
include/configs/keymile-common.h +0 -0
index 99c3380..4ff6fb7 100644

include/configs/keymile-common.h line 47

Quoted 8 lines
include/configs/keymile-common.h +0 -2
@@ -42,8 +42,6 @@
 #define CONFIG_CMD_IMMAP
 #define CONFIG_CMD_MII
 #define CONFIG_CMD_PING
-
-/* should go away, if kmeter I2C support is enabled */
 #define CONFIG_CMD_DTT
 #define CONFIG_CMD_EEPROM
 #define CONFIG_CMD_I2C

the comment alludes that something should go away yet nothing's going away but the comment itself.

Quoted 2 lines

If there is indeed nothing to take away, then these are the types of things you need to state why in your commit message.

Ok.

Quoted 11 lines
Quoted 11 lines
include/configs/keymile-common.h +0 -1
@@ -101,7 +99,6 @@
 #define CONFIG_SYS_SLOT_ID_OFF		(0x07)	/* register offset */
 #define CONFIG_SYS_SLOT_ID_MASK		(0x3f)	/* mask for slot ID bits */
 
-#if defined(CONFIG_MGCOGE) || defined(CONFIG_MGSUVD)
 #define CONFIG_I2C_MULTI_BUS	1
 #define CONFIG_I2C_CMD_TREE	1
 #define CONFIG_SYS_MAX_I2C_BUS		2
@@ -109,7 +106,11 @@
 #define CONFIG_I2C_MUX		1
 
Quoted 9 lines

include/configs/keymile-common.h line 113

Quoted 6 lines
include/configs/keymile-common.h +4 -0
 /* EEprom support */
+#if defined(CONFIG_MGCOGE) || defined(CONFIG_MGSUVD)
 #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN	1
+#else
+#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN	2
+#endif

if this differs per board, shouldn't it be set in the board config, and not the common config?

Yes, that would be the right place.

thanks
Heiko

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