Commit 5aa81360 authored by Scott Feldman's avatar Scott Feldman Committed by Paolo Bonzini
Browse files

pci: move REDHAT_SDHCI device ID to make room for Rocker 



The rocker device uses same PCI device ID as sdhci.  Since rocker device driver
has already been accepted into Linux 3.18, and REDHAT_SDHCI device ID isn't
used by any drivers, it's safe to move REDHAT_SDHCI device ID, avoiding
conflict with rocker.

Signed-off-by: default avatarScott Feldman <sfeldma@gmail.com>
Signed-off-by: default avatarJiri Pirko <jiri@resnulli.us>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent debfb917

docs/specs/pci-ids.txt

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ PCI devices (other than virtio): 
1b36:0003  PCI Dual-port 16550A adapter (docs/specs/pci-serial.txt)

1b36:0004  PCI Quad-port 16550A adapter (docs/specs/pci-serial.txt)

1b36:0005  PCI test device (docs/specs/pci-testdev.txt)

1b36:0006  PCI SD Card Host Controller Interface (SDHCI)

1b36:0007  PCI SD Card Host Controller Interface (SDHCI)



All these devices are documented in docs/specs.

include/hw/pci/pci.h

+1 −1
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ 
#define PCI_DEVICE_ID_REDHAT_SERIAL2     0x0003

#define PCI_DEVICE_ID_REDHAT_SERIAL4     0x0004

#define PCI_DEVICE_ID_REDHAT_TEST        0x0005

#define PCI_DEVICE_ID_REDHAT_SDHCI       0x0006

#define PCI_DEVICE_ID_REDHAT_SDHCI       0x0007

#define PCI_DEVICE_ID_REDHAT_QXL         0x0100



#define FMT_PCIBUS                      PRIx64