Merge branch 'next' into for-linus

Prepare first round of input updates for 3.17.

5 files changed, 167 insertions, 3 deletions

diff --git a/drivers/reset/Makefile b/drivers/reset/Makefile
index 4f60caf750ce..60fed3d7820b 100644
--- a/drivers/reset/Makefile
+++ b/drivers/reset/Makefile
@@ -1,3 +1,4 @@
 obj-$(CONFIG_RESET_CONTROLLER) += core.o
+obj-$(CONFIG_ARCH_SOCFPGA) += reset-socfpga.o
 obj-$(CONFIG_ARCH_SUNXI) += reset-sunxi.o
 obj-$(CONFIG_ARCH_STI) += sti/
diff --git a/drivers/reset/reset-socfpga.c b/drivers/reset/reset-socfpga.c
new file mode 100644
index 000000000000..79c32ca84ef1
--- /dev/null
+++ b/drivers/reset/reset-socfpga.c
@@ -0,0 +1,146 @@
+/*
+ * Copyright 2014 Steffen Trumtrar <s.trumtrar@pengutronix.de>
+ *
+ * based on
+ * Allwinner SoCs Reset Controller driver
+ *
+ * Copyright 2013 Maxime Ripard
+ *
+ * Maxime Ripard <maxime.ripard@free-electrons.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ */
+
+#include <linux/err.h>
+#include <linux/io.h>
+#include <linux/module.h>
+#include <linux/of.h>
+#include <linux/platform_device.h>
+#include <linux/reset-controller.h>
+#include <linux/spinlock.h>
+#include <linux/types.h>
+
+#define NR_BANKS                4
+#define OFFSET_MODRST           0x10
+
+struct socfpga_reset_data {
+        spinlock_t                      lock;
+        void __iomem                    *membase;
+        struct reset_controller_dev     rcdev;
+};
+
+static int socfpga_reset_assert(struct reset_controller_dev *rcdev,
+                                unsigned long id)
+{
+        struct socfpga_reset_data *data = container_of(rcdev,
+                                                     struct socfpga_reset_data,
+                                                     rcdev);
+        int bank = id / BITS_PER_LONG;
+        int offset = id % BITS_PER_LONG;
+        unsigned long flags;
+        u32 reg;
+
+        spin_lock_irqsave(&data->lock, flags);
+
+        reg = readl(data->membase + OFFSET_MODRST + (bank * NR_BANKS));
+        writel(reg | BIT(offset), data->membase + OFFSET_MODRST +
+                                 (bank * NR_BANKS));
+        spin_unlock_irqrestore(&data->lock, flags);
+
+        return 0;
+}
+
+static int socfpga_reset_deassert(struct reset_controller_dev *rcdev,
+                                  unsigned long id)
+{
+        struct socfpga_reset_data *data = container_of(rcdev,
+                                                     struct socfpga_reset_data,
+                                                     rcdev);
+
+        int bank = id / BITS_PER_LONG;
+        int offset = id % BITS_PER_LONG;
+        unsigned long flags;
+        u32 reg;
+
+        spin_lock_irqsave(&data->lock, flags);
+
+        reg = readl(data->membase + OFFSET_MODRST + (bank * NR_BANKS));
+        writel(reg & ~BIT(offset), data->membase + OFFSET_MODRST +
+                                  (bank * NR_BANKS));
+
+        spin_unlock_irqrestore(&data->lock, flags);
+
+        return 0;
+}
+
+static struct reset_control_ops socfpga_reset_ops = {
+        .assert         = socfpga_reset_assert,
+        .deassert       = socfpga_reset_deassert,
+};
+
+static int socfpga_reset_probe(struct platform_device *pdev)
+{
+        struct socfpga_reset_data *data;
+        struct resource *res;
+
+        /*
+         * The binding was mainlined without the required property.
+         * Do not continue, when we encounter an old DT.
+         */
+        if (!of_find_property(pdev->dev.of_node, "#reset-cells", NULL)) {
+                dev_err(&pdev->dev, "%s missing #reset-cells property\n",
+                        pdev->dev.of_node->full_name);
+                return -EINVAL;
+        }
+
+        data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL);
+        if (!data)
+                return -ENOMEM;
+
+        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        data->membase = devm_ioremap_resource(&pdev->dev, res);
+        if (IS_ERR(data->membase))
+                return PTR_ERR(data->membase);
+
+        spin_lock_init(&data->lock);
+
+        data->rcdev.owner = THIS_MODULE;
+        data->rcdev.nr_resets = NR_BANKS * BITS_PER_LONG;
+        data->rcdev.ops = &socfpga_reset_ops;
+        data->rcdev.of_node = pdev->dev.of_node;
+        reset_controller_register(&data->rcdev);
+
+        return 0;
+}
+
+static int socfpga_reset_remove(struct platform_device *pdev)
+{
+        struct socfpga_reset_data *data = platform_get_drvdata(pdev);
+
+        reset_controller_unregister(&data->rcdev);
+
+        return 0;
+}
+
+static const struct of_device_id socfpga_reset_dt_ids[] = {
+        { .compatible = "altr,rst-mgr", },
+        { /* sentinel */ },
+};
+
+static struct platform_driver socfpga_reset_driver = {
+        .probe  = socfpga_reset_probe,
+        .remove = socfpga_reset_remove,
+        .driver = {
+                .name           = "socfpga-reset",
+                .owner          = THIS_MODULE,
+                .of_match_table = socfpga_reset_dt_ids,
+        },
+};
+module_platform_driver(socfpga_reset_driver);
+
+MODULE_AUTHOR("Steffen Trumtrar <s.trumtrar@pengutronix.de");
+MODULE_DESCRIPTION("Socfpga Reset Controller Driver");
+MODULE_LICENSE("GPL");
diff --git a/drivers/reset/reset-sunxi.c b/drivers/reset/reset-sunxi.c
index 695bd3496eba..a94e7a7820b4 100644
--- a/drivers/reset/reset-sunxi.c
+++ b/drivers/reset/reset-sunxi.c
@@ -145,7 +145,24 @@ MODULE_DEVICE_TABLE(of, sunxi_reset_dt_ids);
 
 static int sunxi_reset_probe(struct platform_device *pdev)
 {
-        return sunxi_reset_init(pdev->dev.of_node);
+        struct sunxi_reset_data *data;
+        struct resource *res;
+
+        data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL);
+        if (!data)
+                return -ENOMEM;
+
+        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        data->membase = devm_ioremap_resource(&pdev->dev, res);
+        if (IS_ERR(data->membase))
+                return PTR_ERR(data->membase);
+
+        data->rcdev.owner = THIS_MODULE;
+        data->rcdev.nr_resets = resource_size(res) * 32;
+        data->rcdev.ops = &sunxi_reset_ops;
+        data->rcdev.of_node = pdev->dev.of_node;
+
+        return reset_controller_register(&data->rcdev);
 }
 
 static int sunxi_reset_remove(struct platform_device *pdev)
@@ -153,8 +170,6 @@ static int sunxi_reset_remove(struct platform_device *pdev)
         struct sunxi_reset_data *data = platform_get_drvdata(pdev);
 
         reset_controller_unregister(&data->rcdev);
-        iounmap(data->membase);
-        kfree(data);
 
         return 0;
 }
diff --git a/drivers/reset/sti/reset-stih415.c b/drivers/reset/sti/reset-stih415.c
index e6f6c41abe12..c93fd260447e 100644
--- a/drivers/reset/sti/reset-stih415.c
+++ b/drivers/reset/sti/reset-stih415.c
@@ -73,6 +73,7 @@ static const struct syscfg_reset_channel_data stih415_softresets[] = {
         [STIH415_USB0_SOFTRESET] = STIH415_SRST_REAR(SYSCFG_376, 9),
         [STIH415_USB1_SOFTRESET] = STIH415_SRST_REAR(SYSCFG_376, 10),
         [STIH415_USB2_SOFTRESET] = STIH415_SRST_REAR(SYSCFG_376, 11),
+        [STIH415_KEYSCAN_SOFTRESET] = STIH415_SRST_LPM(LPM_SYSCFG_1, 8),
 };
 
 static struct syscfg_reset_controller_data stih415_powerdown_controller = {
diff --git a/drivers/reset/sti/reset-stih416.c b/drivers/reset/sti/reset-stih416.c
index fe3bf02bdc8c..5fc987076a90 100644
--- a/drivers/reset/sti/reset-stih416.c
+++ b/drivers/reset/sti/reset-stih416.c
@@ -104,6 +104,7 @@ static const struct syscfg_reset_channel_data stih416_softresets[] = {
         [STIH416_COMPO_A_SOFTRESET] = STIH416_SRST_CPU(SYSCFG_7564, 4),
         [STIH416_VP8_DEC_SOFTRESET] = STIH416_SRST_CPU(SYSCFG_7564, 10),
         [STIH416_VTG_MAIN_SOFTRESET] = STIH416_SRST_CPU(SYSCFG_7564, 16),
+        [STIH416_KEYSCAN_SOFTRESET] = STIH416_SRST_LPM(LPM_SYSCFG_1, 8),
 };
 
 static struct syscfg_reset_controller_data stih416_powerdown_controller = {