summaryrefslogtreecommitdiffstats
path: root/drivers/fpga
diff options
context:
space:
mode:
authorPhilipp Zabel <p.zabel@pengutronix.de>2017-08-01 21:20:52 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-08-10 14:27:55 -0700
commit4fd72fd29d4a90d9117038f4e15e4073aeb3bf7f (patch)
treefd25069ca8dc5ba326089b69778b5cf3b352d195 /drivers/fpga
parent13bf35b571950f664ac48cd7b593177f1ba6dafd (diff)
downloadlinux-4fd72fd29d4a90d9117038f4e15e4073aeb3bf7f.tar.bz2
ARM: socfpga: explicitly request exclusive reset control
Commit a53e35db70d1 ("reset: Ensure drivers are explicit when requesting reset lines") started to transition the reset control request API calls to explicitly state whether the driver needs exclusive or shared reset control behavior. Convert all drivers requesting exclusive resets to the explicit API call so the temporary transition helpers can be removed. No functional changes. Cc: Alan Tull <atull@kernel.org> Cc: Moritz Fischer <moritz.fischer@ettus.com> Cc: linux-fpga@vger.kernel.org Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de> Acked-By: Moritz Fischer <mdf@kernel.org> Signed-off-by: Alan Tull <atull@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/fpga')
-rw-r--r--drivers/fpga/altera-hps2fpga.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/fpga/altera-hps2fpga.c b/drivers/fpga/altera-hps2fpga.c
index 3066b805f2d0..a18ff430c9af 100644
--- a/drivers/fpga/altera-hps2fpga.c
+++ b/drivers/fpga/altera-hps2fpga.c
@@ -145,7 +145,8 @@ static int alt_fpga_bridge_probe(struct platform_device *pdev)
of_id = of_match_device(altera_fpga_of_match, dev);
priv = (struct altera_hps2fpga_data *)of_id->data;
- priv->bridge_reset = of_reset_control_get_by_index(dev->of_node, 0);
+ priv->bridge_reset = of_reset_control_get_exclusive_by_index(dev->of_node,
+ 0);
if (IS_ERR(priv->bridge_reset)) {
dev_err(dev, "Could not get %s reset control\n", priv->name);
return PTR_ERR(priv->bridge_reset);