Merge tag 'drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

Pull "ARM: driver specific updates" from Arnd Bergmann:
 "These are all specific to some driver.  They are typically the
  platform side of a change in the drivers directory, such as adding a
  new driver or extending the interface to the platform.  In cases where
  there is no maintainer for the driver, or the maintainer prefers to
  have the platform changes in the same branch as the driver changes,
  the patches to the drivers are included as well.

  A much smaller set of driver updates that depend on other branches
  getting merged first will be sent later.

  The new export of tegra_chip_uid conflicts with other changes in
  fuse.c.  In rtc-sa1100.c, the global removal of IRQF_DISABLED
  conflicts with the cleanup of the interrupt handling of that driver.

  Signed-off-by: Arnd Bergmann <arnd@arndb.de>"

Fixed up aforementioned trivial conflicts.

* tag 'drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (94 commits)
  ARM: SAMSUNG: change the name from s3c-sdhci to exynos4-sdhci
  mmc: sdhci-s3c: add platform data for the second capability
  ARM: SAMSUNG: support the second capability for samsung-soc
  ARM: EXYNOS: add support DMA for EXYNOS4X12 SoC
  ARM: EXYNOS: Add apb_pclk clkdev entry for mdma1
  ARM: EXYNOS: Enable MDMA driver
  regulator: Remove bq24022 regulator driver
  rtc: sa1100: add OF support
  pxa: magician/hx4700: Convert to gpio-regulator from bq24022
  ARM: OMAP3+: SmartReflex: fix error handling
  ARM: OMAP3+: SmartReflex: fix the use of debugfs_create_* API
  ARM: OMAP3+: SmartReflex: micro-optimization for sanity check
  ARM: OMAP3+: SmartReflex: misc cleanups
  ARM: OMAP3+: SmartReflex: move late_initcall() closer to its argument
  ARM: OMAP3+: SmartReflex: add missing platform_set_drvdata()
  ARM: OMAP3+: hwmod: add SmartReflex IRQs
  ARM: OMAP3+: SmartReflex: clear ERRCONFIG_VPBOUNDINTST only on a need
  ARM: OMAP3+: SmartReflex: Fix status masking in ERRCONFIG register
  ARM: OMAP3+: SmartReflex: Add a shutdown hook
  ARM: OMAP3+: SmartReflex Class3: disable errorgen before disable VP
  ...

Conflicts:
	arch/arm/mach-tegra/Makefile
	arch/arm/mach-tegra/fuse.c
	drivers/rtc/rtc-sa1100.c

3 files changed, 154 insertions, 48 deletions

diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
index 4768a9d28375..8c8377d50c4c 100644
--- a/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
@@ -780,8 +780,8 @@ config RTC_DRV_EP93XX
           will be called rtc-ep93xx.
 
 config RTC_DRV_SA1100
-        tristate "SA11x0/PXA2xx"
-        depends on ARCH_SA1100 || ARCH_PXA
+        tristate "SA11x0/PXA2xx/PXA910"
+        depends on ARCH_SA1100 || ARCH_PXA || ARCH_MMP
         help
           If you say Y here you will get access to the real time clock
           built into your SA11x0 or PXA2xx CPU.
diff --git a/drivers/rtc/rtc-s3c.c b/drivers/rtc/rtc-s3c.c
index c543f6f1eec2..9ccea134a996 100644
--- a/drivers/rtc/rtc-s3c.c
+++ b/drivers/rtc/rtc-s3c.c
@@ -35,6 +35,8 @@
 
 enum s3c_cpu_type {
         TYPE_S3C2410,
+        TYPE_S3C2416,
+        TYPE_S3C2443,
         TYPE_S3C64XX,
 };
 
@@ -132,6 +134,7 @@ static int s3c_rtc_setfreq(struct device *dev, int freq)
         struct platform_device *pdev = to_platform_device(dev);
         struct rtc_device *rtc_dev = platform_get_drvdata(pdev);
         unsigned int tmp = 0;
+        int val;
 
         if (!is_power_of_2(freq))
                 return -EINVAL;
@@ -139,12 +142,22 @@ static int s3c_rtc_setfreq(struct device *dev, int freq)
         clk_enable(rtc_clk);
         spin_lock_irq(&s3c_rtc_pie_lock);
 
-        if (s3c_rtc_cpu_type == TYPE_S3C2410) {
+        if (s3c_rtc_cpu_type != TYPE_S3C64XX) {
                 tmp = readb(s3c_rtc_base + S3C2410_TICNT);
                 tmp &= S3C2410_TICNT_ENABLE;
         }
 
-        tmp |= (rtc_dev->max_user_freq / freq)-1;
+        val = (rtc_dev->max_user_freq / freq) - 1;
+
+        if (s3c_rtc_cpu_type == TYPE_S3C2416 || s3c_rtc_cpu_type == TYPE_S3C2443) {
+                tmp |= S3C2443_TICNT_PART(val);
+                writel(S3C2443_TICNT1_PART(val), s3c_rtc_base + S3C2443_TICNT1);
+
+                if (s3c_rtc_cpu_type == TYPE_S3C2416)
+                        writel(S3C2416_TICNT2_PART(val), s3c_rtc_base + S3C2416_TICNT2);
+        } else {
+                tmp |= val;
+        }
 
         writel(tmp, s3c_rtc_base + S3C2410_TICNT);
         spin_unlock_irq(&s3c_rtc_pie_lock);
@@ -371,7 +384,7 @@ static void s3c_rtc_enable(struct platform_device *pdev, int en)
                 tmp &= ~S3C2410_RTCCON_RTCEN;
                 writew(tmp, base + S3C2410_RTCCON);
 
-                if (s3c_rtc_cpu_type == TYPE_S3C2410) {
+                if (s3c_rtc_cpu_type != TYPE_S3C64XX) {
                         tmp = readb(base + S3C2410_TICNT);
                         tmp &= ~S3C2410_TICNT_ENABLE;
                         writeb(tmp, base + S3C2410_TICNT);
@@ -428,12 +441,27 @@ static int __devexit s3c_rtc_remove(struct platform_device *dev)
         return 0;
 }
 
+static const struct of_device_id s3c_rtc_dt_match[];
+
+static inline int s3c_rtc_get_driver_data(struct platform_device *pdev)
+{
+#ifdef CONFIG_OF
+        if (pdev->dev.of_node) {
+                const struct of_device_id *match;
+                match = of_match_node(s3c_rtc_dt_match, pdev->dev.of_node);
+                return match->data;
+        }
+#endif
+        return platform_get_device_id(pdev)->driver_data;
+}
+
 static int __devinit s3c_rtc_probe(struct platform_device *pdev)
 {
         struct rtc_device *rtc;
         struct rtc_time rtc_tm;
         struct resource *res;
         int ret;
+        int tmp;
 
         pr_debug("%s: probe=%p\n", __func__, pdev);
 
@@ -508,13 +536,7 @@ static int __devinit s3c_rtc_probe(struct platform_device *pdev)
                 goto err_nortc;
         }
 
-#ifdef CONFIG_OF
-        if (pdev->dev.of_node)
-                s3c_rtc_cpu_type = of_device_is_compatible(pdev->dev.of_node,
-                        "samsung,s3c6410-rtc") ? TYPE_S3C64XX : TYPE_S3C2410;
-        else
-#endif
-                s3c_rtc_cpu_type = platform_get_device_id(pdev)->driver_data;
+        s3c_rtc_cpu_type = s3c_rtc_get_driver_data(pdev);
 
         /* Check RTC Time */
 
@@ -533,11 +555,17 @@ static int __devinit s3c_rtc_probe(struct platform_device *pdev)
                 dev_warn(&pdev->dev, "warning: invalid RTC value so initializing it\n");
         }
 
-        if (s3c_rtc_cpu_type == TYPE_S3C64XX)
+        if (s3c_rtc_cpu_type != TYPE_S3C2410)
                 rtc->max_user_freq = 32768;
         else
                 rtc->max_user_freq = 128;
 
+        if (s3c_rtc_cpu_type == TYPE_S3C2416 || s3c_rtc_cpu_type == TYPE_S3C2443) {
+                tmp = readw(s3c_rtc_base + S3C2410_RTCCON);
+                tmp |= S3C2443_RTCCON_TICSEL;
+                writew(tmp, s3c_rtc_base + S3C2410_RTCCON);
+        }
+
         platform_set_drvdata(pdev, rtc);
 
         s3c_rtc_setfreq(&pdev->dev, 1);
@@ -638,8 +666,19 @@ static int s3c_rtc_resume(struct platform_device *pdev)
 
 #ifdef CONFIG_OF
 static const struct of_device_id s3c_rtc_dt_match[] = {
-        { .compatible = "samsung,s3c2410-rtc" },
-        { .compatible = "samsung,s3c6410-rtc" },
+        {
+                .compatible = "samsung,s3c2410-rtc"
+                .data = TYPE_S3C2410,
+        }, {
+                .compatible = "samsung,s3c2416-rtc"
+                .data = TYPE_S3C2416,
+        }, {
+                .compatible = "samsung,s3c2443-rtc"
+                .data = TYPE_S3C2443,
+        }, {
+                .compatible = "samsung,s3c6410-rtc"
+                .data = TYPE_S3C64XX,
+        },
         {},
 };
 MODULE_DEVICE_TABLE(of, s3c_rtc_dt_match);
@@ -652,6 +691,12 @@ static struct platform_device_id s3c_rtc_driver_ids[] = {
                 .name           = "s3c2410-rtc",
                 .driver_data    = TYPE_S3C2410,
         }, {
+                .name           = "s3c2416-rtc",
+                .driver_data    = TYPE_S3C2416,
+        }, {
+                .name           = "s3c2443-rtc",
+                .driver_data    = TYPE_S3C2443,
+        }, {
                 .name           = "s3c64xx-rtc",
                 .driver_data    = TYPE_S3C64XX,
         },
diff --git a/drivers/rtc/rtc-sa1100.c b/drivers/rtc/rtc-sa1100.c
index 44cd81c72ea1..fa512ed42017 100644
--- a/drivers/rtc/rtc-sa1100.c
+++ b/drivers/rtc/rtc-sa1100.c
@@ -23,35 +23,44 @@
 
 #include <linux/platform_device.h>
 #include <linux/module.h>
+#include <linux/clk.h>
 #include <linux/rtc.h>
 #include <linux/init.h>
 #include <linux/fs.h>
 #include <linux/interrupt.h>
+#include <linux/slab.h>
 #include <linux/string.h>
+#include <linux/of.h>
 #include <linux/pm.h>
 #include <linux/bitops.h>
 
 #include <mach/hardware.h>
 #include <asm/irq.h>
 
-#ifdef CONFIG_ARCH_PXA
+#if defined(CONFIG_ARCH_PXA) || defined(CONFIG_ARCH_MMP)
 #include <mach/regs-rtc.h>
 #endif
 
 #define RTC_DEF_DIVIDER         (32768 - 1)
 #define RTC_DEF_TRIM            0
-
-static const unsigned long RTC_FREQ = 1024;
-static DEFINE_SPINLOCK(sa1100_rtc_lock);
+#define RTC_FREQ                1024
+
+struct sa1100_rtc {
+        spinlock_t              lock;
+        int                     irq_1hz;
+        int                     irq_alarm;
+        struct rtc_device       *rtc;
+        struct clk              *clk;
+};
 
 static irqreturn_t sa1100_rtc_interrupt(int irq, void *dev_id)
 {
-        struct platform_device *pdev = to_platform_device(dev_id);
-        struct rtc_device *rtc = platform_get_drvdata(pdev);
+        struct sa1100_rtc *info = dev_get_drvdata(dev_id);
+        struct rtc_device *rtc = info->rtc;
         unsigned int rtsr;
         unsigned long events = 0;
 
-        spin_lock(&sa1100_rtc_lock);
+        spin_lock(&info->lock);
 
         rtsr = RTSR;
         /* clear interrupt sources */
@@ -87,26 +96,28 @@ static irqreturn_t sa1100_rtc_interrupt(int irq, void *dev_id)
 
         rtc_update_irq(rtc, 1, events);
 
-        spin_unlock(&sa1100_rtc_lock);
+        spin_unlock(&info->lock);
 
         return IRQ_HANDLED;
 }
 
 static int sa1100_rtc_open(struct device *dev)
 {
+        struct sa1100_rtc *info = dev_get_drvdata(dev);
+        struct rtc_device *rtc = info->rtc;
         int ret;
-        struct platform_device *plat_dev = to_platform_device(dev);
-        struct rtc_device *rtc = platform_get_drvdata(plat_dev);
 
-        ret = request_irq(IRQ_RTC1Hz, sa1100_rtc_interrupt, 0, "rtc 1Hz", dev);
+        ret = clk_prepare_enable(info->clk);
+        if (ret)
+                goto fail_clk;
+        ret = request_irq(info->irq_1hz, sa1100_rtc_interrupt, 0, "rtc 1Hz", dev);
         if (ret) {
-                dev_err(dev, "IRQ %d already in use.\n", IRQ_RTC1Hz);
+                dev_err(dev, "IRQ %d already in use.\n", info->irq_1hz);
                 goto fail_ui;
         }
-        ret = request_irq(IRQ_RTCAlrm, sa1100_rtc_interrupt, 0,
-                          "rtc Alrm", dev);
+        ret = request_irq(info->irq_alarm, sa1100_rtc_interrupt, 0, "rtc Alrm", dev);
         if (ret) {
-                dev_err(dev, "IRQ %d already in use.\n", IRQ_RTCAlrm);
+                dev_err(dev, "IRQ %d already in use.\n", info->irq_alarm);
                 goto fail_ai;
         }
         rtc->max_user_freq = RTC_FREQ;
@@ -115,29 +126,36 @@ static int sa1100_rtc_open(struct device *dev)
         return 0;
 
  fail_ai:
-        free_irq(IRQ_RTC1Hz, dev);
+        free_irq(info->irq_1hz, dev);
  fail_ui:
+        clk_disable_unprepare(info->clk);
+ fail_clk:
         return ret;
 }
 
 static void sa1100_rtc_release(struct device *dev)
 {
-        spin_lock_irq(&sa1100_rtc_lock);
+        struct sa1100_rtc *info = dev_get_drvdata(dev);
+
+        spin_lock_irq(&info->lock);
         RTSR = 0;
-        spin_unlock_irq(&sa1100_rtc_lock);
+        spin_unlock_irq(&info->lock);
 
-        free_irq(IRQ_RTCAlrm, dev);
-        free_irq(IRQ_RTC1Hz, dev);
+        free_irq(info->irq_alarm, dev);
+        free_irq(info->irq_1hz, dev);
+        clk_disable_unprepare(info->clk);
 }
 
 static int sa1100_rtc_alarm_irq_enable(struct device *dev, unsigned int enabled)
 {
-        spin_lock_irq(&sa1100_rtc_lock);
+        struct sa1100_rtc *info = dev_get_drvdata(dev);
+
+        spin_lock_irq(&info->lock);
         if (enabled)
                 RTSR |= RTSR_ALE;
         else
                 RTSR &= ~RTSR_ALE;
-        spin_unlock_irq(&sa1100_rtc_lock);
+        spin_unlock_irq(&info->lock);
         return 0;
 }
 
@@ -170,10 +188,11 @@ static int sa1100_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm)
 
 static int sa1100_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm)
 {
+        struct sa1100_rtc *info = dev_get_drvdata(dev);
         unsigned long time;
         int ret;
 
-        spin_lock_irq(&sa1100_rtc_lock);
+        spin_lock_irq(&info->lock);
         ret = rtc_tm_to_time(&alrm->time, &time);
         if (ret != 0)
                 goto out;
@@ -184,7 +203,7 @@ static int sa1100_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm)
         else
                 RTSR &= ~RTSR_ALE;
 out:
-        spin_unlock_irq(&sa1100_rtc_lock);
+        spin_unlock_irq(&info->lock);
 
         return ret;
 }
@@ -211,6 +230,27 @@ static const struct rtc_class_ops sa1100_rtc_ops = {
 static int sa1100_rtc_probe(struct platform_device *pdev)
 {
         struct rtc_device *rtc;
+        struct sa1100_rtc *info;
+        int irq_1hz, irq_alarm, ret = 0;
+
+        irq_1hz = platform_get_irq_byname(pdev, "rtc 1Hz");
+        irq_alarm = platform_get_irq_byname(pdev, "rtc alarm");
+        if (irq_1hz < 0 || irq_alarm < 0)
+                return -ENODEV;
+
+        info = kzalloc(sizeof(struct sa1100_rtc), GFP_KERNEL);
+        if (!info)
+                return -ENOMEM;
+        info->clk = clk_get(&pdev->dev, NULL);
+        if (IS_ERR(info->clk)) {
+                dev_err(&pdev->dev, "failed to find rtc clock source\n");
+                ret = PTR_ERR(info->clk);
+                goto err_clk;
+        }
+        info->irq_1hz = irq_1hz;
+        info->irq_alarm = irq_alarm;
+        spin_lock_init(&info->lock);
+        platform_set_drvdata(pdev, info);
 
         /*
          * According to the manual we should be able to let RTTR be zero
@@ -232,10 +272,11 @@ static int sa1100_rtc_probe(struct platform_device *pdev)
         rtc = rtc_device_register(pdev->name, &pdev->dev, &sa1100_rtc_ops,
                 THIS_MODULE);
 
-        if (IS_ERR(rtc))
-                return PTR_ERR(rtc);
-
-        platform_set_drvdata(pdev, rtc);
+        if (IS_ERR(rtc)) {
+                ret = PTR_ERR(rtc);
+                goto err_dev;
+        }
+        info->rtc = rtc;
 
         /* Fix for a nasty initialization problem the in SA11xx RTSR register.
          * See also the comments in sa1100_rtc_interrupt().
@@ -262,14 +303,24 @@ static int sa1100_rtc_probe(struct platform_device *pdev)
         RTSR = RTSR_AL | RTSR_HZ;
 
         return 0;
+err_dev:
+        platform_set_drvdata(pdev, NULL);
+        clk_put(info->clk);
+err_clk:
+        kfree(info);
+        return ret;
 }
 
 static int sa1100_rtc_remove(struct platform_device *pdev)
 {
-        struct rtc_device *rtc = platform_get_drvdata(pdev);
+        struct sa1100_rtc *info = platform_get_drvdata(pdev);
 
-        if (rtc)
-                rtc_device_unregister(rtc);
+        if (info) {
+                rtc_device_unregister(info->rtc);
+                clk_put(info->clk);
+                platform_set_drvdata(pdev, NULL);
+                kfree(info);
+        }
 
         return 0;
 }
@@ -277,15 +328,17 @@ static int sa1100_rtc_remove(struct platform_device *pdev)
 #ifdef CONFIG_PM
 static int sa1100_rtc_suspend(struct device *dev)
 {
+        struct sa1100_rtc *info = dev_get_drvdata(dev);
         if (device_may_wakeup(dev))
-                enable_irq_wake(IRQ_RTCAlrm);
+                enable_irq_wake(info->irq_alarm);
         return 0;
 }
 
 static int sa1100_rtc_resume(struct device *dev)
 {
+        struct sa1100_rtc *info = dev_get_drvdata(dev);
         if (device_may_wakeup(dev))
-                disable_irq_wake(IRQ_RTCAlrm);
+                disable_irq_wake(info->irq_alarm);
         return 0;
 }
 
@@ -295,6 +348,13 @@ static const struct dev_pm_ops sa1100_rtc_pm_ops = {
 };
 #endif
 
+static struct of_device_id sa1100_rtc_dt_ids[] = {
+        { .compatible = "mrvl,sa1100-rtc", },
+        { .compatible = "mrvl,mmp-rtc", },
+        {}
+};
+MODULE_DEVICE_TABLE(of, sa1100_rtc_dt_ids);
+
 static struct platform_driver sa1100_rtc_driver = {
         .probe          = sa1100_rtc_probe,
         .remove         = sa1100_rtc_remove,
@@ -303,6 +363,7 @@ static struct platform_driver sa1100_rtc_driver = {
 #ifdef CONFIG_PM
                 .pm     = &sa1100_rtc_pm_ops,
 #endif
+                .of_match_table = sa1100_rtc_dt_ids,
         },
 };