[PATCH] v850: Update PCI support

These changes are untested (I no longer have the hardware).

Signed-off-by: Miles Bader <miles@gnu.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

2 files changed, 45 insertions, 6 deletions

diff --git a/arch/v850/kernel/rte_mb_a_pci.c b/arch/v850/kernel/rte_mb_a_pci.c
index 074b50abc89d..ffbb6d073bf2 100644
--- a/arch/v850/kernel/rte_mb_a_pci.c
+++ b/arch/v850/kernel/rte_mb_a_pci.c
@@ -1,8 +1,8 @@
 /*
  * arch/v850/kernel/mb_a_pci.c -- PCI support for Midas lab RTE-MOTHER-A board
  *
- *  Copyright (C) 2001,02,03  NEC Electronics Corporation
- *  Copyright (C) 2001,02,03  Miles Bader <miles@gnu.org>
+ *  Copyright (C) 2001,02,03,05  NEC Electronics Corporation
+ *  Copyright (C) 2001,02,03,05  Miles Bader <miles@gnu.org>
  *
  * This file is subject to the terms and conditions of the GNU General
  * Public License.  See the file COPYING in the main directory of this
@@ -743,15 +743,17 @@ pci_unmap_sg (struct pci_dev *pdev, struct scatterlist *sg, int sg_len,int dir)
    for a scatter-gather list, same rules and usage.  */
 
 void
-pci_dma_sync_sg_for_cpu (struct pci_dev *dev, struct scatterlist *sg, int sg_len,
-                 int dir)
+pci_dma_sync_sg_for_cpu (struct pci_dev *dev,
+                         struct scatterlist *sg, int sg_len,
+                         int dir)
 {
         BUG ();
 }
 
 void
-pci_dma_sync_sg_for_device (struct pci_dev *dev, struct scatterlist *sg, int sg_len,
-                 int dir)
+pci_dma_sync_sg_for_device (struct pci_dev *dev,
+                            struct scatterlist *sg, int sg_len,
+                            int dir)
 {
         BUG ();
 }
@@ -786,6 +788,27 @@ pci_free_consistent (struct pci_dev *pdev, size_t size, void *cpu_addr,
 }
 
 
+/* iomap/iomap */
+
+void __iomem *pci_iomap (struct pci_dev *dev, int bar, unsigned long max)
+{
+        unsigned long start = pci_resource_start (dev, bar);
+        unsigned long len = pci_resource_len (dev, bar);
+
+        if (!start || len == 0)
+                return 0;
+
+        /* None of the ioremap functions actually do anything, other than
+           re-casting their argument, so don't bother differentiating them.  */
+        return ioremap (start, len);
+}
+
+void pci_iounmap (struct pci_dev *dev, void __iomem *addr)
+{
+        /* nothing */
+}
+
+
 /* symbol exports (for modules) */
 
 EXPORT_SYMBOL (pci_map_single);
@@ -794,3 +817,5 @@ EXPORT_SYMBOL (pci_alloc_consistent);
 EXPORT_SYMBOL (pci_free_consistent);
 EXPORT_SYMBOL (pci_dma_sync_single_for_cpu);
 EXPORT_SYMBOL (pci_dma_sync_single_for_device);
+EXPORT_SYMBOL (pci_iomap);
+EXPORT_SYMBOL (pci_iounmap);
diff --git a/arch/v850/kernel/vmlinux.lds.S b/arch/v850/kernel/vmlinux.lds.S
index c366a8b326ee..5be05f47109e 100644
--- a/arch/v850/kernel/vmlinux.lds.S
+++ b/arch/v850/kernel/vmlinux.lds.S
@@ -12,6 +12,7 @@
  */
 
 #include <linux/config.h>
+
 #define VMLINUX_SYMBOL(_sym_) _##_sym_
 #include <asm-generic/vmlinux.lds.h>
 
@@ -42,6 +43,19 @@
                         *(.rodata) *(.rodata.*)                               \
                         *(__vermagic)           /* Kernel version magic */    \
                         *(.rodata1)                                           \
+                /* PCI quirks */                                              \
+                ___start_pci_fixups_early = . ;                               \
+                        *(.pci_fixup_early)                                   \
+                ___end_pci_fixups_early = . ;                                 \
+                ___start_pci_fixups_header = . ;                              \
+                        *(.pci_fixup_header)                                  \
+                ___end_pci_fixups_header = . ;                                \
+                ___start_pci_fixups_final = . ;                               \
+                        *(.pci_fixup_final)                                   \
+                ___end_pci_fixups_final = . ;                                 \
+                ___start_pci_fixups_enable = . ;                              \
+                        *(.pci_fixup_enable)                                  \
+                ___end_pci_fixups_enable = . ;                                \
                 /* Kernel symbol table: Normal symbols */                     \
                 ___start___ksymtab = .;                                       \
                         *(__ksymtab)                                          \