From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44889) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y7KL0-00021U-9q for qemu-devel@nongnu.org; Sat, 03 Jan 2015 03:45:35 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Y7KKz-0002oG-0c for qemu-devel@nongnu.org; Sat, 03 Jan 2015 03:45:34 -0500 Received: from mail-wg0-x230.google.com ([2a00:1450:400c:c00::230]:51631) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y7KKy-0002o8-Pe for qemu-devel@nongnu.org; Sat, 03 Jan 2015 03:45:32 -0500 Received: by mail-wg0-f48.google.com with SMTP id y19so25031030wgg.7 for ; Sat, 03 Jan 2015 00:45:32 -0800 (PST) Sender: Paolo Bonzini From: Paolo Bonzini Date: Sat, 3 Jan 2015 09:45:09 +0100 Message-Id: <1420274709-30199-10-git-send-email-pbonzini@redhat.com> In-Reply-To: <1420274709-30199-1-git-send-email-pbonzini@redhat.com> References: <1420274709-30199-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PULL 9/9] pci: move REDHAT_SDHCI device ID to make room for Rocker List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Jiri Pirko , Scott Feldman From: Scott Feldman 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 Signed-off-by: Jiri Pirko Signed-off-by: Paolo Bonzini --- 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