diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-22 14:22:36 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-22 14:22:36 -0800 |
| commit | c9f937e4a3f4ebf9924ec21d80632e5eb61d949c (patch) | |
| tree | 9af0bad5961f4c5b8698fc2f24f746105663fc75 /drivers | |
| parent | 2218a4fcf3cddd076aaf8855f675ce77f74a500b (diff) | |
| parent | 3439d65062a4af6af0433c8816fd54697d782ff4 (diff) | |
| download | linux-3.10-c9f937e4a3f4ebf9924ec21d80632e5eb61d949c.tar.gz linux-3.10-c9f937e4a3f4ebf9924ec21d80632e5eb61d949c.tar.bz2 linux-3.10-c9f937e4a3f4ebf9924ec21d80632e5eb61d949c.zip | |
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
pata_bf54x: handle portmuxing of pins through GPIO PORTs
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/ata/pata_bf54x.c | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/drivers/ata/pata_bf54x.c b/drivers/ata/pata_bf54x.c index c4b47a3e544..02c81f12c70 100644 --- a/drivers/ata/pata_bf54x.c +++ b/drivers/ata/pata_bf54x.c @@ -1557,6 +1557,25 @@ static unsigned short atapi_io_port[] = { P_ATAPI_DMARQ, P_ATAPI_INTRQ, P_ATAPI_IORDY, + P_ATAPI_D0A, + P_ATAPI_D1A, + P_ATAPI_D2A, + P_ATAPI_D3A, + P_ATAPI_D4A, + P_ATAPI_D5A, + P_ATAPI_D6A, + P_ATAPI_D7A, + P_ATAPI_D8A, + P_ATAPI_D9A, + P_ATAPI_D10A, + P_ATAPI_D11A, + P_ATAPI_D12A, + P_ATAPI_D13A, + P_ATAPI_D14A, + P_ATAPI_D15A, + P_ATAPI_A0A, + P_ATAPI_A1A, + P_ATAPI_A2A, 0 }; |