1 From e6b9f3ea5f2f3f8a66d6650c16f3537288806c0b Mon Sep 17 00:00:00 2001
2 From: John Crispin <blogic@openwrt.org>
3 Date: Thu, 8 Mar 2012 15:53:10 +0100
4 Subject: [PATCH 53/73] MIPS: lantiq: pci: move pcibios code into
8 arch/mips/pci/Makefile | 1 +
9 arch/mips/pci/fixup-lantiq.c | 42 ++++++++++++++++++++++++++++++++++++++++++
10 arch/mips/pci/pci-lantiq.c | 24 ++----------------------
11 3 files changed, 45 insertions(+), 22 deletions(-)
12 create mode 100644 arch/mips/pci/fixup-lantiq.c
14 diff --git a/arch/mips/pci/Makefile b/arch/mips/pci/Makefile
15 index afad91d..3ca5f75 100644
16 --- a/arch/mips/pci/Makefile
17 +++ b/arch/mips/pci/Makefile
18 @@ -40,6 +40,7 @@ obj-$(CONFIG_SIBYTE_SB1250) += fixup-sb1250.o pci-sb1250.o
19 obj-$(CONFIG_SIBYTE_BCM112X) += fixup-sb1250.o pci-sb1250.o
20 obj-$(CONFIG_SIBYTE_BCM1x80) += pci-bcm1480.o pci-bcm1480ht.o
21 obj-$(CONFIG_SNI_RM) += fixup-sni.o ops-sni.o
22 +obj-$(CONFIG_LANTIQ) += fixup-lantiq.o
23 obj-$(CONFIG_PCI_LANTIQ) += pci-lantiq.o ops-lantiq.o
24 obj-$(CONFIG_TANBAC_TB0219) += fixup-tb0219.o
25 obj-$(CONFIG_TANBAC_TB0226) += fixup-tb0226.o
26 diff --git a/arch/mips/pci/fixup-lantiq.c b/arch/mips/pci/fixup-lantiq.c
28 index 0000000..daf5ae9
30 +++ b/arch/mips/pci/fixup-lantiq.c
33 + * This program is free software; you can redistribute it and/or modify it
34 + * under the terms of the GNU General Public License version 2 as published
35 + * by the Free Software Foundation.
37 + * Copyright (C) 2012 John Crispin <blogic@openwrt.org>
40 +#include <linux/of_irq.h>
41 +#include <linux/of_pci.h>
43 +int (*ltqpci_map_irq)(const struct pci_dev *dev, u8 slot, u8 pin) = NULL;
44 +int (*ltqpci_plat_arch_init)(struct pci_dev *dev) = NULL;
45 +int (*ltqpci_plat_dev_init)(struct pci_dev *dev) = NULL;
46 +int *ltq_pci_irq_map;
48 +int pcibios_plat_dev_init(struct pci_dev *dev)
50 + if (ltqpci_plat_arch_init)
51 + return ltqpci_plat_arch_init(dev);
53 + if (ltqpci_plat_dev_init)
54 + return ltqpci_plat_dev_init(dev);
59 +int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
62 + return ltqpci_map_irq(dev, slot, pin);
63 + if (ltq_pci_irq_map[slot]) {
64 + dev_info(&dev->dev, "SLOT:%d PIN:%d IRQ:%d\n", slot, pin, ltq_pci_irq_map[slot]);
65 + return ltq_pci_irq_map[slot];
67 + printk(KERN_ERR "lq_pci: trying to map irq for unknown slot %d\n",
74 diff --git a/arch/mips/pci/pci-lantiq.c b/arch/mips/pci/pci-lantiq.c
75 index efcdd45..7a29738 100644
76 --- a/arch/mips/pci/pci-lantiq.c
77 +++ b/arch/mips/pci/pci-lantiq.c
78 @@ -93,16 +93,14 @@ static struct ltq_pci_gpio_map ltq_pci_gpio_map[] = {
79 { 37, 2, 0, "pci-req4" },
82 -__iomem void *ltq_pci_mapped_cfg;
83 +__iomem void *ltq_pci_cfgbase;
84 static __iomem void *ltq_pci_membase;
86 -int (*ltqpci_plat_dev_init)(struct pci_dev *dev) = NULL;
88 /* Since the PCI REQ pins can be reused for other functionality, make it
89 possible to exclude those from interpretation by the PCI controller */
90 static int ltq_pci_req_mask = 0xf;
92 -static int *ltq_pci_irq_map;
93 +extern int *ltq_pci_irq_map;
95 struct pci_ops ltq_pci_ops = {
96 .read = ltq_pci_read_config_dword,
97 @@ -131,14 +129,6 @@ static struct pci_controller ltq_pci_controller = {
98 .io_offset = 0x00000000UL,
101 -int pcibios_plat_dev_init(struct pci_dev *dev)
103 - if (ltqpci_plat_dev_init)
104 - return ltqpci_plat_dev_init(dev);
109 static u32 ltq_calc_bar11mask(void)
112 @@ -256,16 +246,6 @@ static int __devinit ltq_pci_startup(struct device *dev)
116 -int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
118 - if (ltq_pci_irq_map[slot])
119 - return ltq_pci_irq_map[slot];
120 - printk(KERN_ERR "lq_pci: trying to map irq for unknown slot %d\n",
126 static int __devinit ltq_pci_probe(struct platform_device *pdev)
128 struct ltq_pci_data *ltq_pci_data =