Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d0777f2c authored by Sebastian Andrzej Siewior's avatar Sebastian Andrzej Siewior
Browse files

spi/pxa2xx: Consider CE4100's FIFO depth 



For PXA the default threshold is FIFO_DEPTH / 2. Adjust this value for
CE4100.

Signed-off-by: default avatarSebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: default avatarDirk Brandewie <dirk.brandewie@gmail.com>
parent d6ea3df0

drivers/spi/pxa2xx_spi.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -43,8 +43,6 @@ MODULE_ALIAS("platform:pxa2xx-spi"); 




#define MAX_BUSES 3

#define MAX_BUSES 3





#define RX_THRESH_DFLT 	8

#define TX_THRESH_DFLT 	8

#define TIMOUT_DFLT		1000

#define TIMOUT_DFLT		1000





#define DMA_INT_MASK		(DCSR_ENDINTR | DCSR_STARTINTR | DCSR_BUSERR)

#define DMA_INT_MASK		(DCSR_ENDINTR | DCSR_STARTINTR | DCSR_BUSERR)

include/linux/pxa2xx_ssp.h

+26 −6
Original line number Original line Diff line number Diff line
@@ -71,10 +71,6 @@ 
#define SSCR1_SPO	(1 << 3)	/* Motorola SPI SSPSCLK polarity setting */

#define SSCR1_SPO	(1 << 3)	/* Motorola SPI SSPSCLK polarity setting */

#define SSCR1_SPH	(1 << 4)	/* Motorola SPI SSPSCLK phase setting */

#define SSCR1_SPH	(1 << 4)	/* Motorola SPI SSPSCLK phase setting */

#define SSCR1_MWDS	(1 << 5)	/* Microwire Transmit Data Size */

#define SSCR1_MWDS	(1 << 5)	/* Microwire Transmit Data Size */

#define SSCR1_TFT	(0x000003c0)	/* Transmit FIFO Threshold (mask) */

#define SSCR1_TxTresh(x) (((x) - 1) << 6) /* level [1..16] */

#define SSCR1_RFT	(0x00003c00)	/* Receive FIFO Threshold (mask) */

#define SSCR1_RxTresh(x) (((x) - 1) << 10) /* level [1..16] */





#define SSSR_TNF	(1 << 2)	/* Transmit FIFO Not Full */

#define SSSR_TNF	(1 << 2)	/* Transmit FIFO Not Full */

#define SSSR_RNE	(1 << 3)	/* Receive FIFO Not Empty */

#define SSSR_RNE	(1 << 3)	/* Receive FIFO Not Empty */
@@ -82,9 +78,33 @@ 
#define SSSR_TFS	(1 << 5)	/* Transmit FIFO Service Request */

#define SSSR_TFS	(1 << 5)	/* Transmit FIFO Service Request */

#define SSSR_RFS	(1 << 6)	/* Receive FIFO Service Request */

#define SSSR_RFS	(1 << 6)	/* Receive FIFO Service Request */

#define SSSR_ROR	(1 << 7)	/* Receive FIFO Overrun */

#define SSSR_ROR	(1 << 7)	/* Receive FIFO Overrun */



#ifdef CONFIG_ARCH_PXA

#define RX_THRESH_DFLT	8

#define TX_THRESH_DFLT	8



#define SSSR_TFL_MASK	(0xf << 8)	/* Transmit FIFO Level mask */

#define SSSR_TFL_MASK	(0xf << 8)	/* Transmit FIFO Level mask */

#define SSSR_RFL_MASK	(0xf << 12)	/* Receive FIFO Level mask */

#define SSSR_RFL_MASK	(0xf << 12)	/* Receive FIFO Level mask */





#define SSCR1_TFT	(0x000003c0)	/* Transmit FIFO Threshold (mask) */

#define SSCR1_TxTresh(x) (((x) - 1) << 6) /* level [1..16] */

#define SSCR1_RFT	(0x00003c00)	/* Receive FIFO Threshold (mask) */

#define SSCR1_RxTresh(x) (((x) - 1) << 10) /* level [1..16] */



#else



#define RX_THRESH_DFLT	2

#define TX_THRESH_DFLT	2



#define SSSR_TFL_MASK	(0x3 << 8)	/* Transmit FIFO Level mask */

#define SSSR_RFL_MASK	(0x3 << 12)	/* Receive FIFO Level mask */



#define SSCR1_TFT	(0x000000c0)	/* Transmit FIFO Threshold (mask) */

#define SSCR1_TxTresh(x) (((x) - 1) << 6) /* level [1..4] */

#define SSCR1_RFT	(0x00000c00)	/* Receive FIFO Threshold (mask) */

#define SSCR1_RxTresh(x) (((x) - 1) << 10) /* level [1..4] */

#endif



/* extra bits in PXA255, PXA26x and PXA27x SSP ports */

/* extra bits in PXA255, PXA26x and PXA27x SSP ports */

#define SSCR0_TISSP		(1 << 4)	/* TI Sync Serial Protocol */

#define SSCR0_TISSP		(1 << 4)	/* TI Sync Serial Protocol */

#define SSCR0_PSP		(3 << 4)	/* PSP - Programmable Serial Protocol */

#define SSCR0_PSP		(3 << 4)	/* PSP - Programmable Serial Protocol */