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 0B6BD39E9D8 for ; Tue, 12 May 2026 12:47:25 +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=1778590045; cv=none; b=Z/9XXIv/byl/NvQ0tTXt4juwAk2MHFOnKyTulcSLa6U2+7AgI+uEv8qnWpqgYpO010hesZF9KPG8Z75rqUIXXVGzAUI41KbWJugjUPDx94HGVFnMN8VNnziWTAYsiAGM2pBdwZ2XWXZOFOH7PBayEyjKZqFy5kPpPTcybB7bJXc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778590045; c=relaxed/simple; bh=TcCiJm0iwOg+ZqPg48W/TWpq2EIirqB9bOIXdaPTGRs=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=eOzCSgElgvlogbA17+gmeQaU+rsyMujy5JylsHbnr8DNzWT6WnGSeJvmMn0lurzSHRl6xxc+NLOxWkUZDy43v/UpxoH2ximGYmQGVzIQeN3ERljfKrEWAKoG6Wc4QVYW0THSwjJdXjHgA5IvyHbPBiXIBMyP/W+H3eg9cR0Q0Hg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=UsT5nKJn; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="UsT5nKJn" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B97ADC2BCB0; Tue, 12 May 2026 12:47:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1778590044; bh=TcCiJm0iwOg+ZqPg48W/TWpq2EIirqB9bOIXdaPTGRs=; h=Subject:To:Cc:From:Date:From; b=UsT5nKJnkiB6fi8+U/DAeLlbtuOCPMOXfBAWxvmuRtrOViYOeybIpz0iTGCJScsoU j9JjJJF/BdvxuhOEUZElZpupPFXudF9wbOagK4MGklXFgWsiNytx6Ado97S+0tifhu L6fVeYegfCZ3gqPVullmfEqCtzyFzV/XlXbU/LjM= Subject: FAILED: patch "[PATCH] spi: zynq-qspi: fix controller deregistration" failed to apply to 6.1-stable tree To: johan@kernel.org,broonie@kernel.org,naga.sureshkumar.relli@xilinx.com Cc: From: Date: Tue, 12 May 2026 14:46:03 +0200 Message-ID: <2026051203-regain-crablike-8461@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit The patch below does not apply to the 6.1-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.1.y git checkout FETCH_HEAD git cherry-pick -x c9c012706c9fa8ca6d129a9161caf92ab625a3fd # git commit -s git send-email --to '' --in-reply-to '2026051203-regain-crablike-8461@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^.. Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From c9c012706c9fa8ca6d129a9161caf92ab625a3fd Mon Sep 17 00:00:00 2001 From: Johan Hovold Date: Fri, 10 Apr 2026 10:17:56 +0200 Subject: [PATCH] spi: zynq-qspi: fix controller deregistration Make sure to deregister the controller before disabling it during driver unbind. Note that clocks were also disabled before the recent commit 1f8fd9490e31 ("spi: zynq-qspi: Simplify clock handling with devm_clk_get_enabled()"). Fixes: 67dca5e580f1 ("spi: spi-mem: Add support for Zynq QSPI controller") Cc: stable@vger.kernel.org # 5.2: 8eb2fd00f65a Cc: stable@vger.kernel.org # 5.2 Cc: Naga Sureshkumar Relli Signed-off-by: Johan Hovold Link: https://patch.msgid.link/20260410081757.503099-27-johan@kernel.org Signed-off-by: Mark Brown diff --git a/drivers/spi/spi-zynq-qspi.c b/drivers/spi/spi-zynq-qspi.c index af252500195c..406fd9d5337e 100644 --- a/drivers/spi/spi-zynq-qspi.c +++ b/drivers/spi/spi-zynq-qspi.c @@ -643,7 +643,7 @@ static int zynq_qspi_probe(struct platform_device *pdev) xqspi = spi_controller_get_devdata(ctlr); xqspi->dev = dev; - platform_set_drvdata(pdev, xqspi); + platform_set_drvdata(pdev, ctlr); xqspi->regs = devm_platform_ioremap_resource(pdev, 0); if (IS_ERR(xqspi->regs)) { ret = PTR_ERR(xqspi->regs); @@ -702,9 +702,9 @@ static int zynq_qspi_probe(struct platform_device *pdev) /* QSPI controller initializations */ zynq_qspi_init_hw(xqspi, ctlr->num_chipselect); - ret = devm_spi_register_controller(&pdev->dev, ctlr); + ret = spi_register_controller(ctlr); if (ret) { - dev_err(&pdev->dev, "devm_spi_register_controller failed\n"); + dev_err(&pdev->dev, "failed to register controller\n"); goto remove_ctlr; } @@ -728,9 +728,16 @@ static int zynq_qspi_probe(struct platform_device *pdev) */ static void zynq_qspi_remove(struct platform_device *pdev) { - struct zynq_qspi *xqspi = platform_get_drvdata(pdev); + struct spi_controller *ctlr = platform_get_drvdata(pdev); + struct zynq_qspi *xqspi = spi_controller_get_devdata(ctlr); + + spi_controller_get(ctlr); + + spi_unregister_controller(ctlr); zynq_qspi_write(xqspi, ZYNQ_QSPI_ENABLE_OFFSET, 0); + + spi_controller_put(ctlr); } static const struct of_device_id zynq_qspi_of_match[] = {