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
Kirill Smelkov
linux
Commits
03689d2d
Commit
03689d2d
authored
Jun 02, 2014
by
Mark Brown
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branches 'spi/fix/qup' and 'spi/fix/topcliff-pch' into spi-linus
parents
fad01e86
8f391222
2b16069a
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
drivers/spi/Kconfig
drivers/spi/Kconfig
+1
-1
drivers/spi/spi-qup.c
drivers/spi/spi-qup.c
+2
-2
No files found.
drivers/spi/Kconfig
View file @
03689d2d
...
...
@@ -505,7 +505,7 @@ config SPI_TEGRA20_SLINK
config SPI_TOPCLIFF_PCH
tristate "Intel EG20T PCH/LAPIS Semicon IOH(ML7213/ML7223/ML7831) SPI"
depends on PCI
depends on PCI
&& (X86_32 || COMPILE_TEST)
help
SPI driver for the Topcliff PCH (Platform Controller Hub) SPI bus
used in some x86 embedded processors.
...
...
drivers/spi/spi-qup.c
View file @
03689d2d
...
...
@@ -287,7 +287,7 @@ static irqreturn_t spi_qup_qup_irq(int irq, void *dev_id)
writel_relaxed
(
opflags
,
controller
->
base
+
QUP_OPERATIONAL
);
if
(
!
xfer
)
{
dev_err_ratelimited
(
controller
->
dev
,
"unexpected irq %
x08 %x08 %x08
\n
"
,
dev_err_ratelimited
(
controller
->
dev
,
"unexpected irq %
08x %08x %08x
\n
"
,
qup_err
,
spi_err
,
opflags
);
return
IRQ_HANDLED
;
}
...
...
@@ -366,7 +366,7 @@ static int spi_qup_io_config(struct spi_device *spi, struct spi_transfer *xfer)
n_words
=
xfer
->
len
/
w_size
;
controller
->
w_size
=
w_size
;
if
(
n_words
<=
controller
->
in_fifo_sz
)
{
if
(
n_words
<=
(
controller
->
in_fifo_sz
/
sizeof
(
u32
))
)
{
mode
=
QUP_IO_M_MODE_FIFO
;
writel_relaxed
(
n_words
,
controller
->
base
+
QUP_MX_READ_CNT
);
writel_relaxed
(
n_words
,
controller
->
base
+
QUP_MX_WRITE_CNT
);
...
...
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