Merge tag 'driver-core-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-block.git] / drivers / reset / reset-socfpga.c

diff --git a/drivers/reset/reset-socfpga.c b/drivers/reset/reset-socfpga.c
index 9181bea64d7aa20c7c6df71749b7793b650902ea..0a8def35ea2e8c80143164f007da7b9a261492ae 100644 (file)
--- 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)