Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
linux
Commits
072ac04d
Commit
072ac04d
authored
Mar 24, 2015
by
Mark Brown
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branches 'spi/fix/dw', 'spi/fix/queue' and 'spi/fix/qup' into spi-linus
parents
bc465aa9
854d2f24
391949b6
12cb89e3
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
8 deletions
+12
-8
drivers/spi/spi-dw-mid.c
drivers/spi/spi-dw-mid.c
+4
-2
drivers/spi/spi-qup.c
drivers/spi/spi-qup.c
+5
-4
drivers/spi/spi.c
drivers/spi/spi.c
+3
-2
No files found.
drivers/spi/spi-dw-mid.c
View file @
072ac04d
...
...
@@ -108,7 +108,8 @@ static void dw_spi_dma_tx_done(void *arg)
{
struct
dw_spi
*
dws
=
arg
;
if
(
test_and_clear_bit
(
TX_BUSY
,
&
dws
->
dma_chan_busy
)
&
BIT
(
RX_BUSY
))
clear_bit
(
TX_BUSY
,
&
dws
->
dma_chan_busy
);
if
(
test_bit
(
RX_BUSY
,
&
dws
->
dma_chan_busy
))
return
;
dw_spi_xfer_done
(
dws
);
}
...
...
@@ -156,7 +157,8 @@ static void dw_spi_dma_rx_done(void *arg)
{
struct
dw_spi
*
dws
=
arg
;
if
(
test_and_clear_bit
(
RX_BUSY
,
&
dws
->
dma_chan_busy
)
&
BIT
(
TX_BUSY
))
clear_bit
(
RX_BUSY
,
&
dws
->
dma_chan_busy
);
if
(
test_bit
(
TX_BUSY
,
&
dws
->
dma_chan_busy
))
return
;
dw_spi_xfer_done
(
dws
);
}
...
...
drivers/spi/spi-qup.c
View file @
072ac04d
...
...
@@ -498,7 +498,7 @@ static int spi_qup_probe(struct platform_device *pdev)
struct
resource
*
res
;
struct
device
*
dev
;
void
__iomem
*
base
;
u32
max_freq
,
iomode
;
u32
max_freq
,
iomode
,
num_cs
;
int
ret
,
irq
,
size
;
dev
=
&
pdev
->
dev
;
...
...
@@ -550,10 +550,11 @@ static int spi_qup_probe(struct platform_device *pdev)
}
/* use num-cs unless not present or out of range */
if
(
of_property_read_u16
(
dev
->
of_node
,
"num-cs"
,
&
master
->
num_chipselect
)
||
(
master
->
num_chipselect
>
SPI_NUM_CHIPSELECTS
))
if
(
of_property_read_u32
(
dev
->
of_node
,
"num-cs"
,
&
num_cs
)
||
num_cs
>
SPI_NUM_CHIPSELECTS
)
master
->
num_chipselect
=
SPI_NUM_CHIPSELECTS
;
else
master
->
num_chipselect
=
num_cs
;
master
->
bus_num
=
pdev
->
id
;
master
->
mode_bits
=
SPI_CPOL
|
SPI_CPHA
|
SPI_CS_HIGH
|
SPI_LOOP
;
...
...
drivers/spi/spi.c
View file @
072ac04d
...
...
@@ -1105,13 +1105,14 @@ void spi_finalize_current_message(struct spi_master *master)
"failed to unprepare message: %d
\n
"
,
ret
);
}
}
trace_spi_message_done
(
mesg
);
master
->
cur_msg_prepared
=
false
;
mesg
->
state
=
NULL
;
if
(
mesg
->
complete
)
mesg
->
complete
(
mesg
->
context
);
trace_spi_message_done
(
mesg
);
}
EXPORT_SYMBOL_GPL
(
spi_finalize_current_message
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment