diff options
| author | Dinh Nguyen <dinguyen@opensource.altera.com> | 2014-11-03 23:33:05 +0100 |
|---|---|---|
| committer | Philipp Zabel <p.zabel@pengutronix.de> | 2014-11-04 12:40:16 +0100 |
| commit | f200890f224d9ed0af207145a2279f51c6be230b (patch) | |
| tree | d3d3ac0712eb44648e295ad4303c895666e35f9f /drivers/reset | |
| parent | Merge tag 'sti-reset-for-v3.19-1' of git://git.stlinux.com/devel/kernel/linux... (diff) | |
| download | linux-f200890f224d9ed0af207145a2279f51c6be230b.tar.xz linux-f200890f224d9ed0af207145a2279f51c6be230b.zip | |
reset: add socfpga_reset_status
Populate the reset_status callback for SOCFPGA.
Signed-off-by: Alan Tull <atull@opensource.altera.com>
Signed-off-by: Dinh Nguyen <dinguyen@opensource.altera.com>
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Diffstat (limited to 'drivers/reset')
| -rw-r--r-- | drivers/reset/reset-socfpga.c | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/drivers/reset/reset-socfpga.c b/drivers/reset/reset-socfpga.c index 79c32ca84ef1..40582089474a 100644 --- a/drivers/reset/reset-socfpga.c +++ b/drivers/reset/reset-socfpga.c @@ -76,9 +76,24 @@ static int socfpga_reset_deassert(struct reset_controller_dev *rcdev, return 0; } +static int socfpga_reset_status(struct reset_controller_dev *rcdev, + unsigned long id) +{ + struct socfpga_reset_data *data = container_of(rcdev, + struct socfpga_reset_data, rcdev); + int bank = id / BITS_PER_LONG; + int offset = id % BITS_PER_LONG; + u32 reg; + + reg = readl(data->membase + OFFSET_MODRST + (bank * NR_BANKS)); + + return !(reg & BIT(offset)); +} + static struct reset_control_ops socfpga_reset_ops = { .assert = socfpga_reset_assert, .deassert = socfpga_reset_deassert, + .status = socfpga_reset_status, }; static int socfpga_reset_probe(struct platform_device *pdev) |