Merge branch 'linus' into x86/urgent

[pandora-kernel.git] / arch / arm / mach-pxa / cm-x270-pci.c

diff --git a/arch/arm/mach-pxa/cm-x270-pci.c b/arch/arm/mach-pxa/cm-x270-pci.c
index 878d3b9..319c9ff 100644 (file)
--- a/arch/arm/mach-pxa/cm-x270-pci.c
+++ b/arch/arm/mach-pxa/cm-x270-pci.c
@@ -23,6 +23,7 @@
 #include <asm/mach/pci.h>
 #include <asm/arch/cm-x270.h>
 #include <asm/arch/pxa-regs.h>
+#include <asm/arch/pxa2xx-gpio.h>
 #include <asm/mach-types.h>
 
 #include <asm/hardware/it8152.h>
@@ -40,18 +41,20 @@ void __init cmx270_pci_adjust_zones(int node, unsigned long *zone_size,
 {
        unsigned int sz = SZ_64M >> PAGE_SHIFT;
 
-       printk(KERN_INFO "Adjusting zones for CM-x270\n");
+       if (machine_is_armcore()) {
+               pr_info("Adjusting zones for CM-x270\n");
 
-       /*
-        * Only adjust if > 64M on current system
-        */
-       if (node || (zone_size[0] <= sz))
-               return;
-
-       zone_size[1] = zone_size[0] - sz;
-       zone_size[0] = sz;
-       zhole_size[1] = zhole_size[0];
-       zhole_size[0] = 0;
+               /*
+                * Only adjust if > 64M on current system
+                */
+               if (node || (zone_size[0] <= sz))
+                       return;
+
+               zone_size[1] = zone_size[0] - sz;
+               zone_size[0] = sz;
+               zhole_size[1] = zhole_size[0];
+               zhole_size[0] = 0;
+       }
 }
 
 static void cmx270_it8152_irq_demux(unsigned int irq, struct irq_desc *desc)
@@ -104,8 +107,7 @@ static int __init cmx270_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
 {
        int irq;
 
-       printk(KERN_DEBUG "===> %s: %s slot=%x, pin=%x\n", __FUNCTION__,
-              pci_name(dev), slot, pin);
+       dev_dbg(&dev->dev, "%s: slot=%x, pin=%x\n", __func__, slot, pin);
 
        irq = it8152_pci_map_irq(dev, slot, pin);
        if (irq)
@@ -141,14 +143,13 @@ static int __init cmx270_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
        return(0);
 }
 
-static struct pci_bus * __init
-cmx270_pci_scan_bus(int nr, struct pci_sys_data *sys)
+static void cmx270_pci_preinit(void)
 {
-       printk(KERN_INFO "Initializing CM-X270 PCI subsystem\n");
+       pr_info("Initializing CM-X270 PCI subsystem\n");
 
        __raw_writel(0x800, IT8152_PCI_CFG_ADDR);
        if (__raw_readl(IT8152_PCI_CFG_DATA) == 0x81521283) {
-               printk(KERN_INFO "PCI Bridge found.\n");
+               pr_info("PCI Bridge found.\n");
 
                /* set PCI I/O base at 0 */
                writel(0x848, IT8152_PCI_CFG_ADDR);
@@ -163,7 +164,7 @@ cmx270_pci_scan_bus(int nr, struct pci_sys_data *sys)
                /* CardBus Controller on ATXbase baseboard */
                writel(0x4000, IT8152_PCI_CFG_ADDR);
                if (readl(IT8152_PCI_CFG_DATA) == 0xAC51104C) {
-                       printk(KERN_INFO "CardBus Bridge found.\n");
+                       pr_info("CardBus Bridge found.\n");
 
                        /* Configure socket 0 */
                        writel(0x408C, IT8152_PCI_CFG_ADDR);
@@ -196,7 +197,6 @@ cmx270_pci_scan_bus(int nr, struct pci_sys_data *sys)
                        writel(0xb0000000, IT8152_PCI_CFG_DATA);
                }
        }
-       return it8152_pci_scan_bus(nr, sys);
 }
 
 static struct hw_pci cmx270_pci __initdata = {
@@ -204,7 +204,8 @@ static struct hw_pci cmx270_pci __initdata = {
        .map_irq        = cmx270_pci_map_irq,
        .nr_controllers = 1,
        .setup          = it8152_pci_setup,
-       .scan           = cmx270_pci_scan_bus,
+       .scan           = it8152_pci_scan_bus,
+       .preinit        = cmx270_pci_preinit,
 };
 
 static int __init cmx270_init_pci(void)