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 836C7347DD; Mon, 23 Jun 2025 13:36:42 +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=1750685802; cv=none; b=atDHsh1RoXqmuwbUPAys0ReZG+MYcQjGDuBTzvrtIF0LQt5ApZYbMTc0S0miwqS28Gh55zBqA9sSPKXNnWpnQ6pHRBEM2ROIHmrPvFoS2Cc/v/dy0fAS6PA9VCdu/ERpTX1d7CDq0oq7lKjQ0uLy1mT4Ukm7kELImVwG0ZJAg1k= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750685802; c=relaxed/simple; bh=Vkz45OexMB28NveXkSAs6zn3OmPcn2SweWwZqJ2CoCQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=sm/nmOEMUiqvstanRzJlZZeo4o+zw4ZI7SsrSYiUX6lIYf0FxokFpVNK14N5ywAPG/KSQZVZMH5UDHij7VrPzAek16PNxObgmEna7nLyHpnUztGq94Qv9vFJwr5PFZza2Q0U2be+qiFd4B96yDOAT7iAAyuaUrUJ6x/m4WNTq2s= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=SHbD9SSq; 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="SHbD9SSq" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 16390C4CEEA; Mon, 23 Jun 2025 13:36:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1750685802; bh=Vkz45OexMB28NveXkSAs6zn3OmPcn2SweWwZqJ2CoCQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SHbD9SSq3pjcpIE5YhbyYcQDOZr64zPI4ZgD2+7drkre7/FzLQSIaE9WgtD4gJ2PG Ue+2M1WcXGEbLpXqheIB1+IIUzhAYsQ6co4/YtjBz7qpyOQucR2uBOhX0EHgvzZ5eQ lCVbzN5KLCO8/cXPv95b8Hhaau/kmxoAD0746Bxg= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Dmitry Baryshkov , Konrad Dybcio , Bjorn Andersson , Sasha Levin Subject: [PATCH 5.15 084/411] ARM: dts: qcom: apq8064 merge hw splinlock into corresponding syscon device Date: Mon, 23 Jun 2025 15:03:48 +0200 Message-ID: <20250623130635.526139269@linuxfoundation.org> X-Mailer: git-send-email 2.50.0 In-Reply-To: <20250623130632.993849527@linuxfoundation.org> References: <20250623130632.993849527@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Dmitry Baryshkov [ Upstream commit 325c6a441ae1f8fcb1db9bb945b8bdbd3142141e ] Follow up the expected way of describing the SFPB hwspinlock and merge hwspinlock node into corresponding syscon node, fixing several dt-schema warnings. Fixes: 24a9baf933dc ("ARM: dts: qcom: apq8064: Add hwmutex and SMEM nodes") Signed-off-by: Dmitry Baryshkov Reviewed-by: Konrad Dybcio Link: https://lore.kernel.org/r/20250318-fix-nexus-4-v2-7-bcedd1406790@oss.qualcomm.com Signed-off-by: Bjorn Andersson Signed-off-by: Sasha Levin --- arch/arm/boot/dts/qcom-apq8064.dtsi | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/arch/arm/boot/dts/qcom-apq8064.dtsi b/arch/arm/boot/dts/qcom-apq8064.dtsi index d70f071fd8304..50436197fff4a 100644 --- a/arch/arm/boot/dts/qcom-apq8064.dtsi +++ b/arch/arm/boot/dts/qcom-apq8064.dtsi @@ -211,12 +211,6 @@ }; }; - sfpb_mutex: hwmutex { - compatible = "qcom,sfpb-mutex"; - syscon = <&sfpb_wrapper_mutex 0x604 0x4>; - #hwlock-cells = <1>; - }; - smem { compatible = "qcom,smem"; memory-region = <&smem_region>; @@ -360,9 +354,10 @@ pinctrl-0 = <&ps_hold>; }; - sfpb_wrapper_mutex: syscon@1200000 { - compatible = "syscon"; - reg = <0x01200000 0x8000>; + sfpb_mutex: hwmutex@1200600 { + compatible = "qcom,sfpb-mutex"; + reg = <0x01200600 0x100>; + #hwlock-cells = <1>; }; intc: interrupt-controller@2000000 { -- 2.39.5