diff options
Diffstat (limited to 'cpu')
| -rw-r--r-- | cpu/arm720t/s3c4510b/Makefile | 1 | ||||
| -rw-r--r-- | cpu/mpc5xxx/i2c.c | 6 | ||||
| -rw-r--r-- | cpu/mpc8260/cpu.c | 3 | ||||
| -rw-r--r-- | cpu/s3c44b0/cache.c | 1 |
4 files changed, 6 insertions, 5 deletions
diff --git a/cpu/arm720t/s3c4510b/Makefile b/cpu/arm720t/s3c4510b/Makefile index c9520b632a..c099036351 100644 --- a/cpu/arm720t/s3c4510b/Makefile +++ b/cpu/arm720t/s3c4510b/Makefile @@ -43,4 +43,3 @@ include $(SRCTREE)/rules.mk sinclude $(obj).depend ######################################################################### - diff --git a/cpu/mpc5xxx/i2c.c b/cpu/mpc5xxx/i2c.c index e2506d82f2..23419324ba 100644 --- a/cpu/mpc5xxx/i2c.c +++ b/cpu/mpc5xxx/i2c.c @@ -38,7 +38,7 @@ DECLARE_GLOBAL_DATA_PTR; #error CONFIG_SYS_I2C_MODULE is not properly configured #endif -#define I2C_TIMEOUT 100 +#define I2C_TIMEOUT 6667 #define I2C_RETRIES 3 struct mpc5xxx_i2c_tap { @@ -94,7 +94,7 @@ static int wait_for_bb(void) mpc_reg_out(®s->mcr, 0, 0); mpc_reg_out(®s->mcr, I2C_EN, 0); #endif - udelay(1000); + udelay(15); status = mpc_reg_in(®s->msr); } @@ -109,7 +109,7 @@ static int wait_for_pin(int *status) *status = mpc_reg_in(®s->msr); while (timeout-- && !(*status & I2C_IF)) { - udelay(1000); + udelay(15); *status = mpc_reg_in(®s->msr); } diff --git a/cpu/mpc8260/cpu.c b/cpu/mpc8260/cpu.c index 1b034cd574..d4622ca0cd 100644 --- a/cpu/mpc8260/cpu.c +++ b/cpu/mpc8260/cpu.c @@ -311,6 +311,9 @@ void ft_cpu_setup (void *blob, bd_t *bd) fdt_fixup_ethernet(blob); #endif + do_fixup_by_compat_u32(blob, "fsl,cpm2-brg", + "clock-frequency", bd->bi_brgfreq, 1); + do_fixup_by_path_u32(blob, cpu_path, "bus-frequency", bd->bi_busfreq, 1); do_fixup_by_path_u32(blob, cpu_path, "timebase-frequency", OF_TBCLK, 1); do_fixup_by_path_u32(blob, cpu_path, "clock-frequency", bd->bi_intfreq, 1); diff --git a/cpu/s3c44b0/cache.c b/cpu/s3c44b0/cache.c index bc10171515..66974f61a6 100644 --- a/cpu/s3c44b0/cache.c +++ b/cpu/s3c44b0/cache.c @@ -88,4 +88,3 @@ int dcache_status (void) { return dcache_status(); } - |