Merge tag 'nfs-for-4.9-1' of git://git.linux-nfs.org/projects/anna/linux-nfs

[cascardo/linux.git] / drivers / reset / reset-socfpga.c

diff --git a/drivers/reset/reset-socfpga.c b/drivers/reset/reset-socfpga.c
index 12add9b..78ebf84 100644 (file)
--- a/drivers/reset/reset-socfpga.c
+++ b/drivers/reset/reset-socfpga.c
@@ -28,7 +28,6 @@
 struct socfpga_reset_data {
        spinlock_t                      lock;
        void __iomem                    *membase;
-       u32                             modrst_offset;
        struct reset_controller_dev     rcdev;
 };
 
@@ -45,9 +44,8 @@ static int socfpga_reset_assert(struct reset_controller_dev *rcdev,
 
        spin_lock_irqsave(&data->lock, flags);
 
-       reg = readl(data->membase + data->modrst_offset + (bank * NR_BANKS));
-       writel(reg | BIT(offset), data->membase + data->modrst_offset +
-                                (bank * NR_BANKS));
+       reg = readl(data->membase + (bank * NR_BANKS));
+       writel(reg | BIT(offset), data->membase + (bank * NR_BANKS));
        spin_unlock_irqrestore(&data->lock, flags);
 
        return 0;
@@ -67,9 +65,8 @@ static int socfpga_reset_deassert(struct reset_controller_dev *rcdev,
 
        spin_lock_irqsave(&data->lock, flags);
 
-       reg = readl(data->membase + data->modrst_offset + (bank * NR_BANKS));
-       writel(reg & ~BIT(offset), data->membase + data->modrst_offset +
-                                 (bank * NR_BANKS));
+       reg = readl(data->membase + (bank * NR_BANKS));
+       writel(reg & ~BIT(offset), data->membase + (bank * NR_BANKS));
 
        spin_unlock_irqrestore(&data->lock, flags);
 
@@ -85,7 +82,7 @@ static int socfpga_reset_status(struct reset_controller_dev *rcdev,
        int offset = id % BITS_PER_LONG;
        u32 reg;
 
-       reg = readl(data->membase + data->modrst_offset + (bank * NR_BANKS));
+       reg = readl(data->membase + (bank * NR_BANKS));
 
        return !(reg & BIT(offset));
 }
@@ -102,6 +99,7 @@ static int socfpga_reset_probe(struct platform_device *pdev)
        struct resource *res;
        struct device *dev = &pdev->dev;
        struct device_node *np = dev->of_node;
+       u32 modrst_offset;
 
        /*
         * The binding was mainlined without the required property.
@@ -122,10 +120,11 @@ static int socfpga_reset_probe(struct platform_device *pdev)
        if (IS_ERR(data->membase))
                return PTR_ERR(data->membase);
 
-       if (of_property_read_u32(np, "altr,modrst-offset", &data->modrst_offset)) {
+       if (of_property_read_u32(np, "altr,modrst-offset", &modrst_offset)) {
                dev_warn(dev, "missing altr,modrst-offset property, assuming 0x10!\n");
-               data->modrst_offset = 0x10;
+               modrst_offset = 0x10;
        }
+       data->membase += modrst_offset;
 
        spin_lock_init(&data->lock);