From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795028922; b=HJ48wolmQll6uYxWuL2bhkldhXRziOq7zHigU3dbA9fevSf6pfp7M+moETGd+g9AuE0e OGdeiDtlel2AQCjMZLoUFLoKU5oRgmWkWRjiARBGiuMfOAOUIA3p3Nun0DroWm4xBDV4B +IDzALi55X9myfmzfdnR7tl/ZyxtYKlG7rlPRly7GzSafdtEEzcvCJyI8BJf9g24yMe78 vin9ts63ax9qCZqkErusjoRRVNu9u0ukbrWZSRsA6JBj37n4dfRFXRv7lbdsU35sqZDdG XaXZeI+gMwNUXg6nwlvZqWbRt6DzBEC0MjCe3UxVsZMIEOdm+bhCFNTHYHLQdBryGbQ== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795028922; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=Nvw+SagMIuXOoVya94lPYsuQVQUewfnvylfpMwLR44M=; b=ns9Hkws36u8hVtki2AeLAe+eDNEfZdrAGz7wIsI5qbYCjXUVQXa1gU3TykF1+rUX87UE dzKr55dpCkft1BeOkeqK650KgSNmUl8cIBut5eFXehVUUtZl+aLnj5cLRT+tYiFECU6tc eMwTaeHW6ktva+dPpqv2dHNGMrZ7hinmRuRasrbvv9AVu7rBdu5h8PNJ+CpoZF7yp79Ss HM3Rhu/lhqksUvNnJhdHgkCsLLU0eRZPRoKhX7YN+CkxtQUGWfMmL09Ak7mDb45jJDFa/ T8523n4RLUwTJntrlNSbjdDEmtvGEqvXMztnC6nFV/O8qevTSEUSVxe+TMEWOCzJb6Q== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=Ce7kYh61; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 98069606A332; Wed, 18 Nov 2026 19:08:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=Ce7kYh61 Received: by smtp.kernel.org (Postfix) with ESMTPSA id EA7EA1F000CB; Wed, 18 Nov 2026 19:08:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795028922; bh=Nvw+SagMIuXOoVya94lPYsuQVQUewfnvylfpMwLR44M=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Ce7kYh61E2lNpO+e8nLrFLKuFf2XbsVuFN6YQ6yRIZUD6rTl/81HXLXm/dtkLnCun UeO+/mO9du126o8f9GAq1gJsAYGpQkQ0Jm2zcyXFlNfm5o/FpGjPJ6FE5ws4DLZzcX SGwpcHsivzgPB+IdKqNj5w5LzNdDwL49gxzJDj7s= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Rosen Penev , Gregory CLEMENT , Sasha Levin Subject: [PATCH 6.12 0160/1756] ARM: dts: helios4: fix spi1 location Date: Wed, 18 Nov 2026 15:38:07 +0100 Message-ID: <20261118150014.515832795@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118150007.957976754@linuxfoundation.org> References: <20261118150007.957976754@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: stable@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Rosen Penev [ Upstream commit 5df4320a30a87f9bb918ace7b389026917c8d896 ] This spi node is specified in armada-38x.dtsi with proper compatible strings whereas they are not present here. Instead of copy and pasting various lines, just reference the node in the dtsi. This dts seems to predate the move of spi from internal-regs to the soc node so this moves it in line there. Allows proper probing of SPI at runtime. Remove the microsom_spi1_cs_pins pinctrl group and its reference in &spi1. The group only muxed mpp59 to the "spi1" function, but that pin (SPI1 cs0) is already covered by spi1_pins, which selects the same function for mpp56-59 in armada-38x.dtsi. Fixes: ced8025b569e ("ARM: dts: armada388-helios4") Signed-off-by: Rosen Penev Signed-off-by: Gregory CLEMENT Signed-off-by: Sasha Levin --- .../arm/boot/dts/marvell/armada-388-helios4.dts | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/arch/arm/boot/dts/marvell/armada-388-helios4.dts b/arch/arm/boot/dts/marvell/armada-388-helios4.dts index 1ed6ddf1719a7..33e30528bc7ca 100644 --- a/arch/arm/boot/dts/marvell/armada-388-helios4.dts +++ b/arch/arm/boot/dts/marvell/armada-388-helios4.dts @@ -254,13 +254,6 @@ sata3: sata-port@1 { }; }; - spi@10680 { - pinctrl-0 = <&spi1_pins - µsom_spi1_cs_pins>; - pinctrl-names = "default"; - status = "okay"; - }; - sdhci@d8000 { bus-width = <4>; cd-gpios = <&gpio0 20 GPIO_ACTIVE_LOW>; @@ -327,11 +320,13 @@ helios_fan2_pins: helios_fan2_pins { marvell,pins = "mpp48", "mpp55"; marvell,function = "gpio"; }; - microsom_spi1_cs_pins: spi1-cs-pins { - marvell,pins = "mpp59"; - marvell,function = "spi1"; - }; }; }; }; }; + +&spi1 { + pinctrl-0 = <&spi1_pins>; + pinctrl-names = "default"; + status = "okay"; +}; -- 2.53.0