diff options
| author | wdenk <wdenk> | 2003-08-29 10:05:53 +0000 |
|---|---|---|
| committer | wdenk <wdenk> | 2003-08-29 10:05:53 +0000 |
| commit | ca75added10524a1f8e439e904ba72cb74c917a4 (patch) | |
| tree | 93c7ffb6258db1ecfd68fa4e4faa844178effea8 | |
| parent | 437ce07b8a95db5272d3dd7a2353a3165e63435d (diff) | |
| download | olio-uboot-2014.01-ca75added10524a1f8e439e904ba72cb74c917a4.tar.xz olio-uboot-2014.01-ca75added10524a1f8e439e904ba72cb74c917a4.zip | |
Add I2C and RTC support for RMU board using software I2C driver
(because of better response to iprobe command); fix problem with
"reset" command
| -rw-r--r-- | CHANGELOG | 4 | ||||
| -rw-r--r-- | include/configs/rmu.h | 36 | ||||
| -rw-r--r-- | include/watchdog.h | 12 |
3 files changed, 40 insertions, 12 deletions
@@ -2,6 +2,10 @@ Changes for U-Boot 0.4.7: ====================================================================== +* Add I2C and RTC support for RMU board using software I2C driver + (because of better response to iprobe command); fix problem with + "reset" command + * Patch by Matthias Fuchs, 28 Aug 2003: Added CONFIG_BOOTP_DNS2 and CONFIG_BOOTP_SEND_HOSTNAME to CONFIG_BOOTP_MAKS (see README). diff --git a/include/configs/rmu.h b/include/configs/rmu.h index 7b33c7e1b..c0c408333 100644 --- a/include/configs/rmu.h +++ b/include/configs/rmu.h @@ -61,8 +61,39 @@ #define CONFIG_LOADS_ECHO 1 /* echo on for serial download */ #undef CFG_LOADS_BAUD_CHANGE /* don't allow baudrate change */ +/* enable I2C and select the hardware/software driver */ +#undef CONFIG_HARD_I2C /* I2C with hardware support */ +#define CONFIG_SOFT_I2C 1 /* I2C bit-banged */ + +#define CFG_I2C_SPEED 40000 /* 40 kHz is supposed to work */ +#define CFG_I2C_SLAVE 0xFE + +/* Software (bit-bang) I2C driver configuration */ +#define PB_SCL 0x00000020 /* PB 26 */ +#define PB_SDA 0x00000010 /* PB 27 */ + +#define I2C_INIT (immr->im_cpm.cp_pbdir |= PB_SCL) +#define I2C_ACTIVE (immr->im_cpm.cp_pbdir |= PB_SDA) +#define I2C_TRISTATE (immr->im_cpm.cp_pbdir &= ~PB_SDA) +#define I2C_READ ((immr->im_cpm.cp_pbdat & PB_SDA) != 0) +#define I2C_SDA(bit) if(bit) immr->im_cpm.cp_pbdat |= PB_SDA; \ + else immr->im_cpm.cp_pbdat &= ~PB_SDA +#define I2C_SCL(bit) if(bit) immr->im_cpm.cp_pbdat |= PB_SCL; \ + else immr->im_cpm.cp_pbdat &= ~PB_SCL +#define I2C_DELAY udelay(5) /* 1/4 I2C clock duration */ + +/* M41T11 Serial Access Timekeeper(R) SRAM */ +#define CONFIG_RTC_M41T11 1 +#define CFG_I2C_RTC_ADDR 0x68 +#define CFG_M41T11_BASE_YEAR 1900 /* play along with the linux driver */ + #undef CONFIG_WATCHDOG /* watchdog disabled */ +#define CONFIG_COMMANDS ( CONFIG_CMD_DFL | \ + CFG_CMD_DATE | \ + CFG_CMD_DHCP | \ + CFG_CMD_I2C ) + #define CONFIG_BOOTP_MASK (CONFIG_BOOTP_DEFAULT | CONFIG_BOOTP_BOOTFILESIZE) /* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */ @@ -153,6 +184,11 @@ #define CFG_ENV_SIZE_REDUND (CFG_ENV_SIZE) /*----------------------------------------------------------------------- + * Reset address + */ +#define CFG_RESET_ADDRESS ((ulong)((((immap_t *)CFG_IMMR)->im_clkrst.res))) + +/*----------------------------------------------------------------------- * Cache Configuration */ #define CFG_CACHELINE_SIZE 16 /* For all MPC8xx CPUs */ diff --git a/include/watchdog.h b/include/watchdog.h index b9ae916a1..7180259d0 100644 --- a/include/watchdog.h +++ b/include/watchdog.h @@ -85,16 +85,4 @@ void reset_4xx_watchdog(void); #endif -/* MPC 8260 */ -#if defined(CONFIG_MPC8260) && !defined(__ASSEMBLY__) -#if defined(CONFIG_WATCHDOG) -extern __inline__ void -reset_8260_watchdog(volatile immap_t *immr) -{ - immr->im_siu_conf.sc_swsr = 0x556c; - immr->im_siu_conf.sc_swsr = 0xaa39; -} -#endif /* !__ASSEMBLY__ && CONFIG_WATCHDOG */ -#endif /* CONFIG_MPC8260 && !__ASSEMBLY__ */ - #endif /* _WATCHDOG_H_ */ |