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 E45F83033FC for ; Fri, 15 May 2026 05:27:59 +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=1778822880; cv=none; b=FtPPfpz5+qbb2cPpNLu8tumXtU5gqwJd9mGPlcf4fRvYn6Ju4UgBjyCdR3s5Uep5Ia78z4kW4my8XfdHR3aSfUWZnwHvxS7avnHyIX6UMKRVXtu8yffplm4BQcolq6BwKq8Vr2fXY8Go/2c8qs5koSN1k/4ALW8VJ+vKF0yHCaU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778822880; c=relaxed/simple; bh=t7Qkt6W/zlm8tkzRN1HEKGltDkXREfXly99AuLmmJnU=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=Nk+pwkIWjVG+CYCOwwkQZ+kh9cDm6Tw8HaAbG2+r/oiX/R3pQ+f1XK5Vw6tuoZekFujg/6d727ivsXDu+eYH4uEwgbp/WqqCSvECRqf1fTC6NqkmMP8RZTMWJ9AEnUjVY20NvpZ6+wfEnpCiJxpoR8qbdpP5UuDUbweIZ+3DSvo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Ler8yfBK; 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="Ler8yfBK" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3E17AC2BCB0; Fri, 15 May 2026 05:27:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1778822879; bh=t7Qkt6W/zlm8tkzRN1HEKGltDkXREfXly99AuLmmJnU=; h=Subject:To:Cc:From:Date:From; b=Ler8yfBK/jvZi9d78NNmKNXXFz6es/MzG8vgsOtBdEvTkV/WXZD1LwyN/QXh54Sjf c9EuJmYocsfiOilEG/EcEqRUL1c90XEU25A/nkeckDOvnaT80cD9dhDKnpw8TJbibg ZaqBpAQ3N9me+0WtrNnCuvsbEV2B0qhpZ6NnBYoo= Subject: FAILED: patch "[PATCH] spi: bcm63xx: fix controller deregistration" failed to apply to 6.1-stable tree To: johan@kernel.org,broonie@kernel.org,florian@openwrt.org Cc: From: Date: Fri, 15 May 2026 07:28:03 +0200 Message-ID: <2026051503-trough-swan-680a@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 c39e65a4e3b8e764efed0b2f5152a1a8547b80fd # git commit -s git send-email --to '' --in-reply-to '2026051503-trough-swan-680a@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^.. Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From c39e65a4e3b8e764efed0b2f5152a1a8547b80fd Mon Sep 17 00:00:00 2001 From: Johan Hovold Date: Thu, 9 Apr 2026 14:04:04 +0200 Subject: [PATCH] spi: bcm63xx: fix controller deregistration Make sure to deregister the controller before disabling underlying resources like clocks during driver unbind. Fixes: b42dfed83d95 ("spi: add Broadcom BCM63xx SPI controller driver") Cc: stable@vger.kernel.org # 3.4 Cc: Florian Fainelli Signed-off-by: Johan Hovold Link: https://patch.msgid.link/20260409120419.388546-6-johan@kernel.org Signed-off-by: Mark Brown diff --git a/drivers/spi/spi-bcm63xx.c b/drivers/spi/spi-bcm63xx.c index 47266bb23a33..40cd7efc4b54 100644 --- a/drivers/spi/spi-bcm63xx.c +++ b/drivers/spi/spi-bcm63xx.c @@ -602,7 +602,7 @@ static int bcm63xx_spi_probe(struct platform_device *pdev) goto out_clk_disable; /* register and we are done */ - ret = devm_spi_register_controller(dev, host); + ret = spi_register_controller(host); if (ret) { dev_err(dev, "spi register failed\n"); goto out_clk_disable; @@ -625,11 +625,17 @@ static void bcm63xx_spi_remove(struct platform_device *pdev) struct spi_controller *host = platform_get_drvdata(pdev); struct bcm63xx_spi *bs = spi_controller_get_devdata(host); + spi_controller_get(host); + + spi_unregister_controller(host); + /* reset spi block */ bcm_spi_writeb(bs, 0, SPI_INT_MASK); /* HW shutdown */ clk_disable_unprepare(bs->clk); + + spi_controller_put(host); } static int bcm63xx_spi_suspend(struct device *dev)