Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc

[platform/kernel/linux-starfive.git] / drivers / reset / reset-meson.c

diff --git a/drivers/reset/reset-meson.c b/drivers/reset/reset-meson.c
index a8b915e..c419a37 100644 (file)
--- a/drivers/reset/reset-meson.c
+++ b/drivers/reset/reset-meson.c
@@ -62,13 +62,16 @@
 #include <linux/reset-controller.h>
 #include <linux/slab.h>
 #include <linux/types.h>
+#include <linux/of_device.h>
 
 #define REG_COUNT      8
 #define BITS_PER_REG   32
+#define LEVEL_OFFSET   0x7c
 
 struct meson_reset {
        void __iomem *reg_base;
        struct reset_controller_dev rcdev;
+       spinlock_t lock;
 };
 
 static int meson_reset_reset(struct reset_controller_dev *rcdev,
@@ -80,26 +83,68 @@ static int meson_reset_reset(struct reset_controller_dev *rcdev,
        unsigned int offset = id % BITS_PER_REG;
        void __iomem *reg_addr = data->reg_base + (bank << 2);
 
-       if (bank >= REG_COUNT)
-               return -EINVAL;
-
        writel(BIT(offset), reg_addr);
 
        return 0;
 }
 
-static const struct reset_control_ops meson_reset_ops = {
+static int meson_reset_level(struct reset_controller_dev *rcdev,
+                           unsigned long id, bool assert)
+{
+       struct meson_reset *data =
+               container_of(rcdev, struct meson_reset, rcdev);
+       unsigned int bank = id / BITS_PER_REG;
+       unsigned int offset = id % BITS_PER_REG;
+       void __iomem *reg_addr = data->reg_base + LEVEL_OFFSET + (bank << 2);
+       unsigned long flags;
+       u32 reg;
+
+       spin_lock_irqsave(&data->lock, flags);
+
+       reg = readl(reg_addr);
+       if (assert)
+               writel(reg & ~BIT(offset), reg_addr);
+       else
+               writel(reg | BIT(offset), reg_addr);
+
+       spin_unlock_irqrestore(&data->lock, flags);
+
+       return 0;
+}
+
+static int meson_reset_assert(struct reset_controller_dev *rcdev,
+                             unsigned long id)
+{
+       return meson_reset_level(rcdev, id, true);
+}
+
+static int meson_reset_deassert(struct reset_controller_dev *rcdev,
+                               unsigned long id)
+{
+       return meson_reset_level(rcdev, id, false);
+}
+
+static const struct reset_control_ops meson_reset_meson8_ops = {
        .reset          = meson_reset_reset,
 };
 
+static const struct reset_control_ops meson_reset_gx_ops = {
+       .reset          = meson_reset_reset,
+       .assert         = meson_reset_assert,
+       .deassert       = meson_reset_deassert,
+};
+
 static const struct of_device_id meson_reset_dt_ids[] = {
-        { .compatible = "amlogic,meson8b-reset", },
-        { .compatible = "amlogic,meson-gxbb-reset", },
+        { .compatible = "amlogic,meson8b-reset",
+          .data = &meson_reset_meson8_ops, },
+        { .compatible = "amlogic,meson-gxbb-reset",
+          .data = &meson_reset_gx_ops, },
         { /* sentinel */ },
 };
 
 static int meson_reset_probe(struct platform_device *pdev)
 {
+       const struct reset_control_ops *ops;
        struct meson_reset *data;
        struct resource *res;
 
@@ -107,6 +152,10 @@ static int meson_reset_probe(struct platform_device *pdev)
        if (!data)
                return -ENOMEM;
 
+       ops = of_device_get_match_data(&pdev->dev);
+       if (!ops)
+               return -EINVAL;
+
        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
        data->reg_base = devm_ioremap_resource(&pdev->dev, res);
        if (IS_ERR(data->reg_base))
@@ -114,9 +163,11 @@ static int meson_reset_probe(struct platform_device *pdev)
 
        platform_set_drvdata(pdev, data);
 
+       spin_lock_init(&data->lock);
+
        data->rcdev.owner = THIS_MODULE;
        data->rcdev.nr_resets = REG_COUNT * BITS_PER_REG;
-       data->rcdev.ops = &meson_reset_ops;
+       data->rcdev.ops = ops;
        data->rcdev.of_node = pdev->dev.of_node;
 
        return devm_reset_controller_register(&pdev->dev, &data->rcdev);