From patchwork Sun Jan 1 09:20:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Klaus Kudielka X-Patchwork-Id: 13086348 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 9889EC4167B for ; Sun, 1 Jan 2023 09:23:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=c6oCo+OqY7mxFM1NmyHOKxutjYTw/lO6wu6IBO7he1Q=; b=BpPfST9/gsIfHA 3QLFgEKzjaXPB9P0LMLklUIc6Y3B/5hDKaUthki9R4lEa/aFu+sZPzgIdj+aqf2SZFv2i2EGM26fw UNyLkJ2B/Ufr1dIGOkqQTvb9AzxG400LjTA7iylLBN5+IpCXM/A4TcwnD3yyUvVn94Ro0j4rKNUQf LzEkT2wMO+DpcEKjl3IQ2vS5QaLvc8nJndU4zCtJc1etc4HpS0Oq9OWc8sbXU3U3NyH4DIF3g83NP tppsMFiYGt8fvvUJ34MTP9nJxzk7/ryBq5JcWrPTWkhZ8yTWwM0wo+5jq6qI6nZwn7pQ3Qqj9Qtj8 /kC0P76cCK9RA2Ij8UOw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pBuXF-00GdHb-4P; Sun, 01 Jan 2023 09:21:41 +0000 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pBuX5-00GdEr-G0 for linux-arm-kernel@lists.infradead.org; Sun, 01 Jan 2023 09:21:33 +0000 Received: by mail-wm1-x32b.google.com with SMTP id g25-20020a7bc4d9000000b003d97c8d4941so13030025wmk.4 for ; Sun, 01 Jan 2023 01:21:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=pphMC7MPt/g+ZS1+ekkAwKQzB3YVITU74fxVYBxCRwI=; b=PJTVxJyPRDyyRREDT68dSenazqTuu/cTqUm0bT9B0RCMVj7co1DxRhw8Wp7FDPIqM6 pCgsFKdGMb1K4IWruZTR6z2r2tzCA4rxKIqR0GkN0AxhlE7fZr6xY1xKfTr6dTnO4kmG C6BLTiEze/0srKdy6/6erKJwE8NLaeYPONW6pKZhsKOnn+EL10FtTlST2MUd+rMG/4Vb aUJlrHzT2ndPm33u+o/0TZFQS+RDeFD1rw+/mXtVimC0t2MgPNdYNbA26g+MKodzcbnN Ci6WeLcpI57Tz+CclLgWJnriGIJBuTAY75Q7dmGuUefe9nkkpI+2VTse0s1/3Vd34sXE HrDw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=pphMC7MPt/g+ZS1+ekkAwKQzB3YVITU74fxVYBxCRwI=; b=o49hykqRYILAfX10z6N8Gsc96wYXyBH97u6GokXl5D8Qy4yiZp+sA/tt0diKt+jXph EmqOVMtrbZXtHU5lIyfRHnLe9t5fLk0EqbTN0eOHsTSyYNC+2SMhS3c27VS+WIkDZ4Lv cDuggTq4TRHayRauxn3mwtRqwmuVq8c3lmpDGojgcYpOjE8Vv/vQxF31TunngK2UiJBX G8X14lqyMht/kE1z5wcTK1D81umT5O3Qyf9Zz98W7Gw2BmxEAEQ+GRx4nhAf9Z0XQ7uu fS0OYoD67+x/V/TkamKk9YRhvxHkM6YTuXviUgFa9x8x1Vgwgw2VW22XTLJMqkz0jYEX DV2A== X-Gm-Message-State: AFqh2koosCZ6/vNZYvIuzbrcF9LukvQh8f9JfkP6I+V89DfMmuYyPQq8 +vYucRCD3dm6F9ZTXBu/R/Y= X-Google-Smtp-Source: AMrXdXsFVt6dcpq86gebin11qTsCBIgXeVIDK30AeeZpBtugm5hNMk8Da02UnTsgAdC9cU0r/pB1Nw== X-Received: by 2002:a05:600c:1d89:b0:3d3:58cb:f6a6 with SMTP id p9-20020a05600c1d8900b003d358cbf6a6mr26191581wms.41.1672564884675; Sun, 01 Jan 2023 01:21:24 -0800 (PST) Received: from mars.. ([2a02:168:6806:0:2624:83db:c4f6:846d]) by smtp.gmail.com with ESMTPSA id r17-20020a05600c425100b003cffd3c3d6csm32763769wmm.12.2023.01.01.01.21.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 01 Jan 2023 01:21:24 -0800 (PST) From: Klaus Kudielka To: Andrew Lunn , Gregory Clement , Sebastian Hesselbarth , Rob Herring , Krzysztof Kozlowski , =?utf-8?q?Pali_Roh?= =?utf-8?q?=C3=A1r?= , =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= Cc: Thomas Petazzoni , Chris Packham , linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Klaus Kudielka Subject: [PATCH 1/2] Revert "ARM: dts: armada-38x: Fix compatible string for gpios" Date: Sun, 1 Jan 2023 10:20:32 +0100 Message-Id: <20230101092033.45803-1-klaus.kudielka@gmail.com> X-Mailer: git-send-email 2.39.0 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230101_012131_718657_FA69989B X-CRM114-Status: GOOD ( 13.18 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org This reverts commit c4de4667f15d04ef5920bacf41e514ec7d1ef03d. On a Turris Omnia (Armada 385), GPIO interrupts ceased to work, ending up in the DSA switch being non-functional. The blamed commit seems to be incorrect in the first place, as the 2nd reg property was not brought in line with the code. But even fixing that leaves the GPIO interrupts broken on the Omnia. Furthermore: Commit 5f79c651e81e states armadaxp-gpio is broken in a non-trivial way. Commit 988c8c0cd04d deprecates armadaxp-gpio for this reason. Link: https://lore.kernel.org/r/f24474e70c1a4e9692bd596ef6d97ceda9511245.camel@gmail.com/ Fixes: c4de4667f15d ("ARM: dts: armada-38x: Fix compatible string for gpios") Signed-off-by: Klaus Kudielka --- arch/arm/boot/dts/armada-38x.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/armada-38x.dtsi b/arch/arm/boot/dts/armada-38x.dtsi index 12933eff41..446861b6b1 100644 --- a/arch/arm/boot/dts/armada-38x.dtsi +++ b/arch/arm/boot/dts/armada-38x.dtsi @@ -304,7 +304,7 @@ spdif_pins: spdif-pins { }; gpio0: gpio@18100 { - compatible = "marvell,armadaxp-gpio", + compatible = "marvell,armada-370-gpio", "marvell,orion-gpio"; reg = <0x18100 0x40>, <0x181c0 0x08>; reg-names = "gpio", "pwm"; @@ -323,7 +323,7 @@ gpio0: gpio@18100 { }; gpio1: gpio@18140 { - compatible = "marvell,armadaxp-gpio", + compatible = "marvell,armada-370-gpio", "marvell,orion-gpio"; reg = <0x18140 0x40>, <0x181c8 0x08>; reg-names = "gpio", "pwm"; From patchwork Sun Jan 1 09:20:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Klaus Kudielka X-Patchwork-Id: 13086349 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 00A0BC4167B for ; Sun, 1 Jan 2023 09:23:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=2ybi9pku+8XJfwcD6a5neHPdMq683mc0s7/NXfjvDDo=; b=q+oGmSzH5Nb6II cpNkFUOlmUg03Fd7Eq93kluzel4jsHyxTRoDKCJ2cI+zVoIdXGAH9JteRgBYhksJC6Urc+ofamhST 2uXyu5YeQSboq1wwPFb48JORbVpBgekgHPpnsndVASwMu9RjcnaM3bIKtkZLroD5c9VmpIq15/dSu MSIFomdq+amfGVxUeBu3UT2f2d4jME1gHX2OyTrwDFoAVUb6yRC8ybDuTesh4KzmjKz6aSc0MeRvG e29/7o4acT9xh3DDPZWjrBXm6VROfe6cddHyidkNcnIkVoD5XyXWvGuc9wk5kbboui4Fjv91HJ4Pt SfLWfL6KiEGTENoSmrSw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pBuXP-00GdIY-Ls; Sun, 01 Jan 2023 09:21:51 +0000 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pBuX7-00GdFZ-B1 for linux-arm-kernel@lists.infradead.org; Sun, 01 Jan 2023 09:21:35 +0000 Received: by mail-wm1-x336.google.com with SMTP id l26so16712854wme.5 for ; Sun, 01 Jan 2023 01:21:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=mGM5YWcMUl/AKOA1Ej+/uSN1K21Yt+2nOh2g+QQjZ2Y=; b=J49sVIlCogAopBtUt1pkmMXj/RvX9Wds1rIU4GhIV/Ag14KaF6SBeYr9jW0E5SOkxM 85q1JZVayVzhh76Ajv6bTTAWmkYf7cDzOAe0eOGpp+HdO43FZP1y8TGyTVnl93DGGJPr ZkwhCuduRsXpb+If11zuEOsBk+E2aB5ZgVLy6hifFYXsQpPzOW+sKGlO9oZlqxQd5D7I CnoVWGUAL547F80a/7p/WaiImi1F7NfEnwEKukgAFAYdU/jpEwXAEw5hPmiHxGrXELzy Y4NrwxDUi0hRcvjWnUvpVienrfLLpMcO3JrAfea61MIxSgsvbWm125PrndeC7TrmDMv1 NgTQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=mGM5YWcMUl/AKOA1Ej+/uSN1K21Yt+2nOh2g+QQjZ2Y=; b=y1+gYzk3MON409HlUJkBlhZMoTF3lvYsE8RxmtzKDyscg/C0HWvVK1n4tKeX+H4cV9 onwJuiBH8B3tukpJeTw6HtKAYm+u28fQjUj8Fh9b1N+o6h43ldLHQ8onh9+ONsKALa8A sEgXGBwJaC10ct0dzEBfHw3BUJtwuCppCHF9EFac71DsYlK35i3Rb/7xqVa1jged6JjY IYxAXQmE0lSUDExtjPQuMNJMHaGQsyT/Ri4vw8oNQbG/9hYxgv6incHvhP+s5mJU6nv5 EirBrIgjo9+xezeIVsNfMUo872gDqzoCipV2MZ7F9qlq48fYzf6yhZ2io0hYy8kY01nP jqZw== X-Gm-Message-State: AFqh2kprnibZjsf/5YHTy/Ze0bSg+xtiW/CRfIvLlnwGNGuerCJZBJOt ZLpCgFy2CavU622rJP2fBs4= X-Google-Smtp-Source: AMrXdXtZaieFheiEJbJbkSsAk1+KA/2iYj+M64zo8HqegJ/I5r7gR69yFolcID91T4c4eqvwITxdkA== X-Received: by 2002:a05:600c:3493:b0:3d2:370b:97f4 with SMTP id a19-20020a05600c349300b003d2370b97f4mr30151839wmq.16.1672564891468; Sun, 01 Jan 2023 01:21:31 -0800 (PST) Received: from mars.. ([2a02:168:6806:0:2624:83db:c4f6:846d]) by smtp.gmail.com with ESMTPSA id r17-20020a05600c425100b003cffd3c3d6csm32763769wmm.12.2023.01.01.01.21.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 01 Jan 2023 01:21:31 -0800 (PST) From: Klaus Kudielka To: Andrew Lunn , Gregory Clement , Sebastian Hesselbarth , Rob Herring , Krzysztof Kozlowski , =?utf-8?q?Pali_Roh?= =?utf-8?q?=C3=A1r?= , =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= Cc: Thomas Petazzoni , Chris Packham , linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Klaus Kudielka Subject: [PATCH 2/2] Revert "ARM: dts: armada-39x: Fix compatible string for gpios" Date: Sun, 1 Jan 2023 10:20:33 +0100 Message-Id: <20230101092033.45803-2-klaus.kudielka@gmail.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230101092033.45803-1-klaus.kudielka@gmail.com> References: <20230101092033.45803-1-klaus.kudielka@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230101_012133_444363_36043C55 X-CRM114-Status: GOOD ( 12.09 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org This reverts commit d10886a4e6f85ee18d47a1066a52168461370ded. Commit 5f79c651e81e states armadaxp-gpio is broken in a non-trivial way. Commit 988c8c0cd04d deprecates armadaxp-gpio for this reason. Signed-off-by: Klaus Kudielka --- arch/arm/boot/dts/armada-39x.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/armada-39x.dtsi b/arch/arm/boot/dts/armada-39x.dtsi index 1e05208d9f..9d1cac49c0 100644 --- a/arch/arm/boot/dts/armada-39x.dtsi +++ b/arch/arm/boot/dts/armada-39x.dtsi @@ -213,7 +213,7 @@ nand_pins: nand-pins { }; gpio0: gpio@18100 { - compatible = "marvell,armadaxp-gpio", "marvell,orion-gpio"; + compatible = "marvell,orion-gpio"; reg = <0x18100 0x40>; ngpios = <32>; gpio-controller; @@ -227,7 +227,7 @@ gpio0: gpio@18100 { }; gpio1: gpio@18140 { - compatible = "marvell,armadaxp-gpio", "marvell,orion-gpio"; + compatible = "marvell,orion-gpio"; reg = <0x18140 0x40>; ngpios = <28>; gpio-controller;