Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 212333
b: refs/heads/master
c: 5e8592d
h: refs/heads/master
i:
  212331: 7e218c2
v: v3
  • Loading branch information
Mike Frysinger committed Oct 18, 2010
1 parent 79f0eb0 commit d801bf4
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 91 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 5b47bcd48b3bd53c86040321de0d348aadebed87
refs/heads/master: 5e8592dca303fb429d1641c205fe509f4b781ca2
68 changes: 0 additions & 68 deletions trunk/arch/blackfin/include/asm/bfin5xx_spi.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,6 @@

#define MIN_SPI_BAUD_VAL 2

#define SPI_READ 0
#define SPI_WRITE 1

#define SPI_CTRL_OFF 0x0
#define SPI_FLAG_OFF 0x4
#define SPI_STAT_OFF 0x8
#define SPI_TXBUFF_OFF 0xc
#define SPI_RXBUFF_OFF 0x10
#define SPI_BAUD_OFF 0x14
#define SPI_SHAW_OFF 0x18


#define BIT_CTL_ENABLE 0x4000
#define BIT_CTL_OPENDRAIN 0x2000
#define BIT_CTL_MASTER 0x1000
Expand Down Expand Up @@ -53,62 +41,6 @@
#define BIT_STU_SENDOVER 0x0001
#define BIT_STU_RECVFULL 0x0020

#define CFG_SPI_ENABLE 1
#define CFG_SPI_DISABLE 0

#define CFG_SPI_OUTENABLE 1
#define CFG_SPI_OUTDISABLE 0

#define CFG_SPI_ACTLOW 1
#define CFG_SPI_ACTHIGH 0

#define CFG_SPI_PHASESTART 1
#define CFG_SPI_PHASEMID 0

#define CFG_SPI_MASTER 1
#define CFG_SPI_SLAVE 0

#define CFG_SPI_SENELAST 0
#define CFG_SPI_SENDZERO 1

#define CFG_SPI_RCVFLUSH 1
#define CFG_SPI_RCVDISCARD 0

#define CFG_SPI_LSBFIRST 1
#define CFG_SPI_MSBFIRST 0

#define CFG_SPI_WORDSIZE16 1
#define CFG_SPI_WORDSIZE8 0

#define CFG_SPI_MISOENABLE 1
#define CFG_SPI_MISODISABLE 0

#define CFG_SPI_READ 0x00
#define CFG_SPI_WRITE 0x01
#define CFG_SPI_DMAREAD 0x02
#define CFG_SPI_DMAWRITE 0x03

#define CFG_SPI_CSCLEARALL 0
#define CFG_SPI_CHIPSEL1 1
#define CFG_SPI_CHIPSEL2 2
#define CFG_SPI_CHIPSEL3 3
#define CFG_SPI_CHIPSEL4 4
#define CFG_SPI_CHIPSEL5 5
#define CFG_SPI_CHIPSEL6 6
#define CFG_SPI_CHIPSEL7 7

#define CFG_SPI_CS1VALUE 1
#define CFG_SPI_CS2VALUE 2
#define CFG_SPI_CS3VALUE 3
#define CFG_SPI_CS4VALUE 4
#define CFG_SPI_CS5VALUE 5
#define CFG_SPI_CS6VALUE 6
#define CFG_SPI_CS7VALUE 7

#define CMD_SPI_SET_BAUDRATE 2
#define CMD_SPI_GET_SYSTEMCLOCK 25
#define CMD_SPI_SET_WRITECONTINUOUS 26

#define MAX_CTRL_CS 8 /* cs in spi controller */

/* device.platform_data for SSP controller devices */
Expand Down
40 changes: 18 additions & 22 deletions trunk/drivers/spi/spi_bfin5xx.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -560,8 +560,7 @@ static void bfin_spi_pump_transfers(unsigned long data)
struct spi_transfer *previous = NULL;
struct slave_data *chip = NULL;
unsigned int bits_per_word;
u8 width;
u16 cr, dma_width, dma_config;
u16 cr, cr_width, dma_width, dma_config;
u32 tranf_success = 1;
u8 full_duplex = 0;

Expand Down Expand Up @@ -642,22 +641,19 @@ static void bfin_spi_pump_transfers(unsigned long data)
bits_per_word = transfer->bits_per_word ? : message->spi->bits_per_word;
if (bits_per_word == 8) {
drv_data->n_bytes = 1;
width = CFG_SPI_WORDSIZE8;
drv_data->len = transfer->len;
cr_width = 0;
drv_data->ops = &bfin_transfer_ops_u8;
} else {
drv_data->n_bytes = 2;
width = CFG_SPI_WORDSIZE16;
drv_data->len = (transfer->len) >> 1;
cr_width = BIT_CTL_WORDSIZE;
drv_data->ops = &bfin_transfer_ops_u16;
}
cr = (read_CTRL(drv_data) & (~BIT_CTL_TIMOD));
cr |= (width << 8);
cr = read_CTRL(drv_data) & ~(BIT_CTL_TIMOD | BIT_CTL_WORDSIZE);
cr |= cr_width;
write_CTRL(drv_data, cr);

if (width == CFG_SPI_WORDSIZE16) {
drv_data->len = (transfer->len) >> 1;
} else {
drv_data->len = transfer->len;
}
dev_dbg(&drv_data->pdev->dev,
"transfer: drv_data->ops is %p, chip->ops is %p, u8_ops is %p\n",
drv_data->ops, chip->ops, &bfin_transfer_ops_u8);
Expand All @@ -672,13 +668,12 @@ static void bfin_spi_pump_transfers(unsigned long data)
write_BAUD(drv_data, chip->baud);

write_STAT(drv_data, BIT_STAT_CLR);
cr = (read_CTRL(drv_data) & (~BIT_CTL_TIMOD));
if (drv_data->cs_change)
bfin_spi_cs_active(drv_data, chip);

dev_dbg(&drv_data->pdev->dev,
"now pumping a transfer: width is %d, len is %d\n",
width, transfer->len);
cr_width, transfer->len);

/*
* Try to map dma buffer and do a dma transfer. If successful use,
Expand All @@ -697,7 +692,7 @@ static void bfin_spi_pump_transfers(unsigned long data)
/* config dma channel */
dev_dbg(&drv_data->pdev->dev, "doing dma transfer\n");
set_dma_x_count(drv_data->dma_channel, drv_data->len);
if (width == CFG_SPI_WORDSIZE16) {
if (cr_width == BIT_CTL_WORDSIZE) {
set_dma_x_modify(drv_data->dma_channel, 2);
dma_width = WDSIZE_16;
} else {
Expand Down Expand Up @@ -786,10 +781,16 @@ static void bfin_spi_pump_transfers(unsigned long data)
return;
}

/*
* We always use SPI_WRITE mode (transfer starts with TDBR write).
* SPI_READ mode (transfer starts with RDBR read) seems to have
* problems with setting up the output value in TDBR prior to the
* start of the transfer.
*/
write_CTRL(drv_data, cr | BIT_CTL_TXMOD);

if (chip->pio_interrupt) {
/* use write mode. spi irq should have been disabled */
cr = (read_CTRL(drv_data) & (~BIT_CTL_TIMOD));
write_CTRL(drv_data, (cr | CFG_SPI_WRITE));
/* SPI irq should have been disabled by now */

/* discard old RX data and clear RXS */
bfin_spi_dummy_read(drv_data);
Expand All @@ -813,11 +814,6 @@ static void bfin_spi_pump_transfers(unsigned long data)
/* IO mode */
dev_dbg(&drv_data->pdev->dev, "doing IO transfer\n");

/* we always use SPI_WRITE mode. SPI_READ mode
seems to have problems with setting up the
output value in TDBR prior to the transfer. */
write_CTRL(drv_data, (cr | CFG_SPI_WRITE));

if (full_duplex) {
/* full duplex mode */
BUG_ON((drv_data->tx_end - drv_data->tx) !=
Expand Down

0 comments on commit d801bf4

Please sign in to comment.