Merge remote-tracking branch 'scott/next' into next

Freescale updates from Scott:

<<
Highlights include 32-bit booke relocatable support, e6500 hardware
tablewalk support, various e500 SPE fixes, some new/revived boards, and
e6500 deeper idle and altivec powerdown modes.
>>

4 files changed, 37 insertions, 13 deletions

diff --git a/arch/powerpc/sysdev/fsl_lbc.c b/arch/powerpc/sysdev/fsl_lbc.c
index 6bc5a546d49f..d631022ffb4b 100644
--- a/arch/powerpc/sysdev/fsl_lbc.c
+++ b/arch/powerpc/sysdev/fsl_lbc.c
@@ -214,10 +214,14 @@ static irqreturn_t fsl_lbc_ctrl_irq(int irqno, void *data)
         struct fsl_lbc_ctrl *ctrl = data;
         struct fsl_lbc_regs __iomem *lbc = ctrl->regs;
         u32 status;
+        unsigned long flags;
 
+        spin_lock_irqsave(&fsl_lbc_lock, flags);
         status = in_be32(&lbc->ltesr);
-        if (!status)
+        if (!status) {
+                spin_unlock_irqrestore(&fsl_lbc_lock, flags);
                 return IRQ_NONE;
+        }
 
         out_be32(&lbc->ltesr, LTESR_CLEAR);
         out_be32(&lbc->lteatr, 0);
@@ -260,6 +264,7 @@ static irqreturn_t fsl_lbc_ctrl_irq(int irqno, void *data)
         if (status & ~LTESR_MASK)
                 dev_err(ctrl->dev, "Unknown error: "
                         "LTESR 0x%08X\n", status);
+        spin_unlock_irqrestore(&fsl_lbc_lock, flags);
         return IRQ_HANDLED;
 }
 
@@ -298,8 +303,8 @@ static int fsl_lbc_ctrl_probe(struct platform_device *dev)
                 goto err;
         }
 
-        fsl_lbc_ctrl_dev->irq = irq_of_parse_and_map(dev->dev.of_node, 0);
-        if (fsl_lbc_ctrl_dev->irq == NO_IRQ) {
+        fsl_lbc_ctrl_dev->irq[0] = irq_of_parse_and_map(dev->dev.of_node, 0);
+        if (!fsl_lbc_ctrl_dev->irq[0]) {
                 dev_err(&dev->dev, "failed to get irq resource\n");
                 ret = -ENODEV;
                 goto err;
@@ -311,20 +316,34 @@ static int fsl_lbc_ctrl_probe(struct platform_device *dev)
         if (ret < 0)
                 goto err;
 
-        ret = request_irq(fsl_lbc_ctrl_dev->irq, fsl_lbc_ctrl_irq, 0,
+        ret = request_irq(fsl_lbc_ctrl_dev->irq[0], fsl_lbc_ctrl_irq, 0,
                                 "fsl-lbc", fsl_lbc_ctrl_dev);
         if (ret != 0) {
                 dev_err(&dev->dev, "failed to install irq (%d)\n",
-                        fsl_lbc_ctrl_dev->irq);
-                ret = fsl_lbc_ctrl_dev->irq;
+                        fsl_lbc_ctrl_dev->irq[0]);
+                ret = fsl_lbc_ctrl_dev->irq[0];
                 goto err;
         }
 
+        fsl_lbc_ctrl_dev->irq[1] = irq_of_parse_and_map(dev->dev.of_node, 1);
+        if (fsl_lbc_ctrl_dev->irq[1]) {
+                ret = request_irq(fsl_lbc_ctrl_dev->irq[1], fsl_lbc_ctrl_irq,
+                                IRQF_SHARED, "fsl-lbc-err", fsl_lbc_ctrl_dev);
+                if (ret) {
+                        dev_err(&dev->dev, "failed to install irq (%d)\n",
+                                        fsl_lbc_ctrl_dev->irq[1]);
+                        ret = fsl_lbc_ctrl_dev->irq[1];
+                        goto err1;
+                }
+        }
+
         /* Enable interrupts for any detected events */
         out_be32(&fsl_lbc_ctrl_dev->regs->lteir, LTEIR_ENABLE);
 
         return 0;
 
+err1:
+        free_irq(fsl_lbc_ctrl_dev->irq[0], fsl_lbc_ctrl_dev);
 err:
         iounmap(fsl_lbc_ctrl_dev->regs);
         kfree(fsl_lbc_ctrl_dev);
diff --git a/arch/powerpc/sysdev/fsl_pci.c b/arch/powerpc/sysdev/fsl_pci.c
index 7066e5262468..a625dcf26b2b 100644
--- a/arch/powerpc/sysdev/fsl_pci.c
+++ b/arch/powerpc/sysdev/fsl_pci.c
@@ -454,7 +454,7 @@ void fsl_pcibios_fixup_bus(struct pci_bus *bus)
         }
 }
 
-int __init fsl_add_bridge(struct platform_device *pdev, int is_primary)
+int fsl_add_bridge(struct platform_device *pdev, int is_primary)
 {
         int len;
         struct pci_controller *hose;
@@ -1035,6 +1035,7 @@ static const struct of_device_id pci_ids[] = {
         { .compatible = "fsl,mpc8548-pcie", },
         { .compatible = "fsl,mpc8610-pci", },
         { .compatible = "fsl,mpc8641-pcie", },
+        { .compatible = "fsl,qoriq-pcie", },
         { .compatible = "fsl,qoriq-pcie-v2.1", },
         { .compatible = "fsl,qoriq-pcie-v2.2", },
         { .compatible = "fsl,qoriq-pcie-v2.3", },
diff --git a/arch/powerpc/sysdev/indirect_pci.c b/arch/powerpc/sysdev/indirect_pci.c
index c6c8b526a4f6..1f6c570d66d4 100644
--- a/arch/powerpc/sysdev/indirect_pci.c
+++ b/arch/powerpc/sysdev/indirect_pci.c
@@ -152,10 +152,8 @@ static struct pci_ops indirect_pci_ops =
         .write = indirect_write_config,
 };
 
-void __init
-setup_indirect_pci(struct pci_controller* hose,
-                   resource_size_t cfg_addr,
-                   resource_size_t cfg_data, u32 flags)
+void setup_indirect_pci(struct pci_controller *hose, resource_size_t cfg_addr,
+                        resource_size_t cfg_data, u32 flags)
 {
         resource_size_t base = cfg_addr & PAGE_MASK;
         void __iomem *mbase;
diff --git a/arch/powerpc/sysdev/mpic_timer.c b/arch/powerpc/sysdev/mpic_timer.c
index 22d7d57eead9..9d9b06217f8b 100644
--- a/arch/powerpc/sysdev/mpic_timer.c
+++ b/arch/powerpc/sysdev/mpic_timer.c
@@ -41,6 +41,7 @@
 #define MPIC_TIMER_TCR_ROVR_OFFSET      24
 
 #define TIMER_STOP                      0x80000000
+#define GTCCR_TOG                       0x80000000
 #define TIMERS_PER_GROUP                4
 #define MAX_TICKS                       (~0U >> 1)
 #define MAX_TICKS_CASCADE               (~0U)
@@ -96,8 +97,11 @@ static void convert_ticks_to_time(struct timer_group_priv *priv,
         time->tv_sec = (__kernel_time_t)div_u64(ticks, priv->timerfreq);
         tmp_sec = (u64)time->tv_sec * (u64)priv->timerfreq;
 
-        time->tv_usec = (__kernel_suseconds_t)
-                div_u64((ticks - tmp_sec) * 1000000, priv->timerfreq);
+        time->tv_usec = 0;
+
+        if (tmp_sec <= ticks)
+                time->tv_usec = (__kernel_suseconds_t)
+                        div_u64((ticks - tmp_sec) * 1000000, priv->timerfreq);
 
         return;
 }
@@ -327,11 +331,13 @@ void mpic_get_remain_time(struct mpic_timer *handle, struct timeval *time)
         casc_priv = priv->timer[handle->num].cascade_handle;
         if (casc_priv) {
                 tmp_ticks = in_be32(&priv->regs[handle->num].gtccr);
+                tmp_ticks &= ~GTCCR_TOG;
                 ticks = ((u64)tmp_ticks & UINT_MAX) * (u64)MAX_TICKS_CASCADE;
                 tmp_ticks = in_be32(&priv->regs[handle->num - 1].gtccr);
                 ticks += tmp_ticks;
         } else {
                 ticks = in_be32(&priv->regs[handle->num].gtccr);
+                ticks &= ~GTCCR_TOG;
         }
 
         convert_ticks_to_time(priv, ticks, time);