aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2010-09-20 02:37:25 -0400
committerPaul Mundt <lethal@linux-sh.org>2010-09-20 02:37:25 -0400
commitcabdf8bf488bfa3b565360b9fa1322d2db7747eb (patch)
tree00995be0c1bc3637e25c971f6a50ec3b3374df4a
parent81df84f4060f4f19c7e6f39c7c527a6098436a2a (diff)
sh: pci: Move Renesas PCI IDs to a better place.
Previously these IDs were only used by one driver, so there was not much need for having them generically defined. Now that this will no longer hold true, move them over. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
-rw-r--r--arch/sh/drivers/pci/pci-sh7780.h6
-rw-r--r--include/linux/pci_ids.h7
2 files changed, 7 insertions, 6 deletions
diff --git a/arch/sh/drivers/pci/pci-sh7780.h b/arch/sh/drivers/pci/pci-sh7780.h
index 205dcbefe275..1742e2c9db7a 100644
--- a/arch/sh/drivers/pci/pci-sh7780.h
+++ b/arch/sh/drivers/pci/pci-sh7780.h
@@ -12,12 +12,6 @@
12#ifndef _PCI_SH7780_H_ 12#ifndef _PCI_SH7780_H_
13#define _PCI_SH7780_H_ 13#define _PCI_SH7780_H_
14 14
15#define PCI_VENDOR_ID_RENESAS 0x1912
16#define PCI_DEVICE_ID_RENESAS_SH7781 0x0001
17#define PCI_DEVICE_ID_RENESAS_SH7780 0x0002
18#define PCI_DEVICE_ID_RENESAS_SH7763 0x0004
19#define PCI_DEVICE_ID_RENESAS_SH7785 0x0007
20
21/* SH7780 Control Registers */ 15/* SH7780 Control Registers */
22#define PCIECR 0xFE000008 16#define PCIECR 0xFE000008
23#define PCIECR_ENBL 0x01 17#define PCIECR_ENBL 0x01
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index f6a3b2d36cad..33a5d1c39729 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -2260,6 +2260,13 @@
2260 2260
2261#define PCI_VENDOR_ID_SILAN 0x1904 2261#define PCI_VENDOR_ID_SILAN 0x1904
2262 2262
2263#define PCI_VENDOR_ID_RENESAS 0x1912
2264#define PCI_DEVICE_ID_RENESAS_SH7781 0x0001
2265#define PCI_DEVICE_ID_RENESAS_SH7780 0x0002
2266#define PCI_DEVICE_ID_RENESAS_SH7763 0x0004
2267#define PCI_DEVICE_ID_RENESAS_SH7785 0x0007
2268#define PCI_DEVICE_ID_RENESAS_SH7786 0x0010
2269
2263#define PCI_VENDOR_ID_TDI 0x192E 2270#define PCI_VENDOR_ID_TDI 0x192E
2264#define PCI_DEVICE_ID_TDI_EHCI 0x0101 2271#define PCI_DEVICE_ID_TDI_EHCI 0x0101
2265 2272