Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: (56 commits)
  sh: Fix declaration of __kernel_sigreturn and __kernel_rt_sigreturn
  sh: Enable soc-camera in ap325rxa/migor/se7724 defconfigs.
  sh: remove stray markers.
  sh: defconfig updates.
  sh: pci: Initial PCI-Express support for SH7786 Urquell board.
  sh: Generic HAVE_PERF_COUNTER support.
  SH: convert migor to soc-camera as platform-device
  SH: convert ap325rxa to soc-camera as platform-device
  soc-camera: unify i2c camera device platform data
  sh: add platform data for r8a66597-hcd in setup-sh7723
  sh: add platform data for r8a66597-hcd in setup-sh7366
  sh: x3proto: add platform data for r8a66597-hcd
  sh: highlander: add platform data for r8a66597-hcd
  sh: sh7785lcr: add platform data for r8a66597-hcd
  sh: turn off irqs when disabling CMT/TMU timers
  sh: use kzalloc() for cpg clocks
  sh: unbreak WARN_ON()
  sh: Use generic atomic64_t implementation.
  sh: Revised clock function in highlander
  sh: Update r7780mp defconfig
  ...

7 files changed, 30 insertions, 22 deletions

diff --git a/drivers/clocksource/sh_cmt.c b/drivers/clocksource/sh_cmt.c
index cf56a2af5fe1..2964f5f4a7ef 100644
--- a/drivers/clocksource/sh_cmt.c
+++ b/drivers/clocksource/sh_cmt.c
@@ -184,6 +184,9 @@ static void sh_cmt_disable(struct sh_cmt_priv *p)
         /* disable channel */
         sh_cmt_start_stop_ch(p, 0);
 
+        /* disable interrupts in CMT block */
+        sh_cmt_write(p, CMCSR, 0);
+
         /* stop clock */
         clk_disable(p->clk);
 }
@@ -599,7 +602,6 @@ static int sh_cmt_setup(struct sh_cmt_priv *p, struct platform_device *pdev)
         p->irqaction.handler = sh_cmt_interrupt;
         p->irqaction.dev_id = p;
         p->irqaction.flags = IRQF_DISABLED | IRQF_TIMER | IRQF_IRQPOLL;
-        p->irqaction.mask = CPU_MASK_NONE;
         ret = setup_irq(irq, &p->irqaction);
         if (ret) {
                 pr_err("sh_cmt: failed to request irq %d\n", irq);
diff --git a/drivers/clocksource/sh_mtu2.c b/drivers/clocksource/sh_mtu2.c
index d1ae75454d10..973e714d6051 100644
--- a/drivers/clocksource/sh_mtu2.c
+++ b/drivers/clocksource/sh_mtu2.c
@@ -283,7 +283,6 @@ static int sh_mtu2_setup(struct sh_mtu2_priv *p, struct platform_device *pdev)
         p->irqaction.dev_id = p;
         p->irqaction.irq = irq;
         p->irqaction.flags = IRQF_DISABLED | IRQF_TIMER | IRQF_IRQPOLL;
-        p->irqaction.mask = CPU_MASK_NONE;
 
         /* get hold of clock */
         p->clk = clk_get(&p->pdev->dev, cfg->clk);
diff --git a/drivers/clocksource/sh_tmu.c b/drivers/clocksource/sh_tmu.c
index d6ea4398bf62..9ffb05f4095d 100644
--- a/drivers/clocksource/sh_tmu.c
+++ b/drivers/clocksource/sh_tmu.c
@@ -138,6 +138,9 @@ static void sh_tmu_disable(struct sh_tmu_priv *p)
         /* disable channel */
         sh_tmu_start_stop_ch(p, 0);
 
+        /* disable interrupts in TMU block */
+        sh_tmu_write(p, TCR, 0x0000);
+
         /* stop clock */
         clk_disable(p->clk);
 }
@@ -385,7 +388,6 @@ static int sh_tmu_setup(struct sh_tmu_priv *p, struct platform_device *pdev)
         p->irqaction.dev_id = p;
         p->irqaction.irq = irq;
         p->irqaction.flags = IRQF_DISABLED | IRQF_TIMER | IRQF_IRQPOLL;
-        p->irqaction.mask = CPU_MASK_NONE;
 
         /* get hold of clock */
         p->clk = clk_get(&p->pdev->dev, cfg->clk);
diff --git a/drivers/media/video/ov772x.c b/drivers/media/video/ov772x.c
index c0d911252862..0bce255168bd 100644
--- a/drivers/media/video/ov772x.c
+++ b/drivers/media/video/ov772x.c
@@ -1067,10 +1067,12 @@ static int ov772x_probe(struct i2c_client *client,
         struct i2c_adapter        *adapter = to_i2c_adapter(client->dev.parent);
         int                        ret;
 
-        info = client->dev.platform_data;
-        if (!info)
+        if (!client->dev.platform_data)
                 return -EINVAL;
 
+        info = container_of(client->dev.platform_data,
+                            struct ov772x_camera_info, link);
+
         if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA)) {
                 dev_err(&adapter->dev,
                         "I2C-Adapter doesn't support "
diff --git a/drivers/media/video/tw9910.c b/drivers/media/video/tw9910.c
index a39947643992..aa5065ea09ed 100644
--- a/drivers/media/video/tw9910.c
+++ b/drivers/media/video/tw9910.c
@@ -875,10 +875,12 @@ static int tw9910_probe(struct i2c_client *client,
         const struct tw9910_scale_ctrl *scale;
         int                             i, ret;
 
-        info = client->dev.platform_data;
-        if (!info)
+        if (!client->dev.platform_data)
                 return -EINVAL;
 
+        info = container_of(client->dev.platform_data,
+                            struct tw9910_video_info, link);
+
         if (!i2c_check_functionality(to_i2c_adapter(client->dev.parent),
                                      I2C_FUNC_SMBUS_BYTE_DATA)) {
                 dev_err(&client->dev,
diff --git a/drivers/serial/sh-sci.c b/drivers/serial/sh-sci.c
index a4cf1079b312..66f52674ca0c 100644
--- a/drivers/serial/sh-sci.c
+++ b/drivers/serial/sh-sci.c
@@ -1332,44 +1332,46 @@ err_unreg:
         return ret;
 }
 
-static int sci_suspend(struct platform_device *dev, pm_message_t state)
+static int sci_suspend(struct device *dev)
 {
-        struct sh_sci_priv *priv = platform_get_drvdata(dev);
+        struct sh_sci_priv *priv = dev_get_drvdata(dev);
         struct sci_port *p;
         unsigned long flags;
 
         spin_lock_irqsave(&priv->lock, flags);
         list_for_each_entry(p, &priv->ports, node)
                 uart_suspend_port(&sci_uart_driver, &p->port);
-
         spin_unlock_irqrestore(&priv->lock, flags);
 
         return 0;
 }
 
-static int sci_resume(struct platform_device *dev)
+static int sci_resume(struct device *dev)
 {
-        struct sh_sci_priv *priv = platform_get_drvdata(dev);
+        struct sh_sci_priv *priv = dev_get_drvdata(dev);
         struct sci_port *p;
         unsigned long flags;
 
         spin_lock_irqsave(&priv->lock, flags);
         list_for_each_entry(p, &priv->ports, node)
                 uart_resume_port(&sci_uart_driver, &p->port);
-
         spin_unlock_irqrestore(&priv->lock, flags);
 
         return 0;
 }
 
+static struct dev_pm_ops sci_dev_pm_ops = {
+        .suspend        = sci_suspend,
+        .resume         = sci_resume,
+};
+
 static struct platform_driver sci_driver = {
         .probe          = sci_probe,
         .remove         = __devexit_p(sci_remove),
-        .suspend        = sci_suspend,
-        .resume         = sci_resume,
         .driver         = {
                 .name   = "sh-sci",
                 .owner  = THIS_MODULE,
+                .pm     = &sci_dev_pm_ops,
         },
 };
 
diff --git a/drivers/sh/intc.c b/drivers/sh/intc.c
index d687a9b93d03..3dd231a643b5 100644
--- a/drivers/sh/intc.c
+++ b/drivers/sh/intc.c
@@ -20,7 +20,6 @@
 #include <linux/module.h>
 #include <linux/io.h>
 #include <linux/interrupt.h>
-#include <linux/bootmem.h>
 #include <linux/sh_intc.h>
 #include <linux/sysdev.h>
 #include <linux/list.h>
@@ -675,7 +674,7 @@ void __init register_intc_controller(struct intc_desc *desc)
         unsigned int i, k, smp;
         struct intc_desc_int *d;
 
-        d = alloc_bootmem(sizeof(*d));
+        d = kzalloc(sizeof(*d), GFP_NOWAIT);
 
         INIT_LIST_HEAD(&d->list);
         list_add(&d->list, &intc_list);
@@ -687,9 +686,9 @@ void __init register_intc_controller(struct intc_desc *desc)
 #if defined(CONFIG_CPU_SH3) || defined(CONFIG_CPU_SH4A)
         d->nr_reg += desc->ack_regs ? desc->nr_ack_regs : 0;
 #endif
-        d->reg = alloc_bootmem(d->nr_reg * sizeof(*d->reg));
+        d->reg = kzalloc(d->nr_reg * sizeof(*d->reg), GFP_NOWAIT);
 #ifdef CONFIG_SMP
-        d->smp = alloc_bootmem(d->nr_reg * sizeof(*d->smp));
+        d->smp = kzalloc(d->nr_reg * sizeof(*d->smp), GFP_NOWAIT);
 #endif
         k = 0;
 
@@ -702,7 +701,7 @@ void __init register_intc_controller(struct intc_desc *desc)
         }
 
         if (desc->prio_regs) {
-                d->prio = alloc_bootmem(desc->nr_vectors * sizeof(*d->prio));
+                d->prio = kzalloc(desc->nr_vectors * sizeof(*d->prio), GFP_NOWAIT);
 
                 for (i = 0; i < desc->nr_prio_regs; i++) {
                         smp = IS_SMP(desc->prio_regs[i]);
@@ -712,7 +711,7 @@ void __init register_intc_controller(struct intc_desc *desc)
         }
 
         if (desc->sense_regs) {
-                d->sense = alloc_bootmem(desc->nr_vectors * sizeof(*d->sense));
+                d->sense = kzalloc(desc->nr_vectors * sizeof(*d->sense), GFP_NOWAIT);
 
                 for (i = 0; i < desc->nr_sense_regs; i++) {
                         k += save_reg(d, k, desc->sense_regs[i].reg, 0);
@@ -757,7 +756,7 @@ void __init register_intc_controller(struct intc_desc *desc)
                         vect2->enum_id = 0;
 
                         if (!intc_evt2irq_table)
-                                intc_evt2irq_table = alloc_bootmem(NR_IRQS);
+                                intc_evt2irq_table = kzalloc(NR_IRQS, GFP_NOWAIT);
 
                         if (!intc_evt2irq_table) {
                                 pr_warning("intc: cannot allocate evt2irq!\n");