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 42BAA19E80F for ; Mon, 24 Jun 2024 16:49:20 +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=1719247761; cv=none; b=JvQE+G8x25nvraQ+XU3/TyDYYk0fRmH7QraPaHICTL16CHMqZPBZPYK5EkEw/lE1hyslLPqUgI9DyAA9qDSn0yYASevoTzmIGqT6Q00xcPMFoGChBogPwJphBjNZuZ+GJnyNcmfk9ksZPBUnM+xg3BQDDGGAQlPMgHUT8L1BDTg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719247761; c=relaxed/simple; bh=fl162koaNQxLqRLwNApP+mrc4LqwN+RzNH5KboSNC+U=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=daZ0RDEve4iUNyfD5MQaerI7buTO5np+4sYwslqiUnxklGPFgUrT++pZBTmlGcfMG0B48pWUlV3g5NwVQU376t16Cqofb2NFunN50AwxmYm/8+HWjBBMoUoZXjibaSG8BRP0ygCn25Up+tkOZYUO8lukAf4a7KAy6UO0kfVTTPM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=0xAGIrCR; 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="0xAGIrCR" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 695CEC2BBFC; Mon, 24 Jun 2024 16:49:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1719247760; bh=fl162koaNQxLqRLwNApP+mrc4LqwN+RzNH5KboSNC+U=; h=Subject:To:Cc:From:Date:From; b=0xAGIrCRKUl/qzzGHf7JyVOr6jT98zbnaoTxVrnVh/JrsLkK7U73hkeyOQ9i00fWJ XOAod+vPj/evOZNryVA9zZBOhI1CZ3R0AYIgEutFj/23EY96A7j3h0/tkZsAdr3XtL Tn9jJ85rMUgSuuDKV/cAeHG0mdeu2h6mWTBP3iKg= Subject: FAILED: patch "[PATCH] spi: cs42l43: Drop cs35l56 SPI speed down to 11MHz" failed to apply to 6.1-stable tree To: ckeepax@opensource.cirrus.com,broonie@kernel.org Cc: From: Date: Mon, 24 Jun 2024 18:49:15 +0200 Message-ID: <2024062415-shakable-matching-e69e@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 60980cf5b8c8cc9182e5e9dbb62cbfd345c54074 # git commit -s git send-email --to '' --in-reply-to '2024062415-shakable-matching-e69e@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^.. Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 60980cf5b8c8cc9182e5e9dbb62cbfd345c54074 Mon Sep 17 00:00:00 2001 From: Charles Keepax Date: Fri, 7 Jun 2024 11:34:23 +0100 Subject: [PATCH] spi: cs42l43: Drop cs35l56 SPI speed down to 11MHz Some internals of the cs35l56 can only support SPI speeds of up to 11MHz. Whilst some use-cases could support higher rates, keep things simple by dropping the SPI speed down to this avoid any potential issues. Signed-off-by: Charles Keepax Cc: stable@vger.kernel.org Link: https://lore.kernel.org/r/20240607103423.4159834-1-ckeepax@opensource.cirrus.com Signed-off-by: Mark Brown diff --git a/drivers/spi/spi-cs42l43.c b/drivers/spi/spi-cs42l43.c index 902a0734cc36..8b618ef0f711 100644 --- a/drivers/spi/spi-cs42l43.c +++ b/drivers/spi/spi-cs42l43.c @@ -54,7 +54,7 @@ static const struct software_node ampr = { static struct spi_board_info ampl_info = { .modalias = "cs35l56", - .max_speed_hz = 20 * HZ_PER_MHZ, + .max_speed_hz = 11 * HZ_PER_MHZ, .chip_select = 0, .mode = SPI_MODE_0, .swnode = &l, @@ -62,7 +62,7 @@ static struct spi_board_info ampl_info = { static struct spi_board_info ampr_info = { .modalias = "cs35l56", - .max_speed_hz = 20 * HZ_PER_MHZ, + .max_speed_hz = 11 * HZ_PER_MHZ, .chip_select = 1, .mode = SPI_MODE_0, .swnode = &r,