83xx, kmeter1: add I2C, dtt, eeprom support
PATCH v3 3/9 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.
---
I let the dtt_bus env variable in this patch, and remove this, when I send a patch for moving dtt_init after relocation is done. Then this is no longer needed.
board/keymile/common/common.c | 2 +- board/keymile/kmeter1/kmeter1.c | 32 ++++++++++++++++++++++++++++++++ drivers/hwmon/lm75.c | 15 +++++++++++++++ include/configs/keymile-common.h | 7 ------- include/configs/kmeter1.h | 36 ++++++++++++++++++++++++++++++++++++ 5 files changed, 84 insertions(+), 8 deletions(-)
board/keymile/common/common.c +1 -1
@@ -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 +32 -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" ); +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,12 @@ int board_early_init_r (void)return 0 ; } +int misc_init_r (void ) +{ +board_init_i2c_busses (); +return 0 ; +} +int fixed_sdram (void ) {volatile immap_t *im = (immap_t *)CONFIG_SYS_IMMR ;
@@ -156,3 +179,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
drivers/hwmon/lm75.c +15 -0
@@ -42,6 +42,8 @@#define DTT_TEMP_HYST 0x2#define DTT_TEMP_SET 0x3 +DECLARE_GLOBAL_DATA_PTR ; +int dtt_read (int sensor,int reg) {int dlen;
@@ -157,7 +159,20 @@ int dtt_init (void)/* switch to correct I2C bus */ old_bus =I2C_GET_BUS (); +#if defined(CONFIG_I2C_MUX ) +if ((gd->flags &GD_FLG_RELOC ) !=GD_FLG_RELOC ) { +uchar *tmp = (uchar *)getenv ("dtt_bus" ); +if (tmp ==NULL ) +printf ("FAILED: dtt_bus not defined\n" ); +else +if (i2c_mux_ident_muxstring_f (tmp)) +printf ("FAILED: couldnt switch to bus\n" ); + }else { +I2C_SET_BUS (CONFIG_SYS_DTT_BUS_NUM ); + } +#else I2C_SET_BUS (CONFIG_SYS_DTT_BUS_NUM ); +#endif for (i =0 ; i <sizeof (sensors); i++) {if (_dtt_init (sensors[i]) !=0 )
include/configs/keymile-common.h +0 -7
@@ -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 +36 -0
@@ -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,39 @@#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) +#define CONFIG_SYS_DTT_BOARD_INIT 1 +#if defined(CONFIG_PCI )#define CONFIG_CMD_PCI #endif
@@ -452,6 +486,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
PATCH v3 3/9 83xx, kmeter1: add I2C, dtt, eeprom support
Quoted 10 lines · On Thu, 19 Feb 2009 17:24:05 +0100 Heiko Schocher <[email protected]> wrote:
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.
Signed-off-by Heiko Schocher <[email protected]>---
I let thedtt_busenv variable in this patch, and remove this, when I send a patch for movingdtt_initafter relocation is done. Then this is no longer needed.
These things usually work the other way around; please fix this so dtt_bus isn't needed.
Kim
PATCH v3 3/9 83xx, kmeter1: add I2C, dtt, eeprom support
Hello Kim,
Quoted 8 lines · Kim Phillips
Quoted 5 lines · On Thu, 19 Feb 2009 17:24:05 +0100 Heiko Schocher <[email protected]> wrote:
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.
Quoted 8 lines
Quoted 5 lines
Signed-off-by Heiko Schocher <[email protected]>---
I let thedtt_busenv variable in this patch, and remove this, when I send a patch for movingdtt_initafter relocation is done. Then this is no longer needed.These things usually work the other way around; please fix this so
dtt_busisn't needed.
Ok
thanks
Heiko
Signature · 2 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany