From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2A19BC61D97 for ; Wed, 22 Nov 2023 21:11:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229535AbjKVVLi (ORCPT ); Wed, 22 Nov 2023 16:11:38 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56084 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231429AbjKVVLh (ORCPT ); Wed, 22 Nov 2023 16:11:37 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7CA4C1A5 for ; Wed, 22 Nov 2023 13:11:34 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A4AD3C433C8; Wed, 22 Nov 2023 21:11:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1700687494; bh=OcY8DWQ9sg6H3SdVJWdo4j5ySkqhcaCmMl1UHOyQu9I=; h=Subject:To:Cc:From:Date:From; b=O+BlyXuzOuu7tVqhGORQRj6PkXQsUECkRmI18dDE5afRvkW2mezZB6m72+v8MJufB F/K5cx8cH8A63jeU2FrKluh+pjT8RcmWqIEKVWTxMJwuSQGex9NDDyVcSPZEnGvkzZ QMg8w43WK8yCVApsDZHi7pbhd+dayCFiaGjAFr+E= Subject: FAILED: patch "[PATCH] arm64: dts: qcom: ipq6018: Fix tcsr_mutex register size" failed to apply to 5.15-stable tree To: quic_viswanat@quicinc.com, andersson@kernel.org, konrad.dybcio@linaro.org Cc: From: Date: Wed, 22 Nov 2023 21:11:31 +0000 Message-ID: <2023112231-perfectly-matching-31e1@gregkh> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org The patch below does not apply to the 5.15-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-5.15.y git checkout FETCH_HEAD git cherry-pick -x 72fc3d58b87b0d622039c6299b89024fbb7b420f # git commit -s git send-email --to '' --in-reply-to '2023112231-perfectly-matching-31e1@gregkh' --subject-prefix 'PATCH 5.15.y' HEAD^.. Possible dependencies: 72fc3d58b87b ("arm64: dts: qcom: ipq6018: Fix tcsr_mutex register size") f5e303aefc06 ("arm64: dts: qcom: ipq6018: switch TCSR mutex to MMIO") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 72fc3d58b87b0d622039c6299b89024fbb7b420f Mon Sep 17 00:00:00 2001 From: Vignesh Viswanathan Date: Tue, 5 Sep 2023 15:25:34 +0530 Subject: [PATCH] arm64: dts: qcom: ipq6018: Fix tcsr_mutex register size IPQ6018's TCSR Mutex HW lock register has 32 locks of size 4KB each. Total size of the TCSR Mutex registers is 128KB. Fix size of the tcsr_mutex hwlock register to 0x20000. Changes in v2: - Drop change to remove qcom,ipq6018-tcsr-mutex compatible string - Added Fixes and stable tags Cc: stable@vger.kernel.org Fixes: 5bf635621245 ("arm64: dts: ipq6018: Add a few device nodes") Signed-off-by: Vignesh Viswanathan Reviewed-by: Konrad Dybcio Link: https://lore.kernel.org/r/20230905095535.1263113-2-quic_viswanat@quicinc.com Signed-off-by: Bjorn Andersson diff --git a/arch/arm64/boot/dts/qcom/ipq6018.dtsi b/arch/arm64/boot/dts/qcom/ipq6018.dtsi index 72e6457ddf9f..e59b9df96c7e 100644 --- a/arch/arm64/boot/dts/qcom/ipq6018.dtsi +++ b/arch/arm64/boot/dts/qcom/ipq6018.dtsi @@ -385,7 +385,7 @@ gcc: gcc@1800000 { tcsr_mutex: hwlock@1905000 { compatible = "qcom,ipq6018-tcsr-mutex", "qcom,tcsr-mutex"; - reg = <0x0 0x01905000 0x0 0x1000>; + reg = <0x0 0x01905000 0x0 0x20000>; #hwlock-cells = <1>; };