diff options
Diffstat (limited to 'remoteproc/juno_fpga_reset.c')
| -rw-r--r-- | remoteproc/juno_fpga_reset.c | 38 |
1 files changed, 22 insertions, 16 deletions
diff --git a/remoteproc/juno_fpga_reset.c b/remoteproc/juno_fpga_reset.c index fab90cf..29b2eb9 100644 --- a/remoteproc/juno_fpga_reset.c +++ b/remoteproc/juno_fpga_reset.c @@ -1,5 +1,6 @@ /* - * Copyright (c) 2021 Arm Limited. All rights reserved. + * SPDX-FileCopyrightText: Copyright 2021, 2023 Arm Limited and/or its affiliates <open-source-office@arm.com> + * SPDX-License-Identifier: GPL-2.0-only * * This program is free software and is provided to you under the terms of the * GNU General Public License version 2 as published by the Free Software @@ -14,8 +15,6 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, you can access it online at * http://www.gnu.org/licenses/gpl-2.0.html. - * - * SPDX-License-Identifier: GPL-2.0-only */ #include <linux/io.h> @@ -55,21 +54,23 @@ static void __iomem *verify_and_remap(struct device *dev, id = readl(JUNO_FPGA_RESET_ID(base)); if (id != 0x2010f && - id != 0x20110 && - id != 0x20111 && - id != 0x20112) { - dev_err(dev, "ID not matching"); + id != 0x20110 && + id != 0x20111 && + id != 0x20112) { + dev_err(dev, "ID not matching"); + return IOMEM_ERR_PTR(-EINVAL); - } + } return base; } int juno_fpga_reset_assert(struct reset_controller_dev *rcdev, - unsigned long id) + unsigned long id) { - struct juno_fpga_reset *reset = container_of(rcdev, struct juno_fpga_reset, - rst); + struct juno_fpga_reset *reset = container_of(rcdev, + struct juno_fpga_reset, + rst); /* pull reset */ dev_dbg(reset->dev, "Asserting reset"); @@ -82,20 +83,23 @@ int juno_fpga_reset_assert(struct reset_controller_dev *rcdev, writel(JUNO_FPGA_RESET_UNSET_RESET, JUNO_FPGA_RESET_SOFT_RESET(reset->base)); + return 0; } int juno_fpga_reset_deassert(struct reset_controller_dev *rcdev, - unsigned long id) + unsigned long id) { - struct juno_fpga_reset *reset = container_of(rcdev, struct juno_fpga_reset, - rst); + struct juno_fpga_reset *reset = container_of(rcdev, + struct juno_fpga_reset, + rst); /* release wait */ dev_dbg(reset->dev, "Deasserting reset"); writel(JUNO_FPGA_RESET_UNSET_CPUWAIT, JUNO_FPGA_RESET_CPU_WAIT(reset->base)); + return 0; } @@ -125,9 +129,11 @@ static int juno_fpga_reset_probe(struct platform_device *pdev) reset->dev = dev; if (IS_ERR(reset->base)) { - dev_err(dev, "Failed to verify and remap base address (%ld)", PTR_ERR(reset->base)); + dev_err(dev, "Failed to verify and remap base address (%ld)", + PTR_ERR(reset->base)); + return PTR_ERR(reset->base); - } + } platform_set_drvdata(pdev, reset); |