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 16ABC1C294 for ; Fri, 26 Jan 2024 22:45:31 +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=1706309131; cv=none; b=KZW+f3VsbHA3l6mEStfF75MswgbdL9UKPfLWiVfrQm/1MTN0/RuPtP4EScrE7ZEk9GWQ9X8ozVD7gA5h91sspnxIY/V8w8+2SiTCgSDanraENCWoJjAmKxbjtp+0WK3cScaDyLvHHvOe9Vs2IR+0eUlJ1l8DhtWBGFWxVaTXw3g= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706309131; c=relaxed/simple; bh=ws9EHT+Wmmpf0dnyJWW7C8pEyLvN/9h3OVvuw8kXncg=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=JX5tmjvSsEA3zaTk1ngSRszDwVO8LIK72ljpnQRXWHKktsqG54CsHaUHBnkNB3C2NTmcDILwpqkOwDeHwygaztqO7CfgKbQBj2ZwvQZtm4DfYBMoqmSrgZm8e8gLk6Mzm7YrpjPsT6L19iXaGlbhIeyEUPqzfknPg0lBVm9oMco= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=wHhPSA6A; 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="wHhPSA6A" Received: by smtp.kernel.org (Postfix) with ESMTPSA id CD651C43390; Fri, 26 Jan 2024 22:45:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1706309130; bh=ws9EHT+Wmmpf0dnyJWW7C8pEyLvN/9h3OVvuw8kXncg=; h=Subject:To:Cc:From:Date:From; b=wHhPSA6AvQ3B5iO/MmLH0GEU6GXbM3bDs1EQu90emvy4zWEC47ITShbJgTnvWChNL eG2CQMo7f6PYEMSmPvMTsI4L9w4tYSllpY/IvW68QibyytF1n2/Xk3BZShMoui3vL6 lceetQZfMWnmvB0nUfCbeASIA7+oF+95g8EeD6jU= Subject: FAILED: patch "[PATCH] ARM: dts: qcom: sdx55: fix pdc '#interrupt-cells'" failed to apply to 5.15-stable tree To: johan+linaro@kernel.org,andersson@kernel.org,konrad.dybcio@linaro.org,mani@kernel.org,manivannan.sadhasivam@linaro.org Cc: From: Date: Fri, 26 Jan 2024 14:45:29 -0800 Message-ID: <2024012629-hydrated-deodorant-da3c@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 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 cc25bd06c16aa582596a058d375b2e3133f79b93 # git commit -s git send-email --to '' --in-reply-to '2024012629-hydrated-deodorant-da3c@gregkh' --subject-prefix 'PATCH 5.15.y' HEAD^.. Possible dependencies: cc25bd06c16a ("ARM: dts: qcom: sdx55: fix pdc '#interrupt-cells'") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From cc25bd06c16aa582596a058d375b2e3133f79b93 Mon Sep 17 00:00:00 2001 From: Johan Hovold Date: Wed, 13 Dec 2023 18:31:29 +0100 Subject: [PATCH] ARM: dts: qcom: sdx55: fix pdc '#interrupt-cells' The Qualcomm PDC interrupt controller binding expects two cells in interrupt specifiers. Fixes: 9d038b2e62de ("ARM: dts: qcom: Add SDX55 platform and MTP board support") Cc: stable@vger.kernel.org # 5.12 Cc: Manivannan Sadhasivam Signed-off-by: Johan Hovold Reviewed-by: Konrad Dybcio Reviewed-by: Manivannan Sadhasivam Link: https://lore.kernel.org/r/20231213173131.29436-2-johan+linaro@kernel.org Signed-off-by: Bjorn Andersson diff --git a/arch/arm/boot/dts/qcom/qcom-sdx55.dtsi b/arch/arm/boot/dts/qcom/qcom-sdx55.dtsi index 0fe220408888..8934bf4ad433 100644 --- a/arch/arm/boot/dts/qcom/qcom-sdx55.dtsi +++ b/arch/arm/boot/dts/qcom/qcom-sdx55.dtsi @@ -607,7 +607,7 @@ pdc: interrupt-controller@b210000 { compatible = "qcom,sdx55-pdc", "qcom,pdc"; reg = <0x0b210000 0x30000>; qcom,pdc-ranges = <0 179 52>; - #interrupt-cells = <3>; + #interrupt-cells = <2>; interrupt-parent = <&intc>; interrupt-controller; };