From nobody Wed Dec 17 09:18:10 2025 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 5465EC4167B for ; Tue, 28 Nov 2023 21:35:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345539AbjK1Vfh (ORCPT ); Tue, 28 Nov 2023 16:35:37 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39854 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229763AbjK1Vff (ORCPT ); Tue, 28 Nov 2023 16:35:35 -0500 Received: from madras.collabora.co.uk (madras.collabora.co.uk [46.235.227.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1EADBD63; Tue, 28 Nov 2023 13:35:40 -0800 (PST) Received: from beast.luon.net (cola.collaboradmins.com [195.201.22.229]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: sjoerd) by madras.collabora.co.uk (Postfix) with ESMTPSA id DDB496602F24; Tue, 28 Nov 2023 21:35:38 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1701207339; bh=67uH3wWuxI9nNHNPdHxCUf8N5hbi47QYbIBUACpFrkY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=khtNOesDlK2le5wbv0ZMy887UBOAZ36fL0jPVecU7ugeEmY+aX5RgaAYA0R3fwBOm hx+bpW/rRLZl+Y0wZRHlW3oqZDXtPryVFMvIpvKMTzDKNDp0ECeI4a83Drd4MXvC09 KXLtD6WeiXdz/lx91N/PGNWKF1kXdlc+SOBH2q0jdb8B82JRFG5n1cG0KzzJvsbRVz ip1VRknzrYMxYPY5N3bAjsligu4PGW/N5p1c+aZehVnfX5lPxeMaY7//RFJFahucfi U3TyDcEK2KlGyf2jtx+STyXQKMHv8efs1HN+rxgaGh0es1GMvrFeEIqxIMAl3QNiEd aRbAXVi8khXCQ== Received: by beast.luon.net (Postfix, from userid 1000) id 203179676CFA; Tue, 28 Nov 2023 22:35:37 +0100 (CET) From: Sjoerd Simons To: =?UTF-8?q?Marek=20Beh=C3=BAn?= Cc: =?UTF-8?q?Pali=20Roh=C3=A1r?= , kernel@collabora.com, stable@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 1/3] bus: moxtet: Mark the irq as shared Date: Tue, 28 Nov 2023 22:35:04 +0100 Message-ID: <20231128213536.3764212-2-sjoerd@collabora.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231128213536.3764212-1-sjoerd@collabora.com> References: <20231128213536.3764212-1-sjoerd@collabora.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The Turris Mox shares the moxtet IRQ with various devices on the board, so mark the IRQ as shared in the driver as well. Without this loading the module will fail with: genirq: Flags mismatch irq 40. 00002002 (moxtet) vs. 00002080 (mcp7940x) Signed-off-by: Sjoerd Simons Cc: stable@vger.kernel.org # v6.2+ Reviewed-by: Marek Beh=C3=BAn --- (no changes since v1) drivers/bus/moxtet.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/bus/moxtet.c b/drivers/bus/moxtet.c index 5eb0fe73ddc4..48c18f95660a 100644 --- a/drivers/bus/moxtet.c +++ b/drivers/bus/moxtet.c @@ -755,7 +755,7 @@ static int moxtet_irq_setup(struct moxtet *moxtet) moxtet->irq.masked =3D ~0; =20 ret =3D request_threaded_irq(moxtet->dev_irq, NULL, moxtet_irq_thread_fn, - IRQF_ONESHOT, "moxtet", moxtet); + IRQF_SHARED | IRQF_ONESHOT, "moxtet", moxtet); if (ret < 0) goto err_free; =20 --=20 2.43.0 From nobody Wed Dec 17 09:18:10 2025 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 A471DC4167B for ; Tue, 28 Nov 2023 21:35:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345983AbjK1Vfj (ORCPT ); Tue, 28 Nov 2023 16:35:39 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39856 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229832AbjK1Vff (ORCPT ); Tue, 28 Nov 2023 16:35:35 -0500 Received: from madras.collabora.co.uk (madras.collabora.co.uk [46.235.227.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 48F091BE6; Tue, 28 Nov 2023 13:35:40 -0800 (PST) Received: from beast.luon.net (cola.collaboradmins.com [195.201.22.229]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: sjoerd) by madras.collabora.co.uk (Postfix) with ESMTPSA id 17E966606F5E; Tue, 28 Nov 2023 21:35:39 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1701207339; bh=Q18yxCAMZdN7nqiu9m/OAbtpx24RwZE3q1MsbEWOa8o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PQPg8MN/oxUvLf3w9cigr+CJprQ51vuDvEvd7dBzVyh2GmC768EDHjK34zK12p2pg MWM0fgDPctMPdp8qmtZEXizuZ0N/9r4Sx80Ftv2JaDuGw9h1E0QHEi5ruHYXxVgFNO Nlr6k+GgQeNIMGML0bjvpp/NnVVFnzUGEPGb0JaQJn9ZnSZPfD85c/qOTLcLB99rFk KiUtXt+7u66CbkWmOvFDmufFLSe4FNwlahCURVjY/PZR6BFT70ILoN52NctfvN+H/2 2yElwtwyghTzgPNBkZ3orF8iQ1L5q0DvwaNBAC1h1mPHIzBZ7LZQY5oVBdS8ExwjOW +WlSqvvisScSQ== Received: by beast.luon.net (Postfix, from userid 1000) id 4C16E9676CFC; Tue, 28 Nov 2023 22:35:37 +0100 (CET) From: Sjoerd Simons To: =?UTF-8?q?Marek=20Beh=C3=BAn?= Cc: =?UTF-8?q?Pali=20Roh=C3=A1r?= , kernel@collabora.com, stable@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 2/3] bus: moxtet: Add spi device table Date: Tue, 28 Nov 2023 22:35:05 +0100 Message-ID: <20231128213536.3764212-3-sjoerd@collabora.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231128213536.3764212-1-sjoerd@collabora.com> References: <20231128213536.3764212-1-sjoerd@collabora.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The moxtet module fails to auto-load on. Add a SPI id table to allow it to do so. Signed-off-by: Sjoerd Simons Cc: stable@vger.kernel.org Reviewed-by: Marek Beh=C3=BAn --- (no changes since v1) drivers/bus/moxtet.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/bus/moxtet.c b/drivers/bus/moxtet.c index 48c18f95660a..e384fbc6c1d9 100644 --- a/drivers/bus/moxtet.c +++ b/drivers/bus/moxtet.c @@ -830,6 +830,12 @@ static void moxtet_remove(struct spi_device *spi) mutex_destroy(&moxtet->lock); } =20 +static const struct spi_device_id moxtet_spi_ids[] =3D { + { "moxtet" }, + { }, +}; +MODULE_DEVICE_TABLE(spi, moxtet_spi_ids); + static const struct of_device_id moxtet_dt_ids[] =3D { { .compatible =3D "cznic,moxtet" }, {}, @@ -841,6 +847,7 @@ static struct spi_driver moxtet_spi_driver =3D { .name =3D "moxtet", .of_match_table =3D moxtet_dt_ids, }, + .id_table =3D moxtet_spi_ids, .probe =3D moxtet_probe, .remove =3D moxtet_remove, }; --=20 2.43.0 From nobody Wed Dec 17 09:18:10 2025 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 E8999C46CA3 for ; Tue, 28 Nov 2023 21:35:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346362AbjK1Vfl (ORCPT ); Tue, 28 Nov 2023 16:35:41 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39858 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231207AbjK1Vff (ORCPT ); Tue, 28 Nov 2023 16:35:35 -0500 Received: from madras.collabora.co.uk (madras.collabora.co.uk [46.235.227.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 83C111FC1; Tue, 28 Nov 2023 13:35:40 -0800 (PST) Received: from beast.luon.net (cola.collaboradmins.com [195.201.22.229]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: sjoerd) by madras.collabora.co.uk (Postfix) with ESMTPSA id 46F4966072E7; Tue, 28 Nov 2023 21:35:39 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1701207339; bh=EA3Sl4Au7lUnYnJzLlX/RZSBt2UJuslBcjVt/8x9WDs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZEp9XUnKUM1gGQiTwlQAQadMFC5KorC0k2m7ZfpvRuKXIZ07rRz9NOa+BSfXuzwWo dAZRIl+kVb1ppR4xQ5mxpA7Y82IQrZifXQ8ck/IbTLcJtForp8yK6Mdy813vPNNZ7p pHrTvt9eIxz9FzsKcdzOiTIIk7l+J9U1E00fPA2Q5AE9TzjHQnqAIYBBlNZH0t/w7X 4Yr8K7FafTiijBf1eghAs7Z6NmqBRN2BP5/dwnplRLE0rYF/t2izUkiSWIyc74a1j/ GJTQk9M4FUQ+bPFOJP/+YPxAStPAcYx5CbAjXwgBuM+3RT5d5XyLLFUq96sUOfSl7x ZJIQIlK/A8fMQ== Received: by beast.luon.net (Postfix, from userid 1000) id 7AC3C9676CFE; Tue, 28 Nov 2023 22:35:37 +0100 (CET) From: Sjoerd Simons To: =?UTF-8?q?Marek=20Beh=C3=BAn?= Cc: =?UTF-8?q?Pali=20Roh=C3=A1r?= , kernel@collabora.com, stable@vger.kernel.org, Andrew Lunn , Conor Dooley , Gregory Clement , Krzysztof Kozlowski , Rob Herring , Sebastian Hesselbarth , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 3/3] arm64: dts: armada-3720-turris-mox: set irq type for RTC Date: Tue, 28 Nov 2023 22:35:06 +0100 Message-ID: <20231128213536.3764212-4-sjoerd@collabora.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231128213536.3764212-1-sjoerd@collabora.com> References: <20231128213536.3764212-1-sjoerd@collabora.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The rtc on the mox shares its interrupt line with the moxtet bus. Set the interrupt type to be consistent between both devices. This ensures correct setup of the interrupt line regardless of probing order. Signed-off-by: Sjoerd Simons Cc: stable@vger.kernel.org # v6.2+ Fixes: 21aad8ba615e ("arm64: dts: armada-3720-turris-mox: Add missing inter= rupt for RTC") Reviewed-by: Marek Beh=C3=BAn --- (no changes since v1) arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts b/arch/= arm64/boot/dts/marvell/armada-3720-turris-mox.dts index 9eab2bb22134..805ef2d79b40 100644 --- a/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts +++ b/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts @@ -130,7 +130,7 @@ rtc@6f { compatible =3D "microchip,mcp7940x"; reg =3D <0x6f>; interrupt-parent =3D <&gpiosb>; - interrupts =3D <5 0>; /* GPIO2_5 */ + interrupts =3D <5 IRQ_TYPE_EDGE_FALLING>; /* GPIO2_5 */ }; }; =20 --=20 2.43.0