diff options
Diffstat (limited to 'cpu')
| -rw-r--r-- | cpu/at91rm9200/at45.c | 15 | ||||
| -rw-r--r-- | cpu/mpc85xx/tsec.c | 11 |
2 files changed, 14 insertions, 12 deletions
diff --git a/cpu/at91rm9200/at45.c b/cpu/at91rm9200/at45.c index 9dfe560..3c00132 100644 --- a/cpu/at91rm9200/at45.c +++ b/cpu/at91rm9200/at45.c @@ -25,7 +25,14 @@ #ifdef CONFIG_HAS_DATAFLASH #include <dataflash.h> -#define SPI_CLK 5000000 +#define AT91C_SPI_CLK 10000000 /* Max Value = 10MHz to be compliant to +the Continuous Array Read function */ + +/* AC Characteristics */ +/* DLYBS = tCSS = 250ns min and DLYBCT = tCSH = 250ns */ +#define DATAFLASH_TCSS (0xC << 16) +#define DATAFLASH_TCHS (0x1 << 24) + #define AT91C_TIMEOUT_WRDY 200000 #define AT91C_SPI_PCS0_SERIAL_DATAFLASH 0xE /* Chip Select 0 : NPCS0 %1110 */ #define AT91C_SPI_PCS3_DATAFLASH_CARD 0x7 /* Chip Select 3 : NPCS3 %0111 */ @@ -50,9 +57,11 @@ void AT91F_SpiInit(void) { AT91C_BASE_SPI->SPI_MR = AT91C_SPI_MSTR | AT91C_SPI_MODFDIS | AT91C_SPI_PCS; /* Configure CS0 and CS3 */ - *(AT91C_SPI_CSR + 0) = AT91C_SPI_CPOL | (AT91C_SPI_DLYBS & 0x100000) | ((AT91C_MASTER_CLOCK / (2*SPI_CLK)) << 8); + *(AT91C_SPI_CSR + 0) = AT91C_SPI_CPOL | (AT91C_SPI_DLYBS & DATAFLASH_TCSS) | (AT91C_SPI_DLYBCT & + DATAFLASH_TCHS) | ((AT91C_MASTER_CLOCK / (2*AT91C_SPI_CLK)) << 8); - *(AT91C_SPI_CSR + 3) = AT91C_SPI_CPOL | (AT91C_SPI_DLYBS & 0x100000) | ((AT91C_MASTER_CLOCK / (2*SPI_CLK)) << 8); + *(AT91C_SPI_CSR + 3) = AT91C_SPI_CPOL | (AT91C_SPI_DLYBS & DATAFLASH_TCSS) | (AT91C_SPI_DLYBCT & + DATAFLASH_TCHS) | ((AT91C_MASTER_CLOCK / (2*AT91C_SPI_CLK)) << 8); } diff --git a/cpu/mpc85xx/tsec.c b/cpu/mpc85xx/tsec.c index 0d858ed..3255db8 100644 --- a/cpu/mpc85xx/tsec.c +++ b/cpu/mpc85xx/tsec.c @@ -25,13 +25,6 @@ #define TX_BUF_CNT 2 -#undef TSEC_DEBUG -#ifdef TSEC_DEBUG -#define DBGPRINT(x,y) printf(x,y) -#else -#define DBGPRINT(x,y) -#endif - static uint rxIdx; /* index of the current RX buffer */ static uint txIdx; /* index of the current TX buffer */ @@ -564,7 +557,7 @@ static int tsec_send(struct eth_device* dev, volatile void *packet, int length) /* Find an empty buffer descriptor */ for(i=0; rtx.txbd[txIdx].status & TXBD_READY; i++) { if (i >= TOUT_LOOP) { - DBGPRINT("%s: tsec: tx buffers full\n", dev->name); + debug ("%s: tsec: tx buffers full\n", dev->name); return result; } } @@ -579,7 +572,7 @@ static int tsec_send(struct eth_device* dev, volatile void *packet, int length) /* Wait for buffer to be transmitted */ for(i=0; rtx.txbd[txIdx].status & TXBD_READY; i++) { if (i >= TOUT_LOOP) { - DBGPRINT("%s: tsec: tx error\n", dev->name); + debug ("%s: tsec: tx error\n", dev->name); return result; } } |