diff options
| -rw-r--r-- | drivers/ieee1394/ohci1394.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/ieee1394/ohci1394.c b/drivers/ieee1394/ohci1394.c index d91ef33171b2..0df8970603f7 100644 --- a/drivers/ieee1394/ohci1394.c +++ b/drivers/ieee1394/ohci1394.c | |||
| @@ -507,9 +507,8 @@ static void ohci_initialize(struct ti_ohci *ohci) | |||
| 507 | /* Set up self-id dma buffer */ | 507 | /* Set up self-id dma buffer */ |
| 508 | reg_write(ohci, OHCI1394_SelfIDBuffer, ohci->selfid_buf_bus); | 508 | reg_write(ohci, OHCI1394_SelfIDBuffer, ohci->selfid_buf_bus); |
| 509 | 509 | ||
| 510 | /* enable self-id and phys */ | 510 | /* enable self-id */ |
| 511 | reg_write(ohci, OHCI1394_LinkControlSet, OHCI1394_LinkControl_RcvSelfID | | 511 | reg_write(ohci, OHCI1394_LinkControlSet, OHCI1394_LinkControl_RcvSelfID); |
| 512 | OHCI1394_LinkControl_RcvPhyPkt); | ||
| 513 | 512 | ||
| 514 | /* Set the Config ROM mapping register */ | 513 | /* Set the Config ROM mapping register */ |
| 515 | reg_write(ohci, OHCI1394_ConfigROMmap, ohci->csr_config_rom_bus); | 514 | reg_write(ohci, OHCI1394_ConfigROMmap, ohci->csr_config_rom_bus); |
| @@ -518,9 +517,6 @@ static void ohci_initialize(struct ti_ohci *ohci) | |||
| 518 | ohci->max_packet_size = | 517 | ohci->max_packet_size = |
| 519 | 1<<(((reg_read(ohci, OHCI1394_BusOptions)>>12)&0xf)+1); | 518 | 1<<(((reg_read(ohci, OHCI1394_BusOptions)>>12)&0xf)+1); |
| 520 | 519 | ||
| 521 | /* Don't accept phy packets into AR request context */ | ||
| 522 | reg_write(ohci, OHCI1394_LinkControlClear, 0x00000400); | ||
| 523 | |||
| 524 | /* Clear the interrupt mask */ | 520 | /* Clear the interrupt mask */ |
| 525 | reg_write(ohci, OHCI1394_IsoRecvIntMaskClear, 0xffffffff); | 521 | reg_write(ohci, OHCI1394_IsoRecvIntMaskClear, 0xffffffff); |
| 526 | reg_write(ohci, OHCI1394_IsoRecvIntEventClear, 0xffffffff); | 522 | reg_write(ohci, OHCI1394_IsoRecvIntEventClear, 0xffffffff); |
