FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2024-12-21 00:42:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

reset: socfpga: no need to store modrst_offset

Browse Source 
Since we can just add it to membase once, there is no need to store
modrst_offset separately, and to repeat the addition with every access.

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Tested-by: Dinh Nguyen <dinguyen@opensource.altera.com>
This commit is contained in:
Philipp Zabel 2016-07-04 19:47:56 +02:00
parent 29b4817d40
commit 6b37d3e956
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/reset/reset-socfpga.c
View File

@ -28,7 +28,6 @@
struct socfpga_reset_data { struct socfpga_reset_data {
spinlock_t lock; spinlock_t lock;
void __iomem *membase; void __iomem *membase;
u32 modrst_offset;
struct reset_controller_dev rcdev; 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); spin_lock_irqsave(&data->lock, flags);
reg = readl(data->membase + data->modrst_offset + (bank * NR_BANKS)); reg = readl(data->membase + (bank * NR_BANKS));
writel(reg | BIT(offset), data->membase + data->modrst_offset + writel(reg | BIT(offset), data->membase + (bank * NR_BANKS));
(bank * NR_BANKS));
spin_unlock_irqrestore(&data->lock, flags); spin_unlock_irqrestore(&data->lock, flags);
return 0; return 0;
@ -67,9 +65,8 @@ static int socfpga_reset_deassert(struct reset_controller_dev *rcdev,
spin_lock_irqsave(&data->lock, flags); spin_lock_irqsave(&data->lock, flags);
reg = readl(data->membase + data->modrst_offset + (bank * NR_BANKS)); reg = readl(data->membase + (bank * NR_BANKS));
writel(reg & ~BIT(offset), data->membase + data->modrst_offset + writel(reg & ~BIT(offset), data->membase + (bank * NR_BANKS));
(bank * NR_BANKS));
spin_unlock_irqrestore(&data->lock, flags); 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; int offset = id % BITS_PER_LONG;
u32 reg; u32 reg;
reg = readl(data->membase + data->modrst_offset + (bank * NR_BANKS)); reg = readl(data->membase + (bank * NR_BANKS));
return !(reg & BIT(offset)); return !(reg & BIT(offset));
} }
@ -102,6 +99,7 @@ static int socfpga_reset_probe(struct platform_device *pdev)
struct resource *res; struct resource *res;
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
struct device_node *np = dev->of_node; struct device_node *np = dev->of_node;
u32 modrst_offset;
/* /*
* The binding was mainlined without the required property. * 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)) if (IS_ERR(data->membase))
return PTR_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"); 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); spin_lock_init(&data->lock);