Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit 4519064c1c7ccdd319d26181bdd12ee2df6e336e

Authored by Andy Walls
Committed by Mauro Carvalho Chehab
1 parent 0be01004dd
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

V4L/DVB (8912): cx18: Correct CX23418 PCI configuration settings. 

cx18: Correct CX23418 PCI configuration settings.  The CX23418 doesn't have
I/O space registers, so there was no need to try and turn them on (the card
ignores the attempt to set the bit anyway).  Also removed incorrect config
space register setting that was errantly borrowed from ivtv.

Signed-off-by: Andy Walls <awalls@radix.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

Showing 1 changed file with 2 additions and 7 deletions Side-by-side Diff

drivers/media/video/cx18/cx18-driver.c
Diff comments   View file @ 4519064
... ... @@ -511,9 +511,9 @@
511 511 return -EIO;
512 512 }
513 513  
514   - /* Check for bus mastering */
  514 + /* Enable bus mastering and memory mapped IO for the CX23418 */
515 515 pci_read_config_word(dev, PCI_COMMAND, &cmd);
516   - cmd |= PCI_COMMAND_IO | PCI_COMMAND_MEMORY | PCI_COMMAND_MASTER;
  516 + cmd |= PCI_COMMAND_MEMORY | PCI_COMMAND_MASTER;
517 517 pci_write_config_word(dev, PCI_COMMAND, cmd);
518 518  
519 519 pci_read_config_byte(dev, PCI_CLASS_REVISION, &cx->card_rev);
... ... @@ -525,11 +525,6 @@
525 525 pci_write_config_byte(dev, PCI_LATENCY_TIMER, 64);
526 526 pci_read_config_byte(dev, PCI_LATENCY_TIMER, &pci_latency);
527 527 }
528   - /* This config space value relates to DMA latencies. The
529   - default value 0x8080 is too low however and will lead
530   - to DMA errors. 0xffff is the max value which solves
531   - these problems. */
532   - pci_write_config_dword(dev, 0x40, 0xffff);
533 528  
534 529 CX18_DEBUG_INFO("cx%d (rev %d) at %02x:%02x.%x, "
535 530 "irq: %d, latency: %d, memory: 0x%lx\n",