Merge branch 'spi-5.2' into spi-next

Mark Brown committed 7 years ago

Commit 2e5f0812 parents 58b860e d61ad2355 files · +2408 −649Browse files

Showing the changes to include/linux (5 of 55 files). Show all

Unified · Split

5 files

include/linux/platform_data/spi-ep93xx.h +0 −4
include/linux/spi/pxa2xx_spi.h +1 −0
include/linux/spi/spi-mem.h +12 −0
include/linux/spi/spi.h +19 −5
include/linux/spi/spi_bitbang.h +1 −0

include/linux/platform_data/spi-ep93xx.h+0−4

@@ -6,13 +6,9 @@ struct spi_device; · 5 unmodified lines
6	6
7	7	/**
8	8	* struct ep93xx_spi_info - EP93xx specific SPI descriptor
9		− * @chipselect: array of gpio numbers to use as chip selects
10		− * @num_chipselect: ARRAY_SIZE(chipselect)
11	9	* @use_dma: use DMA for the transfers
12	10	*/
13	11	struct ep93xx_spi_info {
14		− int *chipselect;
15		− int num_chipselect;
16	12	bool use_dma;
17	13	};
18	14

include/linux/spi/pxa2xx_spi.h+1−0

@@ -25,6 +25,7 @@ struct dma_chan; · 24 unmodified lines
25	25	struct pxa2xx_spi_controller {
26	26	u16 num_chipselect;
27	27	u8 enable_dma;
	28	+ u8 dma_burst_size;
28	29	bool is_slave;
29	30
30	31	/* DMA engine specific config */

include/linux/spi/spi-mem.h+12−0

@@ -295,6 +295,10 @@ int spi_controller_dma_map_mem_op_data(struct spi_controller *ctlr, · 294 unmodified lines
295	295	void spi_controller_dma_unmap_mem_op_data(struct spi_controller *ctlr,
296	296	const struct spi_mem_op *op,
297	297	struct sg_table *sg);
	298	+
	299	+bool spi_mem_default_supports_op(struct spi_mem *mem,
	300	+ const struct spi_mem_op *op);
	301	+
298	302	#else
299	303	static inline int
300	304	spi_controller_dma_map_mem_op_data(struct spi_controller *ctlr,
@@ -310,6 +314,14 @@ spi_controller_dma_unmap_mem_op_data(struct spi_controller *ctlr, · 9 unmodified lines
310	314	struct sg_table *sg)
311	315	{
312	316	}
	317	+
	318	+static inline
	319	+bool spi_mem_default_supports_op(struct spi_mem *mem,
	320	+ const struct spi_mem_op *op)
	321	+{
	322	+ return false;
	323	+}
	324	+
313	325	#endif /* CONFIG_SPI_MEM */
314	326
315	327	int spi_mem_adjust_op_size(struct spi_mem mem, struct spi_mem_op op);

include/linux/spi/spi.h+19−5

@@ -143,7 +143,7 @@ struct spi_device { · 142 unmodified lines
143	143	u32 max_speed_hz;
144	144	u8 chip_select;
145	145	u8 bits_per_word;
146		− u16 mode;
	146	+ u32 mode;
147	147	#define SPI_CPHA 0x01 /* clock phase */
148	148	#define SPI_CPOL 0x02 /* clock polarity */
149	149	#define SPI_MODE_0 (0\|0) /* (original MicroWire) */
@@ -330,6 +330,9 @@ static inline void spi_unregister_driver(struct spi_driver *sdrv) · 180 unmodified lines
330	330	* must fail if an unrecognized or unsupported mode is requested.
331	331	* It's always safe to call this unless transfers are pending on
332	332	* the device whose settings are being modified.
	333	+ * @set_cs_timing: optional hook for SPI devices to request SPI master
	334	+ * controller for configuring specific CS setup time, hold time and inactive
	335	+ * delay interms of clock counts
333	336	* @transfer: adds a message to the controller's transfer queue.
334	337	* @cleanup: frees controller-specific state
335	338	* @can_dma: determine whether this controller supports DMA
@@ -363,6 +366,7 @@ static inline void spi_unregister_driver(struct spi_driver *sdrv) · 27 unmodified lines
363	366	* @unprepare_transfer_hardware: there are currently no more messages on the
364	367	* queue so the subsystem notifies the driver that it may relax the
365	368	* hardware by issuing this call
	369	+ *
366	370	* @set_cs: set the logic level of the chip select line. May be called
367	371	* from interrupt context.
368	372	* @prepare_message: set up the controller to transfer a single message,
@@ -439,13 +443,12 @@ struct spi_controller { · 70 unmodified lines
439	443	u16 dma_alignment;
440	444
441	445	/* spi_device.mode flags understood by this controller driver */
442		− u16 mode_bits;
	446	+ u32 mode_bits;
443	447
444	448	/* bitmask of supported bits_per_word for transfers */
445	449	u32 bits_per_word_mask;
446	450	#define SPI_BPW_MASK(bits) BIT((bits) - 1)
447		−#define SPI_BIT_MASK(bits) (((bits) == 32) ? ~0U : (BIT(bits) - 1))
448		−#define SPI_BPW_RANGE_MASK(min, max) (SPI_BIT_MASK(max) - SPI_BIT_MASK(min - 1))
	451	+#define SPI_BPW_RANGE_MASK(min, max) GENMASK((max) - 1, (min) - 1)
449	452
450	453	/* limits on transfer speed */
451	454	u32 min_speed_hz;
@@ -489,6 +492,17 @@ struct spi_controller { · 37 unmodified lines
489	492	*/
490	493	int (setup)(struct spi_device spi);
491	494
	495	+ /*
	496	+ * set_cs_timing() method is for SPI controllers that supports
	497	+ * configuring CS timing.
	498	+ *
	499	+ * This hook allows SPI client drivers to request SPI controllers
	500	+ * to configure specific CS timing through spi_set_cs_timing() after
	501	+ * spi_setup().
	502	+ */
	503	+ void (set_cs_timing)(struct spi_device spi, u8 setup_clk_cycles,
	504	+ u8 hold_clk_cycles, u8 inactive_clk_cycles);
	505	+
492	506	/* bidirectional bulk transfers
493	507	*
494	508	* + The transfer() method may not sleep; its main role is
@@ -1277,7 +1291,7 @@ struct spi_board_info { · 782 unmodified lines
1277	1291	/* mode becomes spi_device.mode, and is essential for chips
1278	1292	* where the default of SPI_CS_HIGH = 0 is wrong.
1279	1293	*/
1280		− u16 mode;
	1294	+ u32 mode;
1281	1295
1282	1296	/* ... may need additional spi_device chip config data here.
1283	1297	* avoid stuff protocol drivers can set; but include stuff

include/linux/spi/spi_bitbang.h+1−0

@@ -44,6 +44,7 @@ extern int spi_bitbang_setup_transfer(struct spi_device *spi, · 43 unmodified lines
44	44
45	45	/* start or stop queue processing */
46	46	extern int spi_bitbang_start(struct spi_bitbang *spi);
	47	+extern int spi_bitbang_init(struct spi_bitbang *spi);
47	48	extern void spi_bitbang_stop(struct spi_bitbang *spi);
48	49
49	50	#endif /* __SPI_BITBANG_H */

Merge branch 'spi-5.2' into spi-next

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code