These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / reset / reset-socfpga.c

diff --git a/kernel/drivers/reset/reset-socfpga.c b/kernel/drivers/reset/reset-socfpga.c
index 0a8def3..1a6c5d6 100644 (file)
--- a/kernel/drivers/reset/reset-socfpga.c
+++ b/kernel/drivers/reset/reset-socfpga.c
@@ -24,11 +24,11 @@
 #include <linux/types.h>
 
 #define NR_BANKS               4
-#define OFFSET_MODRST          0x10
 
 struct socfpga_reset_data {
        spinlock_t                      lock;
        void __iomem                    *membase;
+       u32                             modrst_offset;
        struct reset_controller_dev     rcdev;
 };
 
@@ -45,8 +45,8 @@ static int socfpga_reset_assert(struct reset_controller_dev *rcdev,
 
        spin_lock_irqsave(&data->lock, flags);
 
-       reg = readl(data->membase + OFFSET_MODRST + (bank * NR_BANKS));
-       writel(reg | BIT(offset), data->membase + OFFSET_MODRST +
+       reg = readl(data->membase + data->modrst_offset + (bank * NR_BANKS));
+       writel(reg | BIT(offset), data->membase + data->modrst_offset +
                                 (bank * NR_BANKS));
        spin_unlock_irqrestore(&data->lock, flags);
 
@@ -67,8 +67,8 @@ static int socfpga_reset_deassert(struct reset_controller_dev *rcdev,
 
        spin_lock_irqsave(&data->lock, flags);
 
-       reg = readl(data->membase + OFFSET_MODRST + (bank * NR_BANKS));
-       writel(reg & ~BIT(offset), data->membase + OFFSET_MODRST +
+       reg = readl(data->membase + data->modrst_offset + (bank * NR_BANKS));
+       writel(reg & ~BIT(offset), data->membase + data->modrst_offset +
                                  (bank * NR_BANKS));
 
        spin_unlock_irqrestore(&data->lock, flags);
@@ -85,7 +85,7 @@ static int socfpga_reset_status(struct reset_controller_dev *rcdev,
        int offset = id % BITS_PER_LONG;
        u32 reg;
 
-       reg = readl(data->membase + OFFSET_MODRST + (bank * NR_BANKS));
+       reg = readl(data->membase + data->modrst_offset + (bank * NR_BANKS));
 
        return !(reg & BIT(offset));
 }
@@ -100,6 +100,8 @@ static int socfpga_reset_probe(struct platform_device *pdev)
 {
        struct socfpga_reset_data *data;
        struct resource *res;
+       struct device *dev = &pdev->dev;
+       struct device_node *np = dev->of_node;
 
        /*
         * The binding was mainlined without the required property.
@@ -120,6 +122,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)) {
+               dev_warn(dev, "missing altr,modrst-offset property, assuming 0x10!\n");
+               data->modrst_offset = 0x10;
+       }
+
        spin_lock_init(&data->lock);
 
        data->rcdev.owner = THIS_MODULE;