[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 9/9] pci: move REDHAT_SDHCI device ID to make room fo
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 9/9] pci: move REDHAT_SDHCI device ID to make room for Rocker |
Date: |
Sat, 3 Jan 2015 09:45:09 +0100 |
From: Scott Feldman <address@hidden>
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: Scott Feldman <address@hidden>
Signed-off-by: Jiri Pirko <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
docs/specs/pci-ids.txt | 2 +-
include/hw/pci/pci.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/docs/specs/pci-ids.txt b/docs/specs/pci-ids.txt
index 9b57d5e..c6732fe 100644
--- a/docs/specs/pci-ids.txt
+++ b/docs/specs/pci-ids.txt
@@ -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.
diff --git a/include/hw/pci/pci.h b/include/hw/pci/pci.h
index 97e4257..97a83d3 100644
--- a/include/hw/pci/pci.h
+++ b/include/hw/pci/pci.h
@@ -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
--
1.8.3.1
- [Qemu-devel] [PULL 0/9] Misc changes for 2015-01-03 (icount, migration, iscsi, sdhci-pci), Paolo Bonzini, 2015/01/03
- [Qemu-devel] [PULL 3/9] cpu-exec: add a new CF_USE_ICOUNT cflag, Paolo Bonzini, 2015/01/03
- [Qemu-devel] [PULL 1/9] atomic: fix position of volatile qualifier, Paolo Bonzini, 2015/01/03
- [Qemu-devel] [PULL 2/9] target-ppc: pass DisasContext to SPR generator functions, Paolo Bonzini, 2015/01/03
- [Qemu-devel] [PULL 5/9] gen-icount: check cflags instead of use_icount global, Paolo Bonzini, 2015/01/03
- [Qemu-devel] [PULL 6/9] serial: refine serial_thr_ipending_needed, Paolo Bonzini, 2015/01/03
- [Qemu-devel] [PULL 4/9] translate: check cflags instead of use_icount global, Paolo Bonzini, 2015/01/03
- [Qemu-devel] [PULL 9/9] pci: move REDHAT_SDHCI device ID to make room for Rocker,
Paolo Bonzini <=
- [Qemu-devel] [PULL 7/9] pckbd: set bits 2-3-6-7 of the output port by default, Paolo Bonzini, 2015/01/03
- [Qemu-devel] [PULL 8/9] block/iscsi: fix uninitialized variable, Paolo Bonzini, 2015/01/03
- Re: [Qemu-devel] [PULL 0/9] Misc changes for 2015-01-03 (icount, migration, iscsi, sdhci-pci), Peter Maydell, 2015/01/09