From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 886463AEF55; Fri, 10 Apr 2026 08:18:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775809137; cv=none; b=ke3KdPWNLl8mwMsOWK2sVj2d1eKQcEkhiNRcKVqI8TQhqx641O5O03QR+GMXks/Bbfmd8UfbB6am4t0D7m0ErLwm2OzbfDziOfQGukr1tR6VOgPdknsKXvWF7A9+fa2MucLD/cb45PeDtZlds7NtUi/IahP4H3ggLmzwgu2A3no= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775809137; c=relaxed/simple; bh=oIoO31Tr4BrNrbzjJkVs3aKhZMdVhAa7NWZUPdbCDIQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=DUQaEf7NX9KKW/24RkZWFEr4mZXkHyzweAdOEQGffU93AFaf2+sp/WJtYNo/X/lDU8zp3NIVtsqLS886Jxfvh1BjdOd0IFs0KKKm69wx4GPkC+RVRz8M2dhTE4Xe4I771vlzBkh70XY0KPy2OypW+fmj3QSEX1Q31vc1yt56Dnw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=J8I/AqTu; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="J8I/AqTu" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D19CFC4AF53; Fri, 10 Apr 2026 08:18:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1775809137; bh=oIoO31Tr4BrNrbzjJkVs3aKhZMdVhAa7NWZUPdbCDIQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=J8I/AqTuF1e80i6xP8cUi48p5r6O9s7PTFyK6xIXU6mvNHB/8gvx/e8Qb57A+jreQ 60A06aZwvROlBtkEbX8Z3598gbym8pmMEmFa2l3mbz8/2HxpXpaS/sKqUhPjBmmBar GkICw+PoyRnr/RdO+dmBSXtO9vY3JR3p5rOip+H+FyxJKDDIEJqP3BDSWS1GoNbw69 3gVumM021v9BnlMmuBBv3rg4IZrJt++snRVvEcwMNOzEuUv4HvljS69yGnrkGFnRlP NioHGGmD52qu/7W6J3JPp29p1W4NzGHuv2n6qagd/CDD9oYZUa+UzDglZhHEXFhC+y znCCxPYCXlQ9g== Received: from johan by xi.lan with local (Exim 4.98.2) (envelope-from ) id 1wB74o-000000026v4-0I9J; Fri, 10 Apr 2026 10:18:54 +0200 From: Johan Hovold To: Mark Brown Cc: Matthias Brugger , AngeloGioacchino Del Regno , Frank Li , Sascha Hauer , Andrew Jeffery , Avi Fishman , Tomer Maimon , Tali Perry , Linus Walleij , Andi Shyti , Tudor Ambarus , Paul Walmsley , Samuel Holland , Orson Zhai , Baolin Wang , Jernej Skrabec , Masahisa Kojima , Jassi Brar , Laxman Dewangan , Kunihiko Hayashi , Masami Hiramatsu , Michal Simek , linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold , stable@vger.kernel.org, Ranjit Waghmode Subject: [PATCH 25/26] spi: zynqmp-gqspi: fix controller deregistration Date: Fri, 10 Apr 2026 10:17:55 +0200 Message-ID: <20260410081757.503099-26-johan@kernel.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260410081757.503099-1-johan@kernel.org> References: <20260410081757.503099-1-johan@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Make sure to deregister the controller before disabling underlying resources like clocks during driver unbind. Fixes: dfe11a11d523 ("spi: Add support for Zynq Ultrascale+ MPSoC GQSPI controller") Cc: stable@vger.kernel.org # 4.2: 64640f6c972e Cc: stable@vger.kernel.org # 4.2 Cc: Ranjit Waghmode Signed-off-by: Johan Hovold --- drivers/spi/spi-zynqmp-gqspi.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/spi/spi-zynqmp-gqspi.c b/drivers/spi/spi-zynqmp-gqspi.c index 502fd5eccc83..f9a1427dabad 100644 --- a/drivers/spi/spi-zynqmp-gqspi.c +++ b/drivers/spi/spi-zynqmp-gqspi.c @@ -1324,7 +1324,7 @@ static int zynqmp_qspi_probe(struct platform_device *pdev) ctlr->dev.of_node = np; ctlr->auto_runtime_pm = true; - ret = devm_spi_register_controller(&pdev->dev, ctlr); + ret = spi_register_controller(ctlr); if (ret) { dev_err(&pdev->dev, "spi_register_controller failed\n"); goto clk_dis_all; @@ -1362,6 +1362,8 @@ static void zynqmp_qspi_remove(struct platform_device *pdev) pm_runtime_get_sync(&pdev->dev); + spi_unregister_controller(xqspi->ctlr); + zynqmp_gqspi_write(xqspi, GQSPI_EN_OFST, 0x0); pm_runtime_disable(&pdev->dev); -- 2.52.0