Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[linux-2.6-omap-h63xx.git] / include / asm-powerpc / machdep.h

diff --git a/include/asm-powerpc/machdep.h b/include/asm-powerpc/machdep.h
index 3e7d37aa4a6d7d9b398b53af14ea4780da92debb..71c6e7eb2a266798d56e3c6676d528fa1fa8be3f 100644 (file)
--- a/include/asm-powerpc/machdep.h
+++ b/include/asm-powerpc/machdep.h
@@ -26,6 +26,7 @@ struct device_node;
 struct iommu_table;
 struct rtc_time;
 struct file;
+struct pci_controller;
 #ifdef CONFIG_KEXEC
 struct kimage;
 #endif
@@ -81,10 +82,20 @@ struct machdep_calls {
        void            (*tce_free)(struct iommu_table *tbl,
                                    long index,
                                    long npages);
+       unsigned long   (*tce_get)(struct iommu_table *tbl,
+                                   long index);
        void            (*tce_flush)(struct iommu_table *tbl);
-       void            (*iommu_dev_setup)(struct pci_dev *dev);
-       void            (*iommu_bus_setup)(struct pci_bus *bus);
-       void            (*irq_bus_setup)(struct pci_bus *bus);
+       void            (*pci_dma_dev_setup)(struct pci_dev *dev);
+       void            (*pci_dma_bus_setup)(struct pci_bus *bus);
+
+       void __iomem *  (*ioremap)(phys_addr_t addr, unsigned long size,
+                                  unsigned long flags);
+       void            (*iounmap)(volatile void __iomem *token);
+
+#ifdef CONFIG_PM
+       void            (*iommu_save)(void);
+       void            (*iommu_restore)(void);
+#endif
 #endif /* CONFIG_PPC64 */
 
        int             (*probe)(void);
@@ -95,7 +106,7 @@ struct machdep_calls {
        void            (*show_percpuinfo)(struct seq_file *m, int i);
 
        void            (*init_IRQ)(void);
-       int             (*get_irq)(struct pt_regs *);
+       unsigned int    (*get_irq)(void);
 #ifdef CONFIG_KEXEC
        void            (*kexec_cpu_down)(int crash_shutdown, int secondary);
 #endif
@@ -104,6 +115,18 @@ struct machdep_calls {
        /* Called after scanning the bus, before allocating resources */
        void            (*pcibios_fixup)(void);
        int             (*pci_probe_mode)(struct pci_bus *);
+       void            (*pci_irq_fixup)(struct pci_dev *dev);
+
+       /* To setup PHBs when using automatic OF platform driver for PCI */
+       int             (*pci_setup_phb)(struct pci_controller *host);
+
+#ifdef CONFIG_PCI_MSI
+       int             (*msi_check_device)(struct pci_dev* dev,
+                                           int nvec, int type);
+       int             (*setup_msi_irqs)(struct pci_dev *dev,
+                                         int nvec, int type);
+       void            (*teardown_msi_irqs)(struct pci_dev *dev);
+#endif
 
        void            (*restart)(char *cmd);
        void            (*power_off)(void);
@@ -143,9 +166,6 @@ struct machdep_calls {
         */
        long            (*feature_call)(unsigned int feature, ...);
 
-       /* Check availability of legacy devices like i8042 */
-       int             (*check_legacy_ioport)(unsigned int baseport);
-
        /* Get legacy PCI/IDE interrupt mapping */ 
        int             (*pci_get_legacy_ide_irq)(struct pci_dev *dev, int channel);
        
@@ -197,12 +217,8 @@ struct machdep_calls {
         * Returns 0 to allow assignment/enabling of the device. */
        int  (*pcibios_enable_device_hook)(struct pci_dev *, int initial);
 
-       /* For interrupt routing */
-       unsigned char (*pci_swizzle)(struct pci_dev *, unsigned char *);
-       int (*pci_map_irq)(struct pci_dev *, unsigned char, unsigned char);
-
        /* Called in indirect_* to avoid touching devices */
-       int (*pci_exclude_device)(unsigned char, unsigned char);
+       int (*pci_exclude_device)(struct pci_controller *, unsigned char, unsigned char);
 
        /* Called at then very end of pcibios_init() */
        void (*pcibios_after_init)(void);
@@ -240,6 +256,7 @@ struct machdep_calls {
 };
 
 extern void power4_idle(void);
+extern void power4_cpu_offline_powersave(void);
 extern void ppc6xx_idle(void);
 
 /*