Skip to content

Commit 2a45166

Browse files
andy-shevbroonie
authored andcommitted
spi: pxa2xx: Move contents of linux/spi/pxa2xx_spi.h to a local one
There is no user of the linux/spi/pxa2xx_spi.h. Move its contents to the drivers/spi/spi-pxa2xx.h. Suggested-by: Arnd Bergmann <[email protected]> Signed-off-by: Andy Shevchenko <[email protected]> Reviewed-by: Linus Walleij <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Mark Brown <[email protected]>
1 parent 11346db commit 2a45166

File tree

5 files changed

+37
-53
lines changed

5 files changed

+37
-53
lines changed

drivers/spi/spi-pxa2xx-dma.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
#include <linux/scatterlist.h>
1313
#include <linux/sizes.h>
1414

15-
#include <linux/spi/pxa2xx_spi.h>
1615
#include <linux/spi/spi.h>
1716

1817
#include "spi-pxa2xx.h"

drivers/spi/spi-pxa2xx-pci.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@
1010
#include <linux/pci.h>
1111
#include <linux/platform_device.h>
1212

13-
#include <linux/spi/pxa2xx_spi.h>
14-
1513
#include <linux/dmaengine.h>
1614
#include <linux/platform_data/dma-dw.h>
1715

16+
#include "spi-pxa2xx.h"
17+
1818
#define PCI_DEVICE_ID_INTEL_QUARK_X1000 0x0935
1919
#define PCI_DEVICE_ID_INTEL_BYT 0x0f0e
2020
#define PCI_DEVICE_ID_INTEL_MRFLD 0x1194

drivers/spi/spi-pxa2xx.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
#include <linux/property.h>
2525
#include <linux/slab.h>
2626

27-
#include <linux/spi/pxa2xx_spi.h>
2827
#include <linux/spi/spi.h>
2928

3029
#include "spi-pxa2xx.h"

drivers/spi/spi-pxa2xx.h

Lines changed: 35 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
#ifndef SPI_PXA2XX_H
88
#define SPI_PXA2XX_H
99

10+
#include <linux/dmaengine.h>
1011
#include <linux/interrupt.h>
1112
#include <linux/io.h>
1213
#include <linux/types.h>
@@ -15,7 +16,40 @@
1516
#include <linux/pxa2xx_ssp.h>
1617

1718
struct gpio_desc;
18-
struct pxa2xx_spi_controller;
19+
20+
/*
21+
* The platform data for SSP controller devices
22+
* (resides in device.platform_data).
23+
*/
24+
struct pxa2xx_spi_controller {
25+
u8 num_chipselect;
26+
u8 enable_dma;
27+
u8 dma_burst_size;
28+
bool is_target;
29+
30+
/* DMA engine specific config */
31+
dma_filter_fn dma_filter;
32+
void *tx_param;
33+
void *rx_param;
34+
35+
/* For non-PXA arches */
36+
struct ssp_device ssp;
37+
};
38+
39+
/*
40+
* The controller specific data for SPI target devices
41+
* (resides in spi_board_info.controller_data),
42+
* copied to spi_device.platform_data ... mostly for
43+
* DMA tuning.
44+
*/
45+
struct pxa2xx_spi_chip {
46+
u8 tx_threshold;
47+
u8 tx_hi_threshold;
48+
u8 rx_threshold;
49+
u8 dma_burst_size;
50+
u32 timeout;
51+
};
52+
1953
struct spi_controller;
2054
struct spi_device;
2155
struct spi_transfer;

include/linux/spi/pxa2xx_spi.h

Lines changed: 0 additions & 48 deletions
This file was deleted.

0 commit comments

Comments
 (0)