spi: add flags parameter to txrx_word function pointers

LorenzoBianconi · broonie · commit 304d34360b09 · 2018-08-01T14:50:24.000+01:00
Add the capability to specify the flag parameter used in
bitbang_txrx_be_cpha{0,1} through the txrx_word function pointers of
spi_bitbang data structure. That feature will be used to add spi-3wire
support to the spi-gpio controller

Signed-off-by: Lorenzo Bianconi &lt;lorenzo.bianconi@redhat.com&gt;
Signed-off-by: Mark Brown &lt;broonie@kernel.org&gt;
diff --git a/drivers/spi/spi-ath79.c b/drivers/spi/spi-ath79.c
@@ -176,7 +176,7 @@ static void ath79_spi_cleanup(struct spi_device *spi)
 }
 
 static u32 ath79_spi_txrx_mode0(struct spi_device *spi, unsigned int nsecs,
-			       u32 word, u8 bits)
+			       u32 word, u8 bits, unsigned flags)
 {
 	struct ath79_spi *sp = ath79_spidev_to_sp(spi);
 	u32 ioc = sp->ioc_base;
diff --git a/drivers/spi/spi-bitbang.c b/drivers/spi/spi-bitbang.c
@@ -49,22 +49,26 @@
 struct spi_bitbang_cs {
 	unsigned	nsecs;	/* (clock cycle time)/2 */
 	u32		(*txrx_word)(struct spi_device *spi, unsigned nsecs,
-					u32 word, u8 bits);
+					u32 word, u8 bits, unsigned flags);
 	unsigned	(*txrx_bufs)(struct spi_device *,
 					u32 (*txrx_word)(
 						struct spi_device *spi,
 						unsigned nsecs,
-						u32 word, u8 bits),
-					unsigned, struct spi_transfer *);
+						u32 word, u8 bits,
+						unsigned flags),
+					unsigned, struct spi_transfer *,
+					unsigned);
 };
 
 static unsigned bitbang_txrx_8(
 	struct spi_device	*spi,
 	u32			(*txrx_word)(struct spi_device *spi,
 					unsigned nsecs,
-					u32 word, u8 bits),
+					u32 word, u8 bits,
+					unsigned flags),
 	unsigned		ns,
-	struct spi_transfer	*t
+	struct spi_transfer	*t,
+	unsigned flags
 ) {
 	unsigned		bits = t->bits_per_word;
 	unsigned		count = t->len;
@@ -76,7 +80,7 @@ static unsigned bitbang_txrx_8(
 
 		if (tx)
 			word = *tx++;
-		word = txrx_word(spi, ns, word, bits);
+		word = txrx_word(spi, ns, word, bits, flags);
 		if (rx)
 			*rx++ = word;
 		count -= 1;
@@ -88,9 +92,11 @@ static unsigned bitbang_txrx_16(
 	struct spi_device	*spi,
 	u32			(*txrx_word)(struct spi_device *spi,
 					unsigned nsecs,
-					u32 word, u8 bits),
+					u32 word, u8 bits,
+					unsigned flags),
 	unsigned		ns,
-	struct spi_transfer	*t
+	struct spi_transfer	*t,
+	unsigned flags
 ) {
 	unsigned		bits = t->bits_per_word;
 	unsigned		count = t->len;
@@ -102,7 +108,7 @@ static unsigned bitbang_txrx_16(
 
 		if (tx)
 			word = *tx++;
-		word = txrx_word(spi, ns, word, bits);
+		word = txrx_word(spi, ns, word, bits, flags);
 		if (rx)
 			*rx++ = word;
 		count -= 2;
@@ -114,9 +120,11 @@ static unsigned bitbang_txrx_32(
 	struct spi_device	*spi,
 	u32			(*txrx_word)(struct spi_device *spi,
 					unsigned nsecs,
-					u32 word, u8 bits),
+					u32 word, u8 bits,
+					unsigned flags),
 	unsigned		ns,
-	struct spi_transfer	*t
+	struct spi_transfer	*t,
+	unsigned flags
 ) {
 	unsigned		bits = t->bits_per_word;
 	unsigned		count = t->len;
@@ -128,7 +136,7 @@ static unsigned bitbang_txrx_32(
 
 		if (tx)
 			word = *tx++;
-		word = txrx_word(spi, ns, word, bits);
+		word = txrx_word(spi, ns, word, bits, flags);
 		if (rx)
 			*rx++ = word;
 		count -= 4;
@@ -236,7 +244,7 @@ static int spi_bitbang_bufs(struct spi_device *spi, struct spi_transfer *t)
 	struct spi_bitbang_cs	*cs = spi->controller_state;
 	unsigned		nsecs = cs->nsecs;
 
-	return cs->txrx_bufs(spi, cs->txrx_word, nsecs, t);
+	return cs->txrx_bufs(spi, cs->txrx_word, nsecs, t, 0);
 }
 
 /*----------------------------------------------------------------------*/
diff --git a/drivers/spi/spi-butterfly.c b/drivers/spi/spi-butterfly.c
@@ -144,9 +144,9 @@ static void butterfly_chipselect(struct spi_device *spi, int value)
 
 static u32
 butterfly_txrx_word_mode0(struct spi_device *spi, unsigned nsecs, u32 word,
-			  u8 bits)
+			  u8 bits, unsigned flags)
 {
-	return bitbang_txrx_be_cpha0(spi, nsecs, 0, 0, word, bits);
+	return bitbang_txrx_be_cpha0(spi, nsecs, 0, flags, word, bits);
 }
 
 /*----------------------------------------------------------------------*/
diff --git a/drivers/spi/spi-gpio.c b/drivers/spi/spi-gpio.c
@@ -149,27 +149,27 @@ static inline int getmiso(const struct spi_device *spi)
  */
 
 static u32 spi_gpio_txrx_word_mode0(struct spi_device *spi,
-		unsigned nsecs, u32 word, u8 bits)
+		unsigned nsecs, u32 word, u8 bits, unsigned flags)
 {
-	return bitbang_txrx_be_cpha0(spi, nsecs, 0, 0, word, bits);
+	return bitbang_txrx_be_cpha0(spi, nsecs, 0, flags, word, bits);
 }
 
 static u32 spi_gpio_txrx_word_mode1(struct spi_device *spi,
-		unsigned nsecs, u32 word, u8 bits)
+		unsigned nsecs, u32 word, u8 bits, unsigned flags)
 {
-	return bitbang_txrx_be_cpha1(spi, nsecs, 0, 0, word, bits);
+	return bitbang_txrx_be_cpha1(spi, nsecs, 0, flags, word, bits);
 }
 
 static u32 spi_gpio_txrx_word_mode2(struct spi_device *spi,
-		unsigned nsecs, u32 word, u8 bits)
+		unsigned nsecs, u32 word, u8 bits, unsigned flags)
 {
-	return bitbang_txrx_be_cpha0(spi, nsecs, 1, 0, word, bits);
+	return bitbang_txrx_be_cpha0(spi, nsecs, 1, flags, word, bits);
 }
 
 static u32 spi_gpio_txrx_word_mode3(struct spi_device *spi,
-		unsigned nsecs, u32 word, u8 bits)
+		unsigned nsecs, u32 word, u8 bits, unsigned flags)
 {
-	return bitbang_txrx_be_cpha1(spi, nsecs, 1, 0, word, bits);
+	return bitbang_txrx_be_cpha1(spi, nsecs, 1, flags, word, bits);
 }
 
 /*
@@ -183,30 +183,30 @@ static u32 spi_gpio_txrx_word_mode3(struct spi_device *spi,
  */
 
 static u32 spi_gpio_spec_txrx_word_mode0(struct spi_device *spi,
-		unsigned nsecs, u32 word, u8 bits)
+		unsigned nsecs, u32 word, u8 bits, unsigned flags)
 {
-	unsigned flags = spi->master->flags;
+	flags = spi->master->flags;
 	return bitbang_txrx_be_cpha0(spi, nsecs, 0, flags, word, bits);
 }
 
 static u32 spi_gpio_spec_txrx_word_mode1(struct spi_device *spi,
-		unsigned nsecs, u32 word, u8 bits)
+		unsigned nsecs, u32 word, u8 bits, unsigned flags)
 {
-	unsigned flags = spi->master->flags;
+	flags = spi->master->flags;
 	return bitbang_txrx_be_cpha1(spi, nsecs, 0, flags, word, bits);
 }
 
 static u32 spi_gpio_spec_txrx_word_mode2(struct spi_device *spi,
-		unsigned nsecs, u32 word, u8 bits)
+		unsigned nsecs, u32 word, u8 bits, unsigned flags)
 {
-	unsigned flags = spi->master->flags;
+	flags = spi->master->flags;
 	return bitbang_txrx_be_cpha0(spi, nsecs, 1, flags, word, bits);
 }
 
 static u32 spi_gpio_spec_txrx_word_mode3(struct spi_device *spi,
-		unsigned nsecs, u32 word, u8 bits)
+		unsigned nsecs, u32 word, u8 bits, unsigned flags)
 {
-	unsigned flags = spi->master->flags;
+	flags = spi->master->flags;
 	return bitbang_txrx_be_cpha1(spi, nsecs, 1, flags, word, bits);
 }
 
diff --git a/drivers/spi/spi-lm70llp.c b/drivers/spi/spi-lm70llp.c
@@ -188,9 +188,10 @@ static void lm70_chipselect(struct spi_device *spi, int value)
 /*
  * Our actual bitbanger routine.
  */
-static u32 lm70_txrx(struct spi_device *spi, unsigned nsecs, u32 word, u8 bits)
+static u32 lm70_txrx(struct spi_device *spi, unsigned nsecs, u32 word, u8 bits,
+		     unsigned flags)
 {
-	return bitbang_txrx_be_cpha0(spi, nsecs, 0, 0, word, bits);
+	return bitbang_txrx_be_cpha0(spi, nsecs, 0, flags, word, bits);
 }
 
 static void spi_lm70llp_attach(struct parport *p)
diff --git a/drivers/spi/spi-sh-sci.c b/drivers/spi/spi-sh-sci.c
@@ -80,27 +80,31 @@ static inline u32 getmiso(struct spi_device *dev)
 #include "spi-bitbang-txrx.h"
 
 static u32 sh_sci_spi_txrx_mode0(struct spi_device *spi,
-				      unsigned nsecs, u32 word, u8 bits)
+				 unsigned nsecs, u32 word, u8 bits,
+				 unsigned flags)
 {
-	return bitbang_txrx_be_cpha0(spi, nsecs, 0, 0, word, bits);
+	return bitbang_txrx_be_cpha0(spi, nsecs, 0, flags, word, bits);
 }
 
 static u32 sh_sci_spi_txrx_mode1(struct spi_device *spi,
-				      unsigned nsecs, u32 word, u8 bits)
+				 unsigned nsecs, u32 word, u8 bits,
+				 unsigned flags)
 {
-	return bitbang_txrx_be_cpha1(spi, nsecs, 0, 0, word, bits);
+	return bitbang_txrx_be_cpha1(spi, nsecs, 0, flags, word, bits);
 }
 
 static u32 sh_sci_spi_txrx_mode2(struct spi_device *spi,
-				      unsigned nsecs, u32 word, u8 bits)
+				 unsigned nsecs, u32 word, u8 bits,
+				 unsigned flags)
 {
-	return bitbang_txrx_be_cpha0(spi, nsecs, 1, 0, word, bits);
+	return bitbang_txrx_be_cpha0(spi, nsecs, 1, flags, word, bits);
 }
 
 static u32 sh_sci_spi_txrx_mode3(struct spi_device *spi,
-				      unsigned nsecs, u32 word, u8 bits)
+				 unsigned nsecs, u32 word, u8 bits,
+				 unsigned flags)
 {
-	return bitbang_txrx_be_cpha1(spi, nsecs, 1, 0, word, bits);
+	return bitbang_txrx_be_cpha1(spi, nsecs, 1, flags, word, bits);
 }
 
 static void sh_sci_spi_chipselect(struct spi_device *dev, int value)
diff --git a/drivers/spi/spi-xtensa-xtfpga.c b/drivers/spi/spi-xtensa-xtfpga.c
@@ -54,7 +54,7 @@ static inline void xtfpga_spi_wait_busy(struct xtfpga_spi *xspi)
 }
 
 static u32 xtfpga_spi_txrx_word(struct spi_device *spi, unsigned nsecs,
-				u32 v, u8 bits)
+				u32 v, u8 bits, unsigned flags)
 {
 	struct xtfpga_spi *xspi = spi_master_get_devdata(spi->master);
 
diff --git a/include/linux/spi/spi_bitbang.h b/include/linux/spi/spi_bitbang.h
@@ -30,7 +30,7 @@ struct spi_bitbang {
 	/* txrx_word[SPI_MODE_*]() just looks like a shift register */
 	u32	(*txrx_word[4])(struct spi_device *spi,
 			unsigned nsecs,
-			u32 word, u8 bits);
+			u32 word, u8 bits, unsigned flags);
 };
 
 /* you can call these default bitbang->master methods from your custom

Original file line number	Diff line number	Diff line change
`@@ -176,7 +176,7 @@ static void ath79_spi_cleanup(struct spi_device *spi)`
`176`	`176`	`}`
`177`	`177`
`178`	`178`	`static u32 ath79_spi_txrx_mode0(struct spi_device *spi, unsigned int nsecs,`
`179`		`- u32 word, u8 bits)`
	`179`	`+ u32 word, u8 bits, unsigned flags)`
`180`	`180`	`{`
`181`	`181`	`struct ath79_spi *sp = ath79_spidev_to_sp(spi);`
`182`	`182`	`u32 ioc = sp->ioc_base;`
Original file line number	Diff line number	Diff line change
`@@ -144,9 +144,9 @@ static void butterfly_chipselect(struct spi_device *spi, int value)`
`144`	`144`
`145`	`145`	`static u32`
`146`	`146`	`butterfly_txrx_word_mode0(struct spi_device *spi, unsigned nsecs, u32 word,`
`147`		`- u8 bits)`
	`147`	`+ u8 bits, unsigned flags)`
`148`	`148`	`{`
`149`		`- return bitbang_txrx_be_cpha0(spi, nsecs, 0, 0, word, bits);`
	`149`	`+ return bitbang_txrx_be_cpha0(spi, nsecs, 0, flags, word, bits);`
`150`	`150`	`}`
`151`	`151`
`152`	`152`	`/----------------------------------------------------------------------/`
Original file line number	Diff line number	Diff line change
`@@ -149,27 +149,27 @@ static inline int getmiso(const struct spi_device *spi)`
`149`	`149`	`*/`
`150`	`150`
`151`	`151`	`static u32 spi_gpio_txrx_word_mode0(struct spi_device *spi,`
`152`		`- unsigned nsecs, u32 word, u8 bits)`
	`152`	`+ unsigned nsecs, u32 word, u8 bits, unsigned flags)`
`153`	`153`	`{`
`154`		`- return bitbang_txrx_be_cpha0(spi, nsecs, 0, 0, word, bits);`
	`154`	`+ return bitbang_txrx_be_cpha0(spi, nsecs, 0, flags, word, bits);`
`155`	`155`	`}`
`156`	`156`
`157`	`157`	`static u32 spi_gpio_txrx_word_mode1(struct spi_device *spi,`
`158`		`- unsigned nsecs, u32 word, u8 bits)`
	`158`	`+ unsigned nsecs, u32 word, u8 bits, unsigned flags)`
`159`	`159`	`{`
`160`		`- return bitbang_txrx_be_cpha1(spi, nsecs, 0, 0, word, bits);`
	`160`	`+ return bitbang_txrx_be_cpha1(spi, nsecs, 0, flags, word, bits);`
`161`	`161`	`}`
`162`	`162`
`163`	`163`	`static u32 spi_gpio_txrx_word_mode2(struct spi_device *spi,`
`164`		`- unsigned nsecs, u32 word, u8 bits)`
	`164`	`+ unsigned nsecs, u32 word, u8 bits, unsigned flags)`
`165`	`165`	`{`
`166`		`- return bitbang_txrx_be_cpha0(spi, nsecs, 1, 0, word, bits);`
	`166`	`+ return bitbang_txrx_be_cpha0(spi, nsecs, 1, flags, word, bits);`
`167`	`167`	`}`
`168`	`168`
`169`	`169`	`static u32 spi_gpio_txrx_word_mode3(struct spi_device *spi,`
`170`		`- unsigned nsecs, u32 word, u8 bits)`
	`170`	`+ unsigned nsecs, u32 word, u8 bits, unsigned flags)`
`171`	`171`	`{`
`172`		`- return bitbang_txrx_be_cpha1(spi, nsecs, 1, 0, word, bits);`
	`172`	`+ return bitbang_txrx_be_cpha1(spi, nsecs, 1, flags, word, bits);`
`173`	`173`	`}`
`174`	`174`
`175`	`175`	`/*`
`@@ -183,30 +183,30 @@ static u32 spi_gpio_txrx_word_mode3(struct spi_device *spi,`
`183`	`183`	`*/`
`184`	`184`
`185`	`185`	`static u32 spi_gpio_spec_txrx_word_mode0(struct spi_device *spi,`
`186`		`- unsigned nsecs, u32 word, u8 bits)`
	`186`	`+ unsigned nsecs, u32 word, u8 bits, unsigned flags)`
`187`	`187`	`{`
`188`		`- unsigned flags = spi->master->flags;`
	`188`	`+ flags = spi->master->flags;`
`189`	`189`	`return bitbang_txrx_be_cpha0(spi, nsecs, 0, flags, word, bits);`
`190`	`190`	`}`
`191`	`191`
`192`	`192`	`static u32 spi_gpio_spec_txrx_word_mode1(struct spi_device *spi,`
`193`		`- unsigned nsecs, u32 word, u8 bits)`
	`193`	`+ unsigned nsecs, u32 word, u8 bits, unsigned flags)`
`194`	`194`	`{`
`195`		`- unsigned flags = spi->master->flags;`
	`195`	`+ flags = spi->master->flags;`
`196`	`196`	`return bitbang_txrx_be_cpha1(spi, nsecs, 0, flags, word, bits);`
`197`	`197`	`}`
`198`	`198`
`199`	`199`	`static u32 spi_gpio_spec_txrx_word_mode2(struct spi_device *spi,`
`200`		`- unsigned nsecs, u32 word, u8 bits)`
	`200`	`+ unsigned nsecs, u32 word, u8 bits, unsigned flags)`
`201`	`201`	`{`
`202`		`- unsigned flags = spi->master->flags;`
	`202`	`+ flags = spi->master->flags;`
`203`	`203`	`return bitbang_txrx_be_cpha0(spi, nsecs, 1, flags, word, bits);`
`204`	`204`	`}`
`205`	`205`
`206`	`206`	`static u32 spi_gpio_spec_txrx_word_mode3(struct spi_device *spi,`
`207`		`- unsigned nsecs, u32 word, u8 bits)`
	`207`	`+ unsigned nsecs, u32 word, u8 bits, unsigned flags)`
`208`	`208`	`{`
`209`		`- unsigned flags = spi->master->flags;`
	`209`	`+ flags = spi->master->flags;`
`210`	`210`	`return bitbang_txrx_be_cpha1(spi, nsecs, 1, flags, word, bits);`
`211`	`211`	`}`
`212`	`212`
Original file line number	Diff line number	Diff line change
`@@ -188,9 +188,10 @@ static void lm70_chipselect(struct spi_device *spi, int value)`
`188`	`188`	`/*`
`189`	`189`	`* Our actual bitbanger routine.`
`190`	`190`	`*/`
`191`		`-static u32 lm70_txrx(struct spi_device *spi, unsigned nsecs, u32 word, u8 bits)`
	`191`	`+static u32 lm70_txrx(struct spi_device *spi, unsigned nsecs, u32 word, u8 bits,`
	`192`	`+ unsigned flags)`
`192`	`193`	`{`
`193`		`- return bitbang_txrx_be_cpha0(spi, nsecs, 0, 0, word, bits);`
	`194`	`+ return bitbang_txrx_be_cpha0(spi, nsecs, 0, flags, word, bits);`
`194`	`195`	`}`
`195`	`196`
`196`	`197`	`static void spi_lm70llp_attach(struct parport *p)`
Original file line number	Diff line number	Diff line change
`@@ -80,27 +80,31 @@ static inline u32 getmiso(struct spi_device *dev)`
`80`	`80`	`#include "spi-bitbang-txrx.h"`
`81`	`81`
`82`	`82`	`static u32 sh_sci_spi_txrx_mode0(struct spi_device *spi,`
`83`		`- unsigned nsecs, u32 word, u8 bits)`
	`83`	`+ unsigned nsecs, u32 word, u8 bits,`
	`84`	`+ unsigned flags)`
`84`	`85`	`{`
`85`		`- return bitbang_txrx_be_cpha0(spi, nsecs, 0, 0, word, bits);`
	`86`	`+ return bitbang_txrx_be_cpha0(spi, nsecs, 0, flags, word, bits);`
`86`	`87`	`}`
`87`	`88`
`88`	`89`	`static u32 sh_sci_spi_txrx_mode1(struct spi_device *spi,`
`89`		`- unsigned nsecs, u32 word, u8 bits)`
	`90`	`+ unsigned nsecs, u32 word, u8 bits,`
	`91`	`+ unsigned flags)`
`90`	`92`	`{`
`91`		`- return bitbang_txrx_be_cpha1(spi, nsecs, 0, 0, word, bits);`
	`93`	`+ return bitbang_txrx_be_cpha1(spi, nsecs, 0, flags, word, bits);`
`92`	`94`	`}`
`93`	`95`
`94`	`96`	`static u32 sh_sci_spi_txrx_mode2(struct spi_device *spi,`
`95`		`- unsigned nsecs, u32 word, u8 bits)`
	`97`	`+ unsigned nsecs, u32 word, u8 bits,`
	`98`	`+ unsigned flags)`
`96`	`99`	`{`
`97`		`- return bitbang_txrx_be_cpha0(spi, nsecs, 1, 0, word, bits);`
	`100`	`+ return bitbang_txrx_be_cpha0(spi, nsecs, 1, flags, word, bits);`
`98`	`101`	`}`
`99`	`102`
`100`	`103`	`static u32 sh_sci_spi_txrx_mode3(struct spi_device *spi,`
`101`		`- unsigned nsecs, u32 word, u8 bits)`
	`104`	`+ unsigned nsecs, u32 word, u8 bits,`
	`105`	`+ unsigned flags)`
`102`	`106`	`{`
`103`		`- return bitbang_txrx_be_cpha1(spi, nsecs, 1, 0, word, bits);`
	`107`	`+ return bitbang_txrx_be_cpha1(spi, nsecs, 1, flags, word, bits);`
`104`	`108`	`}`
`105`	`109`
`106`	`110`	`static void sh_sci_spi_chipselect(struct spi_device *dev, int value)`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ static inline void xtfpga_spi_wait_busy(struct xtfpga_spi *xspi)`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`static u32 xtfpga_spi_txrx_word(struct spi_device *spi, unsigned nsecs,`
`57`		`- u32 v, u8 bits)`
	`57`	`+ u32 v, u8 bits, unsigned flags)`
`58`	`58`	`{`
`59`	`59`	`struct xtfpga_spi *xspi = spi_master_get_devdata(spi->master);`
`60`	`60`