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: 37941 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp3695681wrt; Sun, 1 Jan 2023 01:22:55 -0800 (PST) X-Google-Smtp-Source: AMrXdXs8VsQGx807orYSAK4zLgF5ioTF9r46EYgQMsJ4KCIgQhu44WCP0ItOI2yweKMsC3hI0R6N X-Received: by 2002:a17:90a:db4f:b0:223:2aa8:7ae4 with SMTP id u15-20020a17090adb4f00b002232aa87ae4mr47070256pjx.47.1672564975657; Sun, 01 Jan 2023 01:22:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672564975; cv=none; d=google.com; s=arc-20160816; b=nY3N0BIdpT40c1GcG0u2tfC7Oy/ljWfpDKlG+f5MPbIZYLUN5OIWWUbim/4ZFbXYXv MZjT4Y10HbXrf2ZjI9jNPHglfZ+pvzw/MksoCC1NaH/9CfFzxL4DOKJPyQXS74LDcyLe o+4WweOMFWQmiWBdU0r/w4E/3GcEOmdezf2xjLcfbrcOjOfacCIZ7LE4BzdiK2W9tl3o SfnuD6xxDe17A8jR0kyt7k3FaCECGDEte8ywT2LtKDUZOFdqNsnvH9oOlcHSzqXYkvTE t6bJhZ5y9NzjIDhwr9+A4IMdQbUw+Of9W4K54CBNkp9XfBO1znhKmZAypM+sW0G3Vg8C hLoA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=pphMC7MPt/g+ZS1+ekkAwKQzB3YVITU74fxVYBxCRwI=; b=r7UvlRp67TuMZsVX/jS8n+eo9vsY8Suev+3izPVOjfx+OOHmgGl8OWtDAzep+Zv8UR xnho4qAAS+jso/nWJHiX99Fib6+jpJSiNs6bE69mwh9sIYtFdxyiqOLaX8DLiICgKhfb dBY9FQj1UzHKIKSV3hgHUTeNJZag/GOKfg0I6CYLxJ53C6Eiz+fnKkDZ4sjSl13DNkHj cFXRM6ynUoakhKi2PPw964bkKnc6Vx0sU6pVFVpdBHOIup9aqJlbhW5jp9bG6aOE4jWi o1wpDFVOItECZcjbc02wjkCPq2uHIqwciDUhAHdFMPm80c3ZF2sVVisepjby26MrAdT0 l8xw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=PJTVxJyP; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id b29-20020a63931d000000b004774a0c66e5si28060071pge.113.2023.01.01.01.22.43; Sun, 01 Jan 2023 01:22:55 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=PJTVxJyP; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229575AbjAAJV3 (ORCPT + 99 others); Sun, 1 Jan 2023 04:21:29 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44392 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229472AbjAAJV1 (ORCPT ); Sun, 1 Jan 2023 04:21:27 -0500 Received: from mail-wm1-x331.google.com (mail-wm1-x331.google.com [IPv6:2a00:1450:4864:20::331]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2A92560CC; Sun, 1 Jan 2023 01:21:26 -0800 (PST) Received: by mail-wm1-x331.google.com with SMTP id k26-20020a05600c1c9a00b003d972646a7dso15411258wms.5; Sun, 01 Jan 2023 01:21:26 -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=PAEqk9praQHc1pxgxqdTGpYpqu9HPXTGhHNuzrihLJ7zmi1QRNlx61ujf2OUa4R6iI q24q557M8zv4MhMR6V+/M2ilnSakJ3cF67/rJmhBjfJSqitGcmYPzLKKqpmMEwCzT9oU tDasxKFxI8xaMi6nfVZ7Q44LtSWcv8jO+AKWsRYqGZWvFEQryLxBSHyT5AvtvHRRSO3H KX48ipntfIk04llF9EY/RspDf8DmaAUIJYq2qKI+j8yBmdbFN6Lt6USSuB6noBxvh5dF r/Jv32lM5ptCAx+UQKaSeY6uMqc7WYi/TQwZVvnHObsc4tT1viYTXL/9Z//m10EnXozn 2/7Q== X-Gm-Message-State: AFqh2krM+tOgko2fnv0dVXIFLeg42hfhodp5RU06ugO2QZdP2FuIHJer dkzeN4aURAxUFaRGalLB/+Y= 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-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1753811492230178466?= X-GMAIL-MSGID: =?utf-8?q?1753811492230178466?= 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: 37942 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp3695689wrt; Sun, 1 Jan 2023 01:22:59 -0800 (PST) X-Google-Smtp-Source: AMrXdXt3A5zLXExYUmHhqUXv2KAkB7XHpc/UpIgaH7fSrPk1lPdxWJGaXBnaU4fGCia7pIbjmfEO X-Received: by 2002:a05:6a20:4c20:b0:b0:c30:1de with SMTP id fm32-20020a056a204c2000b000b00c3001demr40661096pzb.61.1672564979351; Sun, 01 Jan 2023 01:22:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672564979; cv=none; d=google.com; s=arc-20160816; b=1D87KyFrNShvwZUKIUGYVC9XT0F+6j4ox8M1l1PdW021YUna+WxAhYLR0OxqyJFb7E XhlhK+td6fA4ZbQzucPV/FHpMZzbtMHkB0UQRkc4iTxqlei32Syvk5AWMRh2X/ozsNAx rgwYsgqM8Fbatk3L613geFTXw4hIPAPOT/pf8PiM+vqaEwM8mSAn7F40xse2RZXqfVV2 BCvD3EijTBHg6cfrNSxqRFahkISY9tfjjDQCtJ8woXvESwrYlKDMAm9p3k1h1sY+jzIa eb/NFCMPqnm0/3nSdjTfdKdUWH6n7eZdpI3cbpmBi/D7G8slYawiRN+3eRBvEBomqINF pciw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=mGM5YWcMUl/AKOA1Ej+/uSN1K21Yt+2nOh2g+QQjZ2Y=; b=08qt2PMCvTUTIzCD0bWUiNIvnbhuA4ElqkmPuZfPOcpVWwhy49DGIX8QXv4RvyyUv0 bLhhoFmoshc97Tf0tOZCwp5Ps03MOw3ggqhtAP1AjNzhsjxsmYi7XZVq+yyH6VOiD6ka rq2Ox+jT/OCvdsshI0tvG5mllFGcGsn8F8U7m/kSNW9jSAuz66/t3LNx9Zfip3dmiJLw VDQ46CI6mdKNO00uF6Ku8cO9gHu52LlVsjGCtVhpNo201+Uv6MXcwW0OyeVh7XW5n1oT a8CQYMyWsZw1aX1NnGbDGniceS8WWdusqv4xw/4N3382u0LUhggCv7vr8Pk1iOtpUUnt A1Xg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=J49sVIlC; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id e21-20020a637455000000b00476d6927ba2si28355681pgn.659.2023.01.01.01.22.47; Sun, 01 Jan 2023 01:22:59 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=J49sVIlC; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229928AbjAAJVg (ORCPT + 99 others); Sun, 1 Jan 2023 04:21:36 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44438 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229472AbjAAJVe (ORCPT ); Sun, 1 Jan 2023 04:21:34 -0500 Received: from mail-wm1-x330.google.com (mail-wm1-x330.google.com [IPv6:2a00:1450:4864:20::330]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CC95162CA; Sun, 1 Jan 2023 01:21:32 -0800 (PST) Received: by mail-wm1-x330.google.com with SMTP id g10so4497495wmo.1; 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=4nt3v9hNAhs865FEXbucHlX/JtP8He3l4giTMIAACRDjs5k32ULRVMyLaoIFeJTisd KCEl3enhi9+IICNfZG/6xPsS7i3EOhYVt8h/NKh8/4hAIiLNr5CGB2H9dnzfhsAKCUZu vbR74D53dFoJvawCSPDpUBWNkvjYf5eq0Ubdu4kMLfm5LoHeaZm7BkPttIedI8ncCSk9 QhWh7mUYQ/nS1OMAEKvVJZAFWF5d6zwG9NM9f3uGCWl6lmWXqGYUo2/LqGwbwc9hWhV+ xrlhFSh6fNoORWcaMTlGjnK6bbl1gSk8ngn88DuqFnPvD/yi/O4406EXUAV9BGFPZdIZ cH6w== X-Gm-Message-State: AFqh2krqC5ruq1yUyBC65YOqv6mOcNm11MLs3QpOc4T7VUIp0DMhLzbf Pq+ei62q5S1opB33bshG+iQ= 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-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1753811495723575586?= X-GMAIL-MSGID: =?utf-8?q?1753811495723575586?= 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;