Commit c9f937e4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 2218a4fc 3439d650

drivers/ata/pata_bf54x.c

+19 −0
Original line number Diff line number Diff line
@@ -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

};