Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
linux-seco-imx
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Iterations
Jira
Code
Merge requests
11
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Package Registry
Model registry
Operate
Terraform modules
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Clea OS
bsp
nxp
linux-seco-imx
Commits
fd30c373
Commit
fd30c373
authored
10 years ago
by
Mark Brown
Browse files
Options
Downloads
Plain Diff
Merge remote-tracking branches 'spi/fix/pxa2xx' and 'spi/fix/qup' into spi-linus
parents
6c7bdf2d
111e0a9d
3d89e141
Loading
Loading
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
drivers/spi/spi-pxa2xx-dma.c
+0
-16
0 additions, 16 deletions
drivers/spi/spi-pxa2xx-dma.c
drivers/spi/spi-qup.c
+1
-1
1 addition, 1 deletion
drivers/spi/spi-qup.c
with
1 addition
and
17 deletions
drivers/spi/spi-pxa2xx-dma.c
+
0
−
16
View file @
fd30c373
...
@@ -29,18 +29,6 @@ static int pxa2xx_spi_map_dma_buffer(struct driver_data *drv_data,
...
@@ -29,18 +29,6 @@ static int pxa2xx_spi_map_dma_buffer(struct driver_data *drv_data,
struct
sg_table
*
sgt
;
struct
sg_table
*
sgt
;
void
*
buf
,
*
pbuf
;
void
*
buf
,
*
pbuf
;
/*
* Some DMA controllers have problems transferring buffers that are
* not multiple of 4 bytes. So we truncate the transfer so that it
* is suitable for such controllers, and handle the trailing bytes
* manually after the DMA completes.
*
* REVISIT: It would be better if this information could be
* retrieved directly from the DMA device in a similar way than
* ->copy_align etc. is done.
*/
len
=
ALIGN
(
drv_data
->
len
,
4
);
if
(
dir
==
DMA_TO_DEVICE
)
{
if
(
dir
==
DMA_TO_DEVICE
)
{
dmadev
=
drv_data
->
tx_chan
->
device
->
dev
;
dmadev
=
drv_data
->
tx_chan
->
device
->
dev
;
sgt
=
&
drv_data
->
tx_sgt
;
sgt
=
&
drv_data
->
tx_sgt
;
...
@@ -144,12 +132,8 @@ static void pxa2xx_spi_dma_transfer_complete(struct driver_data *drv_data,
...
@@ -144,12 +132,8 @@ static void pxa2xx_spi_dma_transfer_complete(struct driver_data *drv_data,
if
(
!
error
)
{
if
(
!
error
)
{
pxa2xx_spi_unmap_dma_buffers
(
drv_data
);
pxa2xx_spi_unmap_dma_buffers
(
drv_data
);
/* Handle the last bytes of unaligned transfer */
drv_data
->
tx
+=
drv_data
->
tx_map_len
;
drv_data
->
tx
+=
drv_data
->
tx_map_len
;
drv_data
->
write
(
drv_data
);
drv_data
->
rx
+=
drv_data
->
rx_map_len
;
drv_data
->
rx
+=
drv_data
->
rx_map_len
;
drv_data
->
read
(
drv_data
);
msg
->
actual_length
+=
drv_data
->
len
;
msg
->
actual_length
+=
drv_data
->
len
;
msg
->
state
=
pxa2xx_spi_next_transfer
(
drv_data
);
msg
->
state
=
pxa2xx_spi_next_transfer
(
drv_data
);
...
...
This diff is collapsed.
Click to expand it.
drivers/spi/spi-qup.c
+
1
−
1
View file @
fd30c373
...
@@ -734,7 +734,7 @@ static int spi_qup_remove(struct platform_device *pdev)
...
@@ -734,7 +734,7 @@ static int spi_qup_remove(struct platform_device *pdev)
int
ret
;
int
ret
;
ret
=
pm_runtime_get_sync
(
&
pdev
->
dev
);
ret
=
pm_runtime_get_sync
(
&
pdev
->
dev
);
if
(
ret
)
if
(
ret
<
0
)
return
ret
;
return
ret
;
ret
=
spi_qup_set_state
(
controller
,
QUP_STATE_RESET
);
ret
=
spi_qup_set_state
(
controller
,
QUP_STATE_RESET
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment