Patched in Tegra support.

9 files changed, 62 insertions, 83 deletions

diff --git a/arch/powerpc/platforms/52xx/lite5200.c b/arch/powerpc/platforms/52xx/lite5200.c
index 1843bc93201..01ffa64d2aa 100644
--- a/arch/powerpc/platforms/52xx/lite5200.c
+++ b/arch/powerpc/platforms/52xx/lite5200.c
@@ -4,7 +4,7 @@
  * Written by: Grant Likely <grant.likely@secretlab.ca>
  *
  * Copyright (C) Secret Lab Technologies Ltd. 2006. All rights reserved.
- * Copyright 2006 Freescale Semiconductor, Inc. All rights reserved.
+ * Copyright (C) Freescale Semicondutor, Inc. 2006. All rights reserved.
  *
  * Description:
  * This program is free software; you can redistribute  it and/or modify it
@@ -172,7 +172,7 @@ static void __init lite5200_setup_arch(void)
         mpc52xx_setup_pci();
 }
 
-static const char * const board[] __initconst = {
+static const char *board[] __initdata = {
         "fsl,lite5200",
         "fsl,lite5200b",
         NULL,
diff --git a/arch/powerpc/platforms/52xx/lite5200_pm.c b/arch/powerpc/platforms/52xx/lite5200_pm.c
index 870b70f5d1b..eda0fc2a391 100644
--- a/arch/powerpc/platforms/52xx/lite5200_pm.c
+++ b/arch/powerpc/platforms/52xx/lite5200_pm.c
@@ -3,7 +3,6 @@
 #include <asm/io.h>
 #include <asm/time.h>
 #include <asm/mpc52xx.h>
-#include <asm/switch_to.h>
 
 /* defined in lite5200_sleep.S and only used here */
 extern void lite5200_low_power(void __iomem *sram, void __iomem *mbar);
diff --git a/arch/powerpc/platforms/52xx/media5200.c b/arch/powerpc/platforms/52xx/media5200.c
index 070d315dd6c..96f85e5e0cd 100644
--- a/arch/powerpc/platforms/52xx/media5200.c
+++ b/arch/powerpc/platforms/52xx/media5200.c
@@ -45,7 +45,7 @@ static struct of_device_id mpc5200_gpio_ids[] __initdata = {
 struct media5200_irq {
         void __iomem *regs;
         spinlock_t lock;
-        struct irq_domain *irqhost;
+        struct irq_host *irqhost;
 };
 struct media5200_irq media5200_irq;
 
@@ -112,7 +112,7 @@ void media5200_irq_cascade(unsigned int virq, struct irq_desc *desc)
         raw_spin_unlock(&desc->lock);
 }
 
-static int media5200_irq_map(struct irq_domain *h, unsigned int virq,
+static int media5200_irq_map(struct irq_host *h, unsigned int virq,
                              irq_hw_number_t hw)
 {
         pr_debug("%s: h=%p, virq=%i, hwirq=%i\n", __func__, h, virq, (int)hw);
@@ -122,7 +122,7 @@ static int media5200_irq_map(struct irq_domain *h, unsigned int virq,
         return 0;
 }
 
-static int media5200_irq_xlate(struct irq_domain *h, struct device_node *ct,
+static int media5200_irq_xlate(struct irq_host *h, struct device_node *ct,
                                  const u32 *intspec, unsigned int intsize,
                                  irq_hw_number_t *out_hwirq,
                                  unsigned int *out_flags)
@@ -136,7 +136,7 @@ static int media5200_irq_xlate(struct irq_domain *h, struct device_node *ct,
         return 0;
 }
 
-static const struct irq_domain_ops media5200_irq_ops = {
+static struct irq_host_ops media5200_irq_ops = {
         .map = media5200_irq_map,
         .xlate = media5200_irq_xlate,
 };
@@ -173,12 +173,15 @@ static void __init media5200_init_irq(void)
 
         spin_lock_init(&media5200_irq.lock);
 
-        media5200_irq.irqhost = irq_domain_add_linear(fpga_np,
-                        MEDIA5200_NUM_IRQS, &media5200_irq_ops, &media5200_irq);
+        media5200_irq.irqhost = irq_alloc_host(fpga_np, IRQ_HOST_MAP_LINEAR,
+                                               MEDIA5200_NUM_IRQS,
+                                               &media5200_irq_ops, -1);
         if (!media5200_irq.irqhost)
                 goto out;
         pr_debug("%s: allocated irqhost\n", __func__);
 
+        media5200_irq.irqhost->host_data = &media5200_irq;
+
         irq_set_handler_data(cascade_virq, &media5200_irq);
         irq_set_chained_handler(cascade_virq, media5200_irq_cascade);
 
@@ -232,7 +235,7 @@ static void __init media5200_setup_arch(void)
 }
 
 /* list of the supported boards */
-static const char * const board[] __initconst = {
+static const char *board[] __initdata = {
         "fsl,media5200",
         NULL
 };
diff --git a/arch/powerpc/platforms/52xx/mpc5200_simple.c b/arch/powerpc/platforms/52xx/mpc5200_simple.c
index 792a301a0bf..e36d6e232ae 100644
--- a/arch/powerpc/platforms/52xx/mpc5200_simple.c
+++ b/arch/powerpc/platforms/52xx/mpc5200_simple.c
@@ -50,10 +50,6 @@ static void __init mpc5200_simple_setup_arch(void)
 
 /* list of the supported boards */
 static const char *board[] __initdata = {
-        "anonymous,a3m071",
-        "anonymous,a4m072",
-        "anon,charon",
-        "ifm,o2d",
         "intercontrol,digsy-mtc",
         "manroland,mucmc52",
         "manroland,uc101",
diff --git a/arch/powerpc/platforms/52xx/mpc52xx_common.c b/arch/powerpc/platforms/52xx/mpc52xx_common.c
index d7e94f49532..41f3a7eda1d 100644
--- a/arch/powerpc/platforms/52xx/mpc52xx_common.c
+++ b/arch/powerpc/platforms/52xx/mpc52xx_common.c
@@ -17,7 +17,6 @@
 #include <linux/spinlock.h>
 #include <linux/of_platform.h>
 #include <linux/of_gpio.h>
-#include <linux/export.h>
 #include <asm/io.h>
 #include <asm/prom.h>
 #include <asm/mpc52xx.h>
@@ -98,11 +97,13 @@ struct mpc52xx_gpio_wkup __iomem *wkup_gpio;
  *                                      of the localplus bus to the of_platform
  *                                      bus.
  */
-void __init mpc52xx_declare_of_platform_devices(void)
+void __init
+mpc52xx_declare_of_platform_devices(void)
 {
-        /* Find all the 'platform' devices and register them. */
-        if (of_platform_populate(NULL, mpc52xx_bus_ids, NULL, NULL))
-                pr_err(__FILE__ ": Error while populating devices from DT\n");
+        /* Find every child of the SOC node and add it to of_platform */
+        if (of_platform_bus_probe(NULL, mpc52xx_bus_ids, NULL))
+                printk(KERN_ERR __FILE__ ": "
+                        "Error while probing of_platform bus\n");
 }
 
 /*
diff --git a/arch/powerpc/platforms/52xx/mpc52xx_gpt.c b/arch/powerpc/platforms/52xx/mpc52xx_gpt.c
index 692998244d2..6c39b9cc2fa 100644
--- a/arch/powerpc/platforms/52xx/mpc52xx_gpt.c
+++ b/arch/powerpc/platforms/52xx/mpc52xx_gpt.c
@@ -67,7 +67,6 @@
 #include <linux/watchdog.h>
 #include <linux/miscdevice.h>
 #include <linux/uaccess.h>
-#include <linux/module.h>
 #include <asm/div64.h>
 #include <asm/mpc52xx.h>
 
@@ -81,7 +80,7 @@ MODULE_LICENSE("GPL");
  * @regs: virtual address of GPT registers
  * @lock: spinlock to coordinate between different functions.
  * @gc: gpio_chip instance structure; used when GPIO is enabled
- * @irqhost: Pointer to irq_domain instance; used when IRQ mode is supported
+ * @irqhost: Pointer to irq_host instance; used when IRQ mode is supported
  * @wdt_mode: only relevant for gpt0: bit 0 (MPC52xx_GPT_CAN_WDT) indicates
  *   if the gpt may be used as wdt, bit 1 (MPC52xx_GPT_IS_WDT) indicates
  *   if the timer is actively used as wdt which blocks gpt functions
@@ -91,7 +90,7 @@ struct mpc52xx_gpt_priv {
         struct device *dev;
         struct mpc52xx_gpt __iomem *regs;
         spinlock_t lock;
-        struct irq_domain *irqhost;
+        struct irq_host *irqhost;
         u32 ipb_freq;
         u8 wdt_mode;
 
@@ -204,7 +203,7 @@ void mpc52xx_gpt_irq_cascade(unsigned int virq, struct irq_desc *desc)
         }
 }
 
-static int mpc52xx_gpt_irq_map(struct irq_domain *h, unsigned int virq,
+static int mpc52xx_gpt_irq_map(struct irq_host *h, unsigned int virq,
                                irq_hw_number_t hw)
 {
         struct mpc52xx_gpt_priv *gpt = h->host_data;
@@ -216,7 +215,7 @@ static int mpc52xx_gpt_irq_map(struct irq_domain *h, unsigned int virq,
         return 0;
 }
 
-static int mpc52xx_gpt_irq_xlate(struct irq_domain *h, struct device_node *ct,
+static int mpc52xx_gpt_irq_xlate(struct irq_host *h, struct device_node *ct,
                                  const u32 *intspec, unsigned int intsize,
                                  irq_hw_number_t *out_hwirq,
                                  unsigned int *out_flags)
@@ -236,7 +235,7 @@ static int mpc52xx_gpt_irq_xlate(struct irq_domain *h, struct device_node *ct,
         return 0;
 }
 
-static const struct irq_domain_ops mpc52xx_gpt_irq_ops = {
+static struct irq_host_ops mpc52xx_gpt_irq_ops = {
         .map = mpc52xx_gpt_irq_map,
         .xlate = mpc52xx_gpt_irq_xlate,
 };
@@ -252,12 +251,14 @@ mpc52xx_gpt_irq_setup(struct mpc52xx_gpt_priv *gpt, struct device_node *node)
         if (!cascade_virq)
                 return;
 
-        gpt->irqhost = irq_domain_add_linear(node, 1, &mpc52xx_gpt_irq_ops, gpt);
+        gpt->irqhost = irq_alloc_host(node, IRQ_HOST_MAP_LINEAR, 1,
+                                      &mpc52xx_gpt_irq_ops, -1);
         if (!gpt->irqhost) {
-                dev_err(gpt->dev, "irq_domain_add_linear() failed\n");
+                dev_err(gpt->dev, "irq_alloc_host() failed\n");
                 return;
         }
 
+        gpt->irqhost->host_data = gpt;
         irq_set_handler_data(cascade_virq, gpt);
         irq_set_chained_handler(cascade_virq, mpc52xx_gpt_irq_cascade);
 
@@ -526,7 +527,7 @@ EXPORT_SYMBOL(mpc52xx_gpt_timer_period);
 
 #define WDT_IDENTITY        "mpc52xx watchdog on GPT0"
 
-/* wdt_is_active stores whether or not the /dev/watchdog device is opened */
+/* wdt_is_active stores wether or not the /dev/watchdog device is opened */
 static unsigned long wdt_is_active;
 
 /* wdt-capable gpt */
@@ -669,7 +670,7 @@ static struct miscdevice mpc52xx_wdt_miscdev = {
         .fops           = &mpc52xx_wdt_fops,
 };
 
-static int mpc52xx_gpt_wdt_init(void)
+static int __devinit mpc52xx_gpt_wdt_init(void)
 {
         int err;
 
@@ -704,7 +705,7 @@ static int mpc52xx_gpt_wdt_setup(struct mpc52xx_gpt_priv *gpt,
 
 #else
 
-static int mpc52xx_gpt_wdt_init(void)
+static int __devinit mpc52xx_gpt_wdt_init(void)
 {
         return 0;
 }
@@ -720,7 +721,7 @@ static inline int mpc52xx_gpt_wdt_setup(struct mpc52xx_gpt_priv *gpt,
 /* ---------------------------------------------------------------------
  * of_platform bus binding code
  */
-static int mpc52xx_gpt_probe(struct platform_device *ofdev)
+static int __devinit mpc52xx_gpt_probe(struct platform_device *ofdev)
 {
         struct mpc52xx_gpt_priv *gpt;
 
diff --git a/arch/powerpc/platforms/52xx/mpc52xx_lpbfifo.c b/arch/powerpc/platforms/52xx/mpc52xx_lpbfifo.c
index f9f4537f546..9940ce8a2d4 100644
--- a/arch/powerpc/platforms/52xx/mpc52xx_lpbfifo.c
+++ b/arch/powerpc/platforms/52xx/mpc52xx_lpbfifo.c
@@ -14,7 +14,6 @@
 #include <linux/of.h>
 #include <linux/of_platform.h>
 #include <linux/spinlock.h>
-#include <linux/module.h>
 #include <asm/io.h>
 #include <asm/prom.h>
 #include <asm/mpc52xx.h>
@@ -170,8 +169,7 @@ static void mpc52xx_lpbfifo_kick(struct mpc52xx_lpbfifo_request *req)
         out_be32(lpbfifo.regs + LPBFIFO_REG_CONTROL, bit_fields);
 
         /* Kick it off */
-        if (!lpbfifo.req->defer_xfer_start)
-                out_8(lpbfifo.regs + LPBFIFO_REG_PACKET_SIZE, 0x01);
+        out_8(lpbfifo.regs + LPBFIFO_REG_PACKET_SIZE, 0x01);
         if (dma)
                 bcom_enable(lpbfifo.bcom_cur_task);
 }
@@ -422,38 +420,6 @@ int mpc52xx_lpbfifo_submit(struct mpc52xx_lpbfifo_request *req)
 }
 EXPORT_SYMBOL(mpc52xx_lpbfifo_submit);
 
-int mpc52xx_lpbfifo_start_xfer(struct mpc52xx_lpbfifo_request *req)
-{
-        unsigned long flags;
-
-        if (!lpbfifo.regs)
-                return -ENODEV;
-
-        spin_lock_irqsave(&lpbfifo.lock, flags);
-
-        /*
-         * If the req pointer is already set and a transfer was
-         * started on submit, then this transfer is in progress
-         */
-        if (lpbfifo.req && !lpbfifo.req->defer_xfer_start) {
-                spin_unlock_irqrestore(&lpbfifo.lock, flags);
-                return -EBUSY;
-        }
-
-        /*
-         * If the req was previously submitted but not
-         * started, start it now
-         */
-        if (lpbfifo.req && lpbfifo.req == req &&
-            lpbfifo.req->defer_xfer_start) {
-                out_8(lpbfifo.regs + LPBFIFO_REG_PACKET_SIZE, 0x01);
-        }
-
-        spin_unlock_irqrestore(&lpbfifo.lock, flags);
-        return 0;
-}
-EXPORT_SYMBOL(mpc52xx_lpbfifo_start_xfer);
-
 void mpc52xx_lpbfifo_abort(struct mpc52xx_lpbfifo_request *req)
 {
         unsigned long flags;
@@ -470,7 +436,7 @@ void mpc52xx_lpbfifo_abort(struct mpc52xx_lpbfifo_request *req)
 }
 EXPORT_SYMBOL(mpc52xx_lpbfifo_abort);
 
-static int mpc52xx_lpbfifo_probe(struct platform_device *op)
+static int __devinit mpc52xx_lpbfifo_probe(struct platform_device *op)
 {
         struct resource res;
         int rc = -ENOMEM;
@@ -540,7 +506,7 @@ static int mpc52xx_lpbfifo_probe(struct platform_device *op)
 }
 
 
-static int mpc52xx_lpbfifo_remove(struct platform_device *op)
+static int __devexit mpc52xx_lpbfifo_remove(struct platform_device *op)
 {
         if (lpbfifo.dev != &op->dev)
                 return 0;
@@ -564,7 +530,7 @@ static int mpc52xx_lpbfifo_remove(struct platform_device *op)
         return 0;
 }
 
-static struct of_device_id mpc52xx_lpbfifo_match[] = {
+static struct of_device_id mpc52xx_lpbfifo_match[] __devinitconst = {
         { .compatible = "fsl,mpc5200-lpbfifo", },
         {},
 };
@@ -576,6 +542,20 @@ static struct platform_driver mpc52xx_lpbfifo_driver = {
                 .of_match_table = mpc52xx_lpbfifo_match,
         },
         .probe = mpc52xx_lpbfifo_probe,
-        .remove = mpc52xx_lpbfifo_remove,
+        .remove = __devexit_p(mpc52xx_lpbfifo_remove),
 };
-module_platform_driver(mpc52xx_lpbfifo_driver);
+
+/***********************************************************************
+ * Module init/exit
+ */
+static int __init mpc52xx_lpbfifo_init(void)
+{
+        return platform_driver_register(&mpc52xx_lpbfifo_driver);
+}
+module_init(mpc52xx_lpbfifo_init);
+
+static void __exit mpc52xx_lpbfifo_exit(void)
+{
+        platform_driver_unregister(&mpc52xx_lpbfifo_driver);
+}
+module_exit(mpc52xx_lpbfifo_exit);
diff --git a/arch/powerpc/platforms/52xx/mpc52xx_pci.c b/arch/powerpc/platforms/52xx/mpc52xx_pci.c
index e2d401ad8fb..bfb11e01133 100644
--- a/arch/powerpc/platforms/52xx/mpc52xx_pci.c
+++ b/arch/powerpc/platforms/52xx/mpc52xx_pci.c
@@ -93,7 +93,7 @@ struct mpc52xx_pci {
 };
 
 /* MPC5200 device tree match tables */
-const struct of_device_id mpc52xx_pci_ids[] __initconst = {
+const struct of_device_id mpc52xx_pci_ids[] __initdata = {
         { .type = "pci", .compatible = "fsl,mpc5200-pci", },
         { .type = "pci", .compatible = "mpc5200-pci", },
         {}
diff --git a/arch/powerpc/platforms/52xx/mpc52xx_pic.c b/arch/powerpc/platforms/52xx/mpc52xx_pic.c
index b89ef65392d..1a9a4957057 100644
--- a/arch/powerpc/platforms/52xx/mpc52xx_pic.c
+++ b/arch/powerpc/platforms/52xx/mpc52xx_pic.c
@@ -132,7 +132,7 @@ static struct of_device_id mpc52xx_sdma_ids[] __initdata = {
 
 static struct mpc52xx_intr __iomem *intr;
 static struct mpc52xx_sdma __iomem *sdma;
-static struct irq_domain *mpc52xx_irqhost = NULL;
+static struct irq_host *mpc52xx_irqhost = NULL;
 
 static unsigned char mpc52xx_map_senses[4] = {
         IRQ_TYPE_LEVEL_HIGH,
@@ -301,7 +301,7 @@ static int mpc52xx_is_extirq(int l1, int l2)
 /**
  * mpc52xx_irqhost_xlate - translate virq# from device tree interrupts property
  */
-static int mpc52xx_irqhost_xlate(struct irq_domain *h, struct device_node *ct,
+static int mpc52xx_irqhost_xlate(struct irq_host *h, struct device_node *ct,
                                  const u32 *intspec, unsigned int intsize,
                                  irq_hw_number_t *out_hwirq,
                                  unsigned int *out_flags)
@@ -335,7 +335,7 @@ static int mpc52xx_irqhost_xlate(struct irq_domain *h, struct device_node *ct,
 /**
  * mpc52xx_irqhost_map - Hook to map from virq to an irq_chip structure
  */
-static int mpc52xx_irqhost_map(struct irq_domain *h, unsigned int virq,
+static int mpc52xx_irqhost_map(struct irq_host *h, unsigned int virq,
                                irq_hw_number_t irq)
 {
         int l1irq;
@@ -372,11 +372,10 @@ static int mpc52xx_irqhost_map(struct irq_domain *h, unsigned int virq,
         case MPC52xx_IRQ_L1_MAIN: irqchip = &mpc52xx_main_irqchip; break;
         case MPC52xx_IRQ_L1_PERP: irqchip = &mpc52xx_periph_irqchip; break;
         case MPC52xx_IRQ_L1_SDMA: irqchip = &mpc52xx_sdma_irqchip; break;
-        case MPC52xx_IRQ_L1_CRIT:
-                pr_warn("%s: Critical IRQ #%d is unsupported! Nopping it.\n",
-                        __func__, l2irq);
-                irq_set_chip(virq, &no_irq_chip);
-                return 0;
+        default:
+                pr_err("%s: invalid irq: virq=%i, l1=%i, l2=%i\n",
+                       __func__, virq, l1irq, l2irq);
+                return -EINVAL;
         }
 
         irq_set_chip_and_handler(virq, irqchip, handle_level_irq);
@@ -385,7 +384,7 @@ static int mpc52xx_irqhost_map(struct irq_domain *h, unsigned int virq,
         return 0;
 }
 
-static const struct irq_domain_ops mpc52xx_irqhost_ops = {
+static struct irq_host_ops mpc52xx_irqhost_ops = {
         .xlate = mpc52xx_irqhost_xlate,
         .map = mpc52xx_irqhost_map,
 };
@@ -445,9 +444,9 @@ void __init mpc52xx_init_irq(void)
          * As last step, add an irq host to translate the real
          * hw irq information provided by the ofw to linux virq
          */
-        mpc52xx_irqhost = irq_domain_add_linear(picnode,
+        mpc52xx_irqhost = irq_alloc_host(picnode, IRQ_HOST_MAP_LINEAR,
                                          MPC52xx_IRQ_HIGHTESTHWIRQ,
-                                         &mpc52xx_irqhost_ops, NULL);
+                                         &mpc52xx_irqhost_ops, -1);
 
         if (!mpc52xx_irqhost)
                 panic(__FILE__ ": Cannot allocate the IRQ host\n");