diff mbox

[01/10] pci: move REDHAT_SDHCI device ID to make room for Rocker

Message ID 1419916451-49258-2-git-send-email-sfeldma@gmail.com
State New
Headers show

Commit Message

Scott Feldman Dec. 30, 2014, 5:14 a.m. UTC 
From: Scott Feldman <sfeldma@gmail.com>

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 <sfeldma@gmail.com>
Signed-off-by: Jiri Pirko <jiri@resnulli.us>
---
 docs/specs/pci-ids.txt |    2 +-
 include/hw/pci/pci.h   |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Comments

Peter Maydell Dec. 30, 2014, 10:22 a.m. UTC | #1 
On 30 December 2014 at 05:14,  <sfeldma@gmail.com> wrote:
> From: Scott Feldman <sfeldma@gmail.com>
>
> 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 <sfeldma@gmail.com>
> Signed-off-by: Jiri Pirko <jiri@resnulli.us>
> ---
>  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)

Paolo, do you know how we ended up with this double-allocation
of PCI IDs? Who is the master authority for handing them out
from this range?

thanks
-- PMM
diff mbox

Patch

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