2 files changed, 59 insertions, 22 deletions

diff --git a/arch/mips/alchemy/devboards/pb1500/board_setup.c b/arch/mips/alchemy/devboards/pb1500/board_setup.c
index 3b4fa3206969..37c1883b5ea9 100644
--- a/arch/mips/alchemy/devboards/pb1500/board_setup.c
+++ b/arch/mips/alchemy/devboards/pb1500/board_setup.c
@@ -33,13 +33,6 @@
 
 #include <prom.h>
 
-
-char irq_tab_alchemy[][5] __initdata = {
-        [12] = { -1, AU1500_PCI_INTA, 0xff, 0xff, 0xff },   /* IDSEL 12 - HPT370        */
-        [13] = { -1, AU1500_PCI_INTA, AU1500_PCI_INTB, AU1500_PCI_INTC, AU1500_PCI_INTD },   /* IDSEL 13 - PCI slot */
-};
-
-
 const char *get_system_type(void)
 {
         return "Alchemy Pb1500";
@@ -101,20 +94,18 @@ void __init board_setup(void)
 #endif /* defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE) */
 
 #ifdef CONFIG_PCI
-        /* Setup PCI bus controller */
-        au_writel(0, Au1500_PCI_CMEM);
-        au_writel(0x00003fff, Au1500_CFG_BASE);
-#if defined(__MIPSEB__)
-        au_writel(0xf | (2 << 6) | (1 << 4), Au1500_PCI_CFG);
-#else
-        au_writel(0xf, Au1500_PCI_CFG);
-#endif
-        au_writel(0xf0000000, Au1500_PCI_MWMASK_DEV);
-        au_writel(0, Au1500_PCI_MWBASE_REV_CCL);
-        au_writel(0x02a00356, Au1500_PCI_STATCMD);
-        au_writel(0x00003c04, Au1500_PCI_HDRTYPE);
-        au_writel(0x00000008, Au1500_PCI_MBAR);
-        au_sync();
+        {
+                void __iomem *base =
+                                (void __iomem *)KSEG1ADDR(AU1500_PCI_PHYS_ADDR);
+                /* Setup PCI bus controller */
+                __raw_writel(0x00003fff, base + PCI_REG_CMEM);
+                __raw_writel(0xf0000000, base + PCI_REG_MWMASK_DEV);
+                __raw_writel(0, base + PCI_REG_MWBASE_REV_CCL);
+                __raw_writel(0x02a00356, base + PCI_REG_STATCMD);
+                __raw_writel(0x00003c04, base + PCI_REG_PARAM);
+                __raw_writel(0x00000008, base + PCI_REG_MBAR);
+                wmb();
+        }
 #endif
 
         /* Enable sys bus clock divider when IDLE state or no bus activity. */
diff --git a/arch/mips/alchemy/devboards/pb1500/platform.c b/arch/mips/alchemy/devboards/pb1500/platform.c
index 42b0e6b8cd58..9f0b5a0b4795 100644
--- a/arch/mips/alchemy/devboards/pb1500/platform.c
+++ b/arch/mips/alchemy/devboards/pb1500/platform.c
@@ -19,11 +19,56 @@
  */
 
 #include <linux/init.h>
+#include <linux/platform_device.h>
 #include <asm/mach-au1x00/au1000.h>
 #include <asm/mach-db1x00/bcsr.h>
 
 #include "../platform.h"
 
+static int pb1500_map_pci_irq(const struct pci_dev *d, u8 slot, u8 pin)
+{
+        if ((slot < 12) || (slot > 13) || pin == 0)
+                return -1;
+        if (slot == 12)
+                return (pin == 1) ? AU1500_PCI_INTA : 0xff;
+        if (slot == 13) {
+                switch (pin) {
+                case 1: return AU1500_PCI_INTA;
+                case 2: return AU1500_PCI_INTB;
+                case 3: return AU1500_PCI_INTC;
+                case 4: return AU1500_PCI_INTD;
+                }
+        }
+        return -1;
+}
+
+static struct resource alchemy_pci_host_res[] = {
+        [0] = {
+                .start  = AU1500_PCI_PHYS_ADDR,
+                .end    = AU1500_PCI_PHYS_ADDR + 0xfff,
+                .flags  = IORESOURCE_MEM,
+        },
+};
+
+static struct alchemy_pci_platdata pb1500_pci_pd = {
+        .board_map_irq  = pb1500_map_pci_irq,
+        .pci_cfg_set    = PCI_CONFIG_AEN | PCI_CONFIG_R2H | PCI_CONFIG_R1H |
+                          PCI_CONFIG_CH |
+#if defined(__MIPSEB__)
+                          PCI_CONFIG_SIC_HWA_DAT | PCI_CONFIG_SM,
+#else
+                          0,
+#endif
+};
+
+static struct platform_device pb1500_pci_host = {
+        .dev.platform_data = &pb1500_pci_pd,
+        .name           = "alchemy-pci",
+        .id             = 0,
+        .num_resources  = ARRAY_SIZE(alchemy_pci_host_res),
+        .resource       = alchemy_pci_host_res,
+};
+
 static int __init pb1500_dev_init(void)
 {
         int swapped;
@@ -41,7 +86,8 @@ static int __init pb1500_dev_init(void)
 
         swapped = bcsr_read(BCSR_STATUS) &  BCSR_STATUS_DB1000_SWAPBOOT;
         db1x_register_norflash(64 * 1024 * 1024, 4, swapped);
+        platform_device_register(&pb1500_pci_host);
 
         return 0;
 }
-device_initcall(pb1500_dev_init);
+arch_initcall(pb1500_dev_init);