Merge branch 'topic/hdsp' into for-linus

[sfrench/cifs-2.6.git] / drivers / ssb / embedded.c

diff --git a/drivers/ssb/embedded.c b/drivers/ssb/embedded.c
index d3ade821555c671f63420f3424d5ff388db11646..a0e0d246b5928d061c5d3ca4738e1afd4bbeb874 100644 (file)
--- a/drivers/ssb/embedded.c
+++ b/drivers/ssb/embedded.c
@@ -10,6 +10,9 @@
 
 #include <linux/ssb/ssb.h>
 #include <linux/ssb/ssb_embedded.h>
+#include <linux/ssb/ssb_driver_pci.h>
+#include <linux/ssb/ssb_driver_gige.h>
+#include <linux/pci.h>
 
 #include "ssb_private.h"
 
@@ -26,6 +29,7 @@ int ssb_watchdog_timer_set(struct ssb_bus *bus, u32 ticks)
        }
        return -ENODEV;
 }
+EXPORT_SYMBOL(ssb_watchdog_timer_set);
 
 u32 ssb_gpio_in(struct ssb_bus *bus, u32 mask)
 {
@@ -130,3 +134,90 @@ u32 ssb_gpio_polarity(struct ssb_bus *bus, u32 mask, u32 value)
        return res;
 }
 EXPORT_SYMBOL(ssb_gpio_polarity);
+
+#ifdef CONFIG_SSB_DRIVER_GIGE
+static int gige_pci_init_callback(struct ssb_bus *bus, unsigned long data)
+{
+       struct pci_dev *pdev = (struct pci_dev *)data;
+       struct ssb_device *dev;
+       unsigned int i;
+       int res;
+
+       for (i = 0; i < bus->nr_devices; i++) {
+               dev = &(bus->devices[i]);
+               if (dev->id.coreid != SSB_DEV_ETHERNET_GBIT)
+                       continue;
+               if (!dev->dev ||
+                   !dev->dev->driver ||
+                   !device_is_registered(dev->dev))
+                       continue;
+               res = ssb_gige_pcibios_plat_dev_init(dev, pdev);
+               if (res >= 0)
+                       return res;
+       }
+
+       return -ENODEV;
+}
+#endif /* CONFIG_SSB_DRIVER_GIGE */
+
+int ssb_pcibios_plat_dev_init(struct pci_dev *dev)
+{
+       int err;
+
+       err = ssb_pcicore_plat_dev_init(dev);
+       if (!err)
+               return 0;
+#ifdef CONFIG_SSB_DRIVER_GIGE
+       err = ssb_for_each_bus_call((unsigned long)dev, gige_pci_init_callback);
+       if (err >= 0)
+               return err;
+#endif
+       /* This is not a PCI device on any SSB device. */
+
+       return -ENODEV;
+}
+
+#ifdef CONFIG_SSB_DRIVER_GIGE
+static int gige_map_irq_callback(struct ssb_bus *bus, unsigned long data)
+{
+       const struct pci_dev *pdev = (const struct pci_dev *)data;
+       struct ssb_device *dev;
+       unsigned int i;
+       int res;
+
+       for (i = 0; i < bus->nr_devices; i++) {
+               dev = &(bus->devices[i]);
+               if (dev->id.coreid != SSB_DEV_ETHERNET_GBIT)
+                       continue;
+               if (!dev->dev ||
+                   !dev->dev->driver ||
+                   !device_is_registered(dev->dev))
+                       continue;
+               res = ssb_gige_map_irq(dev, pdev);
+               if (res >= 0)
+                       return res;
+       }
+
+       return -ENODEV;
+}
+#endif /* CONFIG_SSB_DRIVER_GIGE */
+
+int ssb_pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
+{
+       int res;
+
+       /* Check if this PCI device is a device on a SSB bus or device
+        * and return the IRQ number for it. */
+
+       res = ssb_pcicore_pcibios_map_irq(dev, slot, pin);
+       if (res >= 0)
+               return res;
+#ifdef CONFIG_SSB_DRIVER_GIGE
+       res = ssb_for_each_bus_call((unsigned long)dev, gige_map_irq_callback);
+       if (res >= 0)
+               return res;
+#endif
+       /* This is not a PCI device on any SSB device. */
+
+       return -ENODEV;
+}