diff options
| author | Stefan Roese <sr@denx.de> | 2007-08-10 20:33:06 +0200 |
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2007-08-10 20:33:06 +0200 |
| commit | 59530af55613a8c5fac3c4e0f5fbcf2f1611c483 (patch) | |
| tree | f16287c465c5f577cbfc22ae8ee3a1f979519af0 /drivers | |
| parent | c74b2108e31fe09bd1c5d291c3cf360510d4f13e (diff) | |
| parent | 99c2fdab91bc633e46fb41dbaa629f87ccf6e00f (diff) | |
Merge with git://www.denx.de/git/u-boot.git
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/fsl_i2c.c | 3 | ||||
| -rw-r--r-- | drivers/qe/qe.c | 2 | ||||
| -rw-r--r-- | drivers/qe/qe.h | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/drivers/fsl_i2c.c b/drivers/fsl_i2c.c index ebae5af154..22485ea916 100644 --- a/drivers/fsl_i2c.c +++ b/drivers/fsl_i2c.c @@ -69,9 +69,10 @@ i2c_init(int speed, int slaveadd) dev = (struct fsl_i2c *) (CFG_IMMR + CFG_I2C2_OFFSET); writeb(0, &dev->cr); /* stop I2C controller */ + udelay(5); /* let it shutdown in peace */ writeb(0x3F, &dev->fdr); /* set bus speed */ writeb(0x3F, &dev->dfsrr); /* set default filter */ - writeb(slaveadd, &dev->adr); /* write slave address */ + writeb(slaveadd << 1, &dev->adr); /* write slave address */ writeb(0x0, &dev->sr); /* clear status register */ writeb(I2C_CR_MEN, &dev->cr); /* start I2C controller */ #endif /* CFG_I2C2_OFFSET */ diff --git a/drivers/qe/qe.c b/drivers/qe/qe.c index 5f209629f4..0f5232a72a 100644 --- a/drivers/qe/qe.c +++ b/drivers/qe/qe.c @@ -98,7 +98,7 @@ static void qe_sdma_init(void) out_be32(&p->sdaqmr, 0); /* Allocate 2KB temporary buffer for sdma */ - sdma_buffer_base = qe_muram_alloc(2048, 64); + sdma_buffer_base = qe_muram_alloc(2048, 4096); out_be32(&p->sdwbcr, sdma_buffer_base & QE_SDEBCR_BA_MASK); /* Clear sdma status */ diff --git a/drivers/qe/qe.h b/drivers/qe/qe.h index 0bcd0a9573..400b1a6f60 100644 --- a/drivers/qe/qe.h +++ b/drivers/qe/qe.h @@ -29,7 +29,7 @@ #define QE_NUM_OF_BRGS 16 #define UCC_MAX_NUM 8 -#define QE_DATAONLY_BASE (uint)(128) +#define QE_DATAONLY_BASE 0 #define QE_DATAONLY_SIZE (QE_MURAM_SIZE - QE_DATAONLY_BASE) /* QE threads SNUM |