From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43470) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y5p7H-0007rV-1n for qemu-devel@nongnu.org; Tue, 30 Dec 2014 00:13:12 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Y5p7B-0004Rr-4A for qemu-devel@nongnu.org; Tue, 30 Dec 2014 00:13:11 -0500 Received: from mail-pd0-x234.google.com ([2607:f8b0:400e:c02::234]:60110) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y5p7A-0004Rh-Sl for qemu-devel@nongnu.org; Tue, 30 Dec 2014 00:13:05 -0500 Received: by mail-pd0-f180.google.com with SMTP id fl12so2926407pdb.25 for ; Mon, 29 Dec 2014 21:13:04 -0800 (PST) From: sfeldma@gmail.com Date: Mon, 29 Dec 2014 21:14:02 -0800 Message-Id: <1419916451-49258-2-git-send-email-sfeldma@gmail.com> Subject: [Qemu-devel] [PATCH 01/10] 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, jiri@resnulli.us, roopa@cumulusnetworks.com, john.fastabend@gmail.com 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 --- 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.7.10.4