1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
|
From 3027505ab8c8cb17291e53bca1d7bd770539d468 Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@ingics.com>
Date: Mon, 24 Feb 2014 23:07:36 +0800
Subject: [PATCH 073/182] spi: qup: Get rid of using struct spi_qup_device
Current code uses struct spi_qup_device to store spi->mode and spi->chip_select
settings. We can get these settings in spi_qup_transfer_one and spi_qup_set_cs
without using struct spi_qup_device. Refactor the code a bit to remove
spi_qup_setup(), spi_qup_cleanup(), and struct spi_qup_device.
Signed-off-by: Axel Lin <axel.lin@ingics.com>
Tested-by: Ivan T. Ivanov <iivanov@mm-sol.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
---
drivers/spi/spi-qup.c | 61 ++++++++-----------------------------------------
1 file changed, 9 insertions(+), 52 deletions(-)
--- a/drivers/spi/spi-qup.c
+++ b/drivers/spi/spi-qup.c
@@ -123,11 +123,6 @@
#define SPI_DELAY_THRESHOLD 1
#define SPI_DELAY_RETRY 10
-struct spi_qup_device {
- int select;
- u16 mode;
-};
-
struct spi_qup {
void __iomem *base;
struct device *dev;
@@ -338,14 +333,13 @@ static irqreturn_t spi_qup_qup_irq(int i
/* set clock freq ... bits per word */
-static int spi_qup_io_config(struct spi_qup *controller,
- struct spi_qup_device *chip,
- struct spi_transfer *xfer)
+static int spi_qup_io_config(struct spi_device *spi, struct spi_transfer *xfer)
{
+ struct spi_qup *controller = spi_master_get_devdata(spi->master);
u32 config, iomode, mode;
int ret, n_words, w_size;
- if (chip->mode & SPI_LOOP && xfer->len > controller->in_fifo_sz) {
+ if (spi->mode & SPI_LOOP && xfer->len > controller->in_fifo_sz) {
dev_err(controller->dev, "too big size for loopback %d > %d\n",
xfer->len, controller->in_fifo_sz);
return -EIO;
@@ -399,12 +393,12 @@ static int spi_qup_io_config(struct spi_
config = readl_relaxed(controller->base + SPI_CONFIG);
- if (chip->mode & SPI_LOOP)
+ if (spi->mode & SPI_LOOP)
config |= SPI_CONFIG_LOOPBACK;
else
config &= ~SPI_CONFIG_LOOPBACK;
- if (chip->mode & SPI_CPHA)
+ if (spi->mode & SPI_CPHA)
config &= ~SPI_CONFIG_INPUT_FIRST;
else
config |= SPI_CONFIG_INPUT_FIRST;
@@ -413,7 +407,7 @@ static int spi_qup_io_config(struct spi_
* HS_MODE improves signal stability for spi-clk high rates,
* but is invalid in loop back mode.
*/
- if ((xfer->speed_hz >= SPI_HS_MIN_RATE) && !(chip->mode & SPI_LOOP))
+ if ((xfer->speed_hz >= SPI_HS_MIN_RATE) && !(spi->mode & SPI_LOOP))
config |= SPI_CONFIG_HS_MODE;
else
config &= ~SPI_CONFIG_HS_MODE;
@@ -433,7 +427,6 @@ static int spi_qup_io_config(struct spi_
static void spi_qup_set_cs(struct spi_device *spi, bool enable)
{
struct spi_qup *controller = spi_master_get_devdata(spi->master);
- struct spi_qup_device *chip = spi_get_ctldata(spi);
u32 iocontol, mask;
@@ -444,9 +437,9 @@ static void spi_qup_set_cs(struct spi_de
iocontol |= SPI_IO_C_FORCE_CS;
iocontol &= ~SPI_IO_C_CS_SELECT_MASK;
- iocontol |= SPI_IO_C_CS_SELECT(chip->select);
+ iocontol |= SPI_IO_C_CS_SELECT(spi->chip_select);
- mask = SPI_IO_C_CS_N_POLARITY_0 << chip->select;
+ mask = SPI_IO_C_CS_N_POLARITY_0 << spi->chip_select;
if (enable)
iocontol |= mask;
@@ -461,11 +454,10 @@ static int spi_qup_transfer_one(struct s
struct spi_transfer *xfer)
{
struct spi_qup *controller = spi_master_get_devdata(master);
- struct spi_qup_device *chip = spi_get_ctldata(spi);
unsigned long timeout, flags;
int ret = -EIO;
- ret = spi_qup_io_config(controller, chip, xfer);
+ ret = spi_qup_io_config(spi, xfer);
if (ret)
return ret;
@@ -511,38 +503,6 @@ exit:
return ret;
}
-static int spi_qup_setup(struct spi_device *spi)
-{
- struct spi_qup *controller = spi_master_get_devdata(spi->master);
- struct spi_qup_device *chip = spi_get_ctldata(spi);
-
- if (!chip) {
- /* First setup */
- chip = kzalloc(sizeof(*chip), GFP_KERNEL);
- if (!chip) {
- dev_err(controller->dev, "no memory for chip data\n");
- return -ENOMEM;
- }
-
- chip->mode = spi->mode;
- chip->select = spi->chip_select;
- spi_set_ctldata(spi, chip);
- }
-
- return 0;
-}
-
-static void spi_qup_cleanup(struct spi_device *spi)
-{
- struct spi_qup_device *chip = spi_get_ctldata(spi);
-
- if (!chip)
- return;
-
- spi_set_ctldata(spi, NULL);
- kfree(chip);
-}
-
static int spi_qup_probe(struct platform_device *pdev)
{
struct spi_master *master;
@@ -561,7 +521,6 @@ static int spi_qup_probe(struct platform
return PTR_ERR(base);
irq = platform_get_irq(pdev, 0);
-
if (irq < 0)
return irq;
@@ -617,8 +576,6 @@ static int spi_qup_probe(struct platform
master->num_chipselect = SPI_NUM_CHIPSELECTS;
master->bits_per_word_mask = SPI_BPW_RANGE_MASK(4, 32);
master->max_speed_hz = max_freq;
- master->setup = spi_qup_setup;
- master->cleanup = spi_qup_cleanup;
master->set_cs = spi_qup_set_cs;
master->transfer_one = spi_qup_transfer_one;
master->dev.of_node = pdev->dev.of_node;
|
