diff options
| author | Steffen Trumtrar <s.trumtrar@pengutronix.de> | 2018-01-10 09:31:21 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2018-01-11 09:41:52 +0100 |
| commit | bb9534df1e8b4bfad3c2065b0c4eb861442efbfd (patch) | |
| tree | ba3ad4631b305e23c93beebbdcd70c11298f2e84 /drivers/reset | |
| parent | beb402ada8371ec2f6be6cbe6693c47fe59a05fc (diff) | |
| download | barebox-bb9534df1e8b4bfad3c2065b0c4eb861442efbfd.tar.gz barebox-bb9534df1e8b4bfad3c2065b0c4eb861442efbfd.tar.xz | |
reset: reset-socfpga: sync driver with linux
Sync the SoCFPGA reset driver with Linux v4.14-rc1.
Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/reset')
| -rw-r--r-- | drivers/reset/reset-socfpga.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/drivers/reset/reset-socfpga.c b/drivers/reset/reset-socfpga.c index 9214197e62..dd081ee84f 100644 --- a/drivers/reset/reset-socfpga.c +++ b/drivers/reset/reset-socfpga.c @@ -22,12 +22,12 @@ #include <linux/spinlock.h> #include <linux/types.h> -#define NR_BANKS 4 +#define BANK_INCREMENT 4 +#define NR_BANKS 8 struct socfpga_reset_data { spinlock_t lock; void __iomem *membase; - u32 modrst_offset; struct reset_controller_dev rcdev; }; @@ -44,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 * BANK_INCREMENT)); + writel(reg | BIT(offset), data->membase + (bank * BANK_INCREMENT)); spin_unlock_irqrestore(&data->lock, flags); return 0; @@ -66,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 * BANK_INCREMENT)); + writel(reg & ~BIT(offset), data->membase + (bank * BANK_INCREMENT)); spin_unlock_irqrestore(&data->lock, flags); @@ -85,6 +83,7 @@ static int socfpga_reset_probe(struct device_d *dev) struct socfpga_reset_data *data; struct resource *res; struct device_node *np = dev->device_node; + u32 modrst_offset; data = xzalloc(sizeof(*data)); @@ -93,10 +92,11 @@ static int socfpga_reset_probe(struct device_d *dev) 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); |