Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 143801
b: refs/heads/master
c: 148da33
h: refs/heads/master
i:
  143799: 8063c5f
v: v3
  • Loading branch information
Daniel Ribeiro authored and Linus Torvalds committed Apr 21, 2009
1 parent 4caa118 commit 9c0610f
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: aa0b8f3687f06ac0e5a2b24547fdf431e923c475
refs/heads/master: 148da331200a0df8195e10eb8a38fd77bd7003af
7 changes: 7 additions & 0 deletions trunk/drivers/spi/pxa2xx_spi.c
Original file line number Diff line number Diff line change
Expand Up @@ -1700,6 +1700,13 @@ static int pxa2xx_spi_resume(struct platform_device *pdev)
struct ssp_device *ssp = drv_data->ssp;
int status = 0;

if (drv_data->rx_channel != -1)
DRCMR(drv_data->ssp->drcmr_rx) =
DRCMR_MAPVLD | drv_data->rx_channel;
if (drv_data->tx_channel != -1)
DRCMR(drv_data->ssp->drcmr_tx) =
DRCMR_MAPVLD | drv_data->tx_channel;

/* Enable the SSP clock */
clk_enable(ssp->clk);

Expand Down

0 comments on commit 9c0610f

Please sign in to comment.