From patchwork Sun Feb 11 21:24:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 13552621 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 DA1D2C4829A for ; Sun, 11 Feb 2024 21:24:50 +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:Cc:To:In-Reply-To:References:Message-Id :MIME-Version:Subject:Date:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=xV+e8lrTn0HNSUwTlAb+oOzwYZzHMUc2BIHoq72Qqs4=; b=WCd+AVPSdNPHot C1lv2keFecVibfC09cT9qep9Cgodv4X4XZ0K0tjA6OqFD+pPAKSyzUu9DeH8t3YYPUjtbetgQi4pa UMkrHsOmU/y6oi/tpli91aU4P5/CfNlxFmmdBG1Cp3Ec4OuOujw21TiVjVhWELrzSMj2vzrOJj5gm DEgoKbAcUb/hAQ57Amd3Z75sS70I0/KXE0HVJQeaV2nPPX7Ndcxh65oxDVYhu/hL45obkUabw5cYF 0dWyIWHicsbHSDmTpkcovqIwQ0fdfjzJylaxHvvei5adOtprKQLoH5WenMPrKNAZWlLh4PVHkxTim c+NQDBbgPMDGxnkPJARQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rZHJW-00000003LCF-0nso; Sun, 11 Feb 2024 21:24:38 +0000 Received: from mail-lj1-x233.google.com ([2a00:1450:4864:20::233]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rZHJP-00000003L9n-2vir for linux-arm-kernel@lists.infradead.org; Sun, 11 Feb 2024 21:24:33 +0000 Received: by mail-lj1-x233.google.com with SMTP id 38308e7fff4ca-2d09d90fa11so34738811fa.3 for ; Sun, 11 Feb 2024 13:24:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1707686670; x=1708291470; darn=lists.infradead.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=tJry73lHEiv/1DZkEFEfQ7waEDf73+/ng+jL2FuD14Y=; b=Ih4ZbWdIL4yMc8Jngl7NuBqUBISwYkEHL5wgjgdh4SL8igSLzSOz3fZYvA8iNCuKM8 PDTLPgQ6BvNfqwN+PPouEVGUdCBlZs5Gvs3Uzhcx7EO9WJiSGrv13yFLSdG8kWx7MNAf QtInIUqnOrWOl9bkte5+KkURN2gigU5iuqjcfbfU+EfiGdRRxjWGDrYs4qMyCKixQd7o MaRUhubgCPy5AHBzrQJ825BUl6mL4xPWFkuP6XZCPQFE5FRlgdLsaxJX7oSxcWefVGjj rDcYO2PcQkTrulqgAp3l/3qH72xAAyhUfiRQBgw8i4T+eiUWQzTG+0Eb78sqh1WKXmAK AU3A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707686670; x=1708291470; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=tJry73lHEiv/1DZkEFEfQ7waEDf73+/ng+jL2FuD14Y=; b=bREqKPq2kFzXqzl6sBvqvlFeUIJabtkiUYoFEssUY/THJQRkBoLTc/jbdi2LZeZY0T N7wsj0FSUZTpmqSmKUafd9/10HQ9RkzpJj2pkjZ80jmQR3Gj0G1XtzSZfyjX3PBlz00G jpF5Q4B08g47LwnXFXWjVKMnG8wkhxEU9z3pYfAIKBt32WUd7Md3j412Bmdk0RUq1iNp Upj8yD90RV74egomoXiRAdJwA2HktjFKpYLuc13filT2Z4WuSNoQK9aUW733AkYzuvgc kcIFxusE7+Rv8glpELK1Wwaj7j/hKpurTtChvyCaJ6uG0ZvopcPIs4TtjMpmtU2NU6dn A3ww== X-Gm-Message-State: AOJu0Yx7sJxvhxJVSzHmtcU9DHttt7XVZCsOsM0rUzjAf5E0bBx811Or fcxa4S0BhYYFC8wK6HCl+4BcQdQXgqFibaWZc+zlw+VkKLlo4tKFxMua0XeybYAxBc6zySDa6BS x X-Google-Smtp-Source: AGHT+IEWIKXrYro6RR8iYM/7+XnMAstKzlGkHjgisMhkla1PWroZK9ZFhG5G+YTib/mp0+HSHmZVPA== X-Received: by 2002:ac2:59c1:0:b0:511:8dde:55d8 with SMTP id x1-20020ac259c1000000b005118dde55d8mr737534lfn.34.1707686669585; Sun, 11 Feb 2024 13:24:29 -0800 (PST) X-Forwarded-Encrypted: i=1; AJvYcCUBuT0s2kQFRxD4c1mcGWu6HKzXuVrw9gML+yLRqRRBFn/U52Oa/3NLIOyHRBGVJE8RvW2ebkufe8XEdlCCCGm6dojYTK/C5yegGtRsAruVzskM6S4AZJerH8+0v+EuxsYuhISfa1JQ3ZTDI0i4uAgCe57wodxBoLc+7u7NokBrSCzaq9PjIIIlmkrxxTTCUP+tNS4oTjFx/WyXRW8uIUQNCfR3yVIy/EI8kol0DtYQlg== Received: from [127.0.1.1] ([85.235.12.238]) by smtp.gmail.com with ESMTPSA id h8-20020a056512220800b005115edd71c9sm623684lfu.165.2024.02.11.13.24.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 11 Feb 2024 13:24:28 -0800 (PST) From: Linus Walleij Date: Sun, 11 Feb 2024 22:24:23 +0100 Subject: [PATCH 1/4] ARM: dts: gemini: Fix switch node names in the DIR-685 MIME-Version: 1.0 Message-Id: <20240211-gemini-dts-v1-1-6c09adeb4c2e@linaro.org> References: <20240211-gemini-dts-v1-0-6c09adeb4c2e@linaro.org> In-Reply-To: <20240211-gemini-dts-v1-0-6c09adeb4c2e@linaro.org> To: Hans Ulli Kroll , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, Linus Walleij X-Mailer: b4 0.12.4 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240211_132431_773942_CC3B0963 X-CRM114-Status: GOOD ( 11.60 ) 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 The formally correct node names have "ethernet-*" prefix on switch, ports, port and phy, fix it up. Signed-off-by: Linus Walleij --- arch/arm/boot/dts/gemini/gemini-dlink-dir-685.dts | 26 +++++++++++------------ 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/arch/arm/boot/dts/gemini/gemini-dlink-dir-685.dts b/arch/arm/boot/dts/gemini/gemini-dlink-dir-685.dts index 396149664297..30c931415680 100644 --- a/arch/arm/boot/dts/gemini/gemini-dlink-dir-685.dts +++ b/arch/arm/boot/dts/gemini/gemini-dlink-dir-685.dts @@ -187,7 +187,7 @@ touchkeys@26 { }; /* This is a RealTek RTL8366RB switch and PHY using SMI over GPIO */ - switch { + ethernet-switch { compatible = "realtek,rtl8366rb"; /* 22 = MDIO (has input reads), 21 = MDC (clock, output only) */ mdc-gpios = <&gpio0 21 GPIO_ACTIVE_HIGH>; @@ -204,36 +204,36 @@ switch_intc: interrupt-controller { #interrupt-cells = <1>; }; - ports { + ethernet-ports { #address-cells = <1>; #size-cells = <0>; - port@0 { + ethernet-port@0 { reg = <0>; label = "lan0"; phy-handle = <&phy0>; }; - port@1 { + ethernet-port@1 { reg = <1>; label = "lan1"; phy-handle = <&phy1>; }; - port@2 { + ethernet-port@2 { reg = <2>; label = "lan2"; phy-handle = <&phy2>; }; - port@3 { + ethernet-port@3 { reg = <3>; label = "lan3"; phy-handle = <&phy3>; }; - port@4 { + ethernet-port@4 { reg = <4>; label = "wan"; phy-handle = <&phy4>; }; - rtl8366rb_cpu_port: port@5 { + rtl8366rb_cpu_port: ethernet-port@5 { reg = <5>; label = "cpu"; ethernet = <&gmac0>; @@ -252,27 +252,27 @@ mdio { #address-cells = <1>; #size-cells = <0>; - phy0: phy@0 { + phy0: ethernet-phy@0 { reg = <0>; interrupt-parent = <&switch_intc>; interrupts = <0>; }; - phy1: phy@1 { + phy1: ethernet-phy@1 { reg = <1>; interrupt-parent = <&switch_intc>; interrupts = <1>; }; - phy2: phy@2 { + phy2: ethernet-phy@2 { reg = <2>; interrupt-parent = <&switch_intc>; interrupts = <2>; }; - phy3: phy@3 { + phy3: ethernet-phy@3 { reg = <3>; interrupt-parent = <&switch_intc>; interrupts = <3>; }; - phy4: phy@4 { + phy4: ethernet-phy@4 { reg = <4>; interrupt-parent = <&switch_intc>; interrupts = <12>; From patchwork Sun Feb 11 21:24:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 13552623 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 3C1B3C4829E for ; Sun, 11 Feb 2024 21:24:56 +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:Cc:To:In-Reply-To:References:Message-Id :MIME-Version:Subject:Date:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=7YLzRgrf6ghUC9OwJvLpvVigivD8X5vQtGBPxE0XKEk=; b=Yg2enRLcWaKpBA KJRgTdzSFWh7KXTBZCSYmk/5Tk15pmGaOY1iQw9dGwCGfnsr49f/4YW3HUncCQ7r5wHDY5f6Nbmu4 AD315wgVYhBESQ4fjEM/jaOuL/tBMl8niJnjlBYw/Pd2r/C2PWOly27/1POn0Uwd1kt/krh1243NR 81CkFuCUmEZtXUn5hY4TqlWzmuGphRNhPgsmaFJdeCrbVR8WNsNKq69CLvzjLecqCfZ/AbVUqfAZv S9B6xMTvnriJohqahgFDUixSLyKktIAl0rT9ZYfEBGhgORfmffBx4hyLTVPlPWAIGoi8aQ4PpovUO uKPZG/S9JGn4vX1Ymrbw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rZHJX-00000003LCX-0857; Sun, 11 Feb 2024 21:24:39 +0000 Received: from mail-lf1-x12a.google.com ([2a00:1450:4864:20::12a]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rZHJQ-00000003LA2-2wVV for linux-arm-kernel@lists.infradead.org; Sun, 11 Feb 2024 21:24:34 +0000 Received: by mail-lf1-x12a.google.com with SMTP id 2adb3069b0e04-51181d8f52fso1484931e87.3 for ; Sun, 11 Feb 2024 13:24:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1707686670; x=1708291470; darn=lists.infradead.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=SpPoAHSPLW8YMujkw0W6zINo/VdyrGjtrtRnN92gB/8=; b=D5bW5HdfMaQwAQ8+RjWtCUHwkJY0eAFEMWDDq2gNrfWqRnM44mPdvP6Q/F+rRuki3y Q1nETJgrkCLUlJak4ORHEsnrZ5iRGjwO/YMa3Ig6Jf232dZ4eQl9jB4IQbdhXbwc4k6k 0UnjjMNrOhnO4J95MQl50UDfIyQNmyB3IbvrhTfCxlhXa3eQChFik50+vSRF2vDucunu ihSuOozWyDDlPGV8w/IHNAintIHi0w2wVNWKrn5FKH4ZJ8IMaQ0/GurNFU8LN4t4DJrI tQ8zJW4ithLTJsPA/7jYDAgW4b6CVnm86teQ39lGvTnomdVO5J8tdBVSGfo910NVf9XD XWmQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707686670; x=1708291470; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=SpPoAHSPLW8YMujkw0W6zINo/VdyrGjtrtRnN92gB/8=; b=r7g6t4968jLxX/b0h0DsdmW8aPXXsTTn4DihwtDKUZZyjgK/EFh1rT1DUQy3b+UiOi uLF3qjswTQGwRprwuP4NZrL66JRAj2BwbSDp5D2DiJRsXjNuEbw+CT7LC/U7/qTgqr1n f2RFeQg3I4glDyyIbrlSUwCPKTRNOSjqAl1VsJuHGxTw2Tq4ZoToyUuZMfEIpAHY6wJV Q72C625dlLIi3Oy9DY8vDarn/561ue9LfMV7O9rBoTOpzg4IE2OCt0DIPF3vatETlC0x I0a2rE5q+kCR6vBjjM0tgX2acaYh4m9vAZAtRqmOm68RR/wrtYERPrSNs1Kxbxcog/qt tagw== X-Gm-Message-State: AOJu0YzxC/SCdwtZCfQrUir94WYrr4BDENh2ETHOjL7EhqelKjqm3R8Q 1GbMWA1W3cWuYtwisllUkJ53GSpvDS5SknEbya9fURR1074m/uz1ssRSgWFMD6s= X-Google-Smtp-Source: AGHT+IGgkx9mhQ5Us/zTWdGH3t5j4Spncszt0JUMVFtF1LwFW1m7mDQ3QkcTNodenK17f9DTPPRanQ== X-Received: by 2002:ac2:546c:0:b0:511:8ce8:c38 with SMTP id e12-20020ac2546c000000b005118ce80c38mr1036274lfn.12.1707686670531; Sun, 11 Feb 2024 13:24:30 -0800 (PST) X-Forwarded-Encrypted: i=1; AJvYcCU52kukOH02TuLx2HJ7aleBCpSnYJkTU08Xl7pZa0nM/WKM6OAioCtwx2Q/zlYvco8V7rSILqSacd0/JD1I90kFfv/byuR0opMWeNwlYIfVQvB2+Uc3PjRMoUDeqb1pIK2CMrC4/AToX7vogDKtsTxiNTH5KmQoZiRmbar1O2kYL4Jjoi5nNCX5D3jLTnjhPH5Gwz36cvvBzplT8moUw4/alf7wMK/dWjbtqickAPnLHQ== Received: from [127.0.1.1] ([85.235.12.238]) by smtp.gmail.com with ESMTPSA id h8-20020a056512220800b005115edd71c9sm623684lfu.165.2024.02.11.13.24.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 11 Feb 2024 13:24:29 -0800 (PST) From: Linus Walleij Date: Sun, 11 Feb 2024 22:24:24 +0100 Subject: [PATCH 2/4] ARM: dts: gemini: Fix wiligear compatible strings MIME-Version: 1.0 Message-Id: <20240211-gemini-dts-v1-2-6c09adeb4c2e@linaro.org> References: <20240211-gemini-dts-v1-0-6c09adeb4c2e@linaro.org> In-Reply-To: <20240211-gemini-dts-v1-0-6c09adeb4c2e@linaro.org> To: Hans Ulli Kroll , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, Linus Walleij X-Mailer: b4 0.12.4 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240211_132432_775304_9440BFAA X-CRM114-Status: GOOD ( 12.01 ) 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 These board strings were deprecated in the bindings ages ago, switch the boards over to the real names. Signed-off-by: Linus Walleij --- arch/arm/boot/dts/gemini/gemini-wbd111.dts | 2 +- arch/arm/boot/dts/gemini/gemini-wbd222.dts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/gemini/gemini-wbd111.dts b/arch/arm/boot/dts/gemini/gemini-wbd111.dts index 3c88c59ab481..d4038930c70f 100644 --- a/arch/arm/boot/dts/gemini/gemini-wbd111.dts +++ b/arch/arm/boot/dts/gemini/gemini-wbd111.dts @@ -10,7 +10,7 @@ / { model = "Wiliboard WBD-111"; - compatible = "wiliboard,wbd111", "cortina,gemini"; + compatible = "wiligear,wiliboard-wbd111", "cortina,gemini"; #address-cells = <1>; #size-cells = <1>; diff --git a/arch/arm/boot/dts/gemini/gemini-wbd222.dts b/arch/arm/boot/dts/gemini/gemini-wbd222.dts index ff72bbc4db3e..a503bcff5f4a 100644 --- a/arch/arm/boot/dts/gemini/gemini-wbd222.dts +++ b/arch/arm/boot/dts/gemini/gemini-wbd222.dts @@ -10,7 +10,7 @@ / { model = "Wiliboard WBD-222"; - compatible = "wiliboard,wbd222", "cortina,gemini"; + compatible = "wiligear,wiliboard-wbd222", "cortina,gemini"; #address-cells = <1>; #size-cells = <1>; From patchwork Sun Feb 11 21:24:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 13552624 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 CB9DDC4829F for ; Sun, 11 Feb 2024 21:24:57 +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:Cc:To:In-Reply-To:References:Message-Id :MIME-Version:Subject:Date:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=KgZs0nvNhd2OOjbLYTROjnRLKK2ARUYlLQBcCBRrzDU=; b=AJyJokK/7+R33K Qa0z5Z54tfhSB51CUo5s2RTXn5JMDSe64vWNVGvwVpnCmFgAe4lSoFJL6b3bqSVsyiayFRBps4tss WRgE/8zDFQg48dsnpJJpEaePwXW7XpIVVPLpnZ5Qt+cUcW1r44FHkMitEX8Ui+w6O5f+K5h8wl24I FptIXAmF6VMm3kpF5CIBPubCcx8s31pPkSu3HbSKFLyHH1LydihATDIVR2NKnqB9bppwNxxEluwGO SKwMEpivbsvc38C559flJbJ8NkeKCYCgc1ywU1OqJkb5s0BaoZEfcOxKphGC/ekwQn5RHtYV4EjJl QOaqmnsFo8eSI72ALdMQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rZHJX-00000003LCd-37ej; Sun, 11 Feb 2024 21:24:39 +0000 Received: from mail-lj1-x230.google.com ([2a00:1450:4864:20::230]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rZHJR-00000003LAH-1uOy for linux-arm-kernel@lists.infradead.org; Sun, 11 Feb 2024 21:24:35 +0000 Received: by mail-lj1-x230.google.com with SMTP id 38308e7fff4ca-2d07ffa0a9cso29043111fa.2 for ; Sun, 11 Feb 2024 13:24:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1707686671; x=1708291471; darn=lists.infradead.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=ZM1XIaD3ecrXLxEb1Gsx+3ajyZG58aa345Y2A9SVCU0=; b=uuUYoKVSV3J1iTvmhg9nBTPEt+Gh/W16xQXfCLiL7abk1OiaXUapx4vn9VQt99PldV dHj9ZYMR3HAqEUMwW7bTQL40o8VACTa/lwoOotwCI1QajN/Qb17EaR00139Bcl2uwaWc jCBPk7/ORyrDyQSYbGqKRr/RrSz94oII4t3ErBjpnGSrw0+rSDtSwACIR/w9azYZf/qd 7dqMwww+YExjKr3iI3htKn21rhxcVMAF9tLa8pQjqMOyZEh10m96satbI88V+9Hwg383 LtlpL8hlcC6Vn0q567DaknzVug2Fz9W/lJIQHz0R1pwgDPWzVfzN9SAkrwmbtNBCOYKz xAWw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707686671; x=1708291471; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ZM1XIaD3ecrXLxEb1Gsx+3ajyZG58aa345Y2A9SVCU0=; b=fuZtDfVBBAhxQcCqTz7bCKx9+4p7/23iCt0DwIToQyb7LeCE1k+V9tt8xHXzNUOYqK KUhSH456tKf1FUXYd1z/lGTp0T31TdPvD59Utr3JAW0pmMKhDPcoXF+OTookZcUYNpZM aJ5+Bi5SUwYfdIdZ7TrCDgLeMFz4vfq3pZwRjzwrcYobGGTxiWj8zJatvMUncq3r44Xv TFT4balpIugHn3Lh4lv/ktnfNYoCO07sakD1QJ7cXhmXDcejtj/Dez02LOnkT4DhhCcd VmgXK+lfQ1Y1BKSUhOgEE7QSmndvs7Jjjhd5bdY5Vmk0vMh+wOoZr8byiAd/zwZw7uWm ubaQ== X-Gm-Message-State: AOJu0YxShJyzO2lXgeAN53cjv3GsZOV6GE1IZK6nKmAZKJIO0bfnPvwu 05JcqAs6hsnVcDEFUNpKCFmfxSfp3m+dXdUG8zn394CLJYPABi5alMacfgzLhLA= X-Google-Smtp-Source: AGHT+IFozJUWcdMIObw5s9xg8xEz4tg7IbyDH7wOa6wzeGpHQkxs7qISL4cpwNIfC1Ma4jngJPccbA== X-Received: by 2002:a05:6512:b95:b0:511:47ed:d744 with SMTP id b21-20020a0565120b9500b0051147edd744mr3944622lfv.12.1707686671313; Sun, 11 Feb 2024 13:24:31 -0800 (PST) X-Forwarded-Encrypted: i=1; AJvYcCXIX8aGnTvZf0NC9xOJoKWeEuzl/ob3qL31m+DMzAo595IopD9Njz6Y1qbWu1Pg/G2QiEiSdlTrVS0/oZUf5nyPcJ804WUl6uxPN1EySzadF3XAKBFE433FCoU0EX7ZfHZUSoazEHgac2RIY/K9GqZG2uZ6RRKkD+15MNyLXXW/54+iSyFCcYgD+1ZqNrVPNIYI4aCBV0pIfzkO2rWyKdgfui/BVvD+2tuqdxng8HA1Mw== Received: from [127.0.1.1] ([85.235.12.238]) by smtp.gmail.com with ESMTPSA id h8-20020a056512220800b005115edd71c9sm623684lfu.165.2024.02.11.13.24.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 11 Feb 2024 13:24:30 -0800 (PST) From: Linus Walleij Date: Sun, 11 Feb 2024 22:24:25 +0100 Subject: [PATCH 3/4] ARM: dts: gemini: Map reset keys to KEY_RESTART MIME-Version: 1.0 Message-Id: <20240211-gemini-dts-v1-3-6c09adeb4c2e@linaro.org> References: <20240211-gemini-dts-v1-0-6c09adeb4c2e@linaro.org> In-Reply-To: <20240211-gemini-dts-v1-0-6c09adeb4c2e@linaro.org> To: Hans Ulli Kroll , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, Linus Walleij X-Mailer: b4 0.12.4 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240211_132433_541587_839DC95A X-CRM114-Status: GOOD ( 13.02 ) 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 maps the misc "reset", "setup" and "facory reset" keys to the only key a standard userspace is likely to understand: KEY_RESTART. On OpenWrt this will simply restart the system under controlled forms. Signed-off-by: Linus Walleij --- arch/arm/boot/dts/gemini/gemini-dlink-dir-685.dts | 4 ++-- arch/arm/boot/dts/gemini/gemini-dlink-dns-313.dts | 4 ++-- arch/arm/boot/dts/gemini/gemini-sl93512r.dts | 2 +- arch/arm/boot/dts/gemini/gemini-sq201.dts | 2 +- arch/arm/boot/dts/gemini/gemini-wbd111.dts | 4 ++-- arch/arm/boot/dts/gemini/gemini-wbd222.dts | 4 ++-- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/arch/arm/boot/dts/gemini/gemini-dlink-dir-685.dts b/arch/arm/boot/dts/gemini/gemini-dlink-dir-685.dts index 30c931415680..b4dbcf8f168e 100644 --- a/arch/arm/boot/dts/gemini/gemini-dlink-dir-685.dts +++ b/arch/arm/boot/dts/gemini/gemini-dlink-dir-685.dts @@ -27,10 +27,10 @@ chosen { gpio_keys { compatible = "gpio-keys"; - button-esc { + button-reset { debounce-interval = <100>; wakeup-source; - linux,code = ; + linux,code = ; label = "reset"; /* Collides with LPC_LAD[0], UART DCD, SSP 97RST */ gpios = <&gpio0 8 GPIO_ACTIVE_LOW>; diff --git a/arch/arm/boot/dts/gemini/gemini-dlink-dns-313.dts b/arch/arm/boot/dts/gemini/gemini-dlink-dns-313.dts index 138c47e1ac1b..8c54d3a5a721 100644 --- a/arch/arm/boot/dts/gemini/gemini-dlink-dns-313.dts +++ b/arch/arm/boot/dts/gemini/gemini-dlink-dns-313.dts @@ -33,10 +33,10 @@ chosen { gpio_keys { compatible = "gpio-keys"; - button-esc { + button-reset { debounce-interval = <100>; wakeup-source; - linux,code = ; + linux,code = ; label = "reset"; gpios = <&gpio1 31 GPIO_ACTIVE_LOW>; }; diff --git a/arch/arm/boot/dts/gemini/gemini-sl93512r.dts b/arch/arm/boot/dts/gemini/gemini-sl93512r.dts index 91c19e8ebfe8..be06a3815e3a 100644 --- a/arch/arm/boot/dts/gemini/gemini-sl93512r.dts +++ b/arch/arm/boot/dts/gemini/gemini-sl93512r.dts @@ -43,7 +43,7 @@ button-wps { button-setup { debounce-interval = <50>; wakeup-source; - linux,code = ; + linux,code = ; label = "factory reset"; /* Conflict with NAND flash */ gpios = <&gpio0 18 GPIO_ACTIVE_LOW>; diff --git a/arch/arm/boot/dts/gemini/gemini-sq201.dts b/arch/arm/boot/dts/gemini/gemini-sq201.dts index d0efd76695da..05ef8b80f104 100644 --- a/arch/arm/boot/dts/gemini/gemini-sq201.dts +++ b/arch/arm/boot/dts/gemini/gemini-sq201.dts @@ -30,7 +30,7 @@ gpio_keys { button-setup { debounce-interval = <100>; wakeup-source; - linux,code = ; + linux,code = ; label = "factory reset"; /* Conflict with NAND flash */ gpios = <&gpio0 18 GPIO_ACTIVE_LOW>; diff --git a/arch/arm/boot/dts/gemini/gemini-wbd111.dts b/arch/arm/boot/dts/gemini/gemini-wbd111.dts index d4038930c70f..6a0c89e0c918 100644 --- a/arch/arm/boot/dts/gemini/gemini-wbd111.dts +++ b/arch/arm/boot/dts/gemini/gemini-wbd111.dts @@ -28,10 +28,10 @@ chosen { gpio_keys { compatible = "gpio-keys"; - button-setup { + button-reset { debounce-interval = <100>; wakeup-source; - linux,code = ; + linux,code = ; label = "reset"; /* Conflict with ICE */ gpios = <&gpio0 5 GPIO_ACTIVE_LOW>; diff --git a/arch/arm/boot/dts/gemini/gemini-wbd222.dts b/arch/arm/boot/dts/gemini/gemini-wbd222.dts index a503bcff5f4a..d8b34ebad4b0 100644 --- a/arch/arm/boot/dts/gemini/gemini-wbd222.dts +++ b/arch/arm/boot/dts/gemini/gemini-wbd222.dts @@ -27,10 +27,10 @@ chosen { gpio_keys { compatible = "gpio-keys"; - button-setup { + button-reset { debounce-interval = <100>; wakeup-source; - linux,code = ; + linux,code = ; label = "reset"; /* Conflict with ICE */ gpios = <&gpio0 5 GPIO_ACTIVE_LOW>; From patchwork Sun Feb 11 21:24:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 13552622 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 EAFA4C4829A for ; Sun, 11 Feb 2024 21:24:55 +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:Cc:To:In-Reply-To:References:Message-Id :MIME-Version:Subject:Date:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=+sSZL+ap1EwCpye/hUDfWAGyhmpbXaVwSl4wwXF4xz4=; b=UY0fFyjDgL8zH/ KQmlXhE910o8Xa/tRYbzkFbTL5LJp/sEB49HUi8xQioHws6v+5+Fg7Mbu7cz99iqrV5ktK/U/YYwH nU9qZLrVwTt0cb26tOQgWqXJO7PsNk7KXbbFYQb+GMtGdc450PhLLx4ZcboU54qh0+0Hcu8CY6pD9 JlSKTLgtB2ZlEcU0BoDhMwNKFWs+inTcQJWZu1RO3Fb9Ohgtp+Uyi4r7fIcynd1MlpUaqxYlpzBmx pQ02GSB3OWwHZM6wnJjG7CcVSBiJgRU0jYku7ynngWCa//HYJtDrlQluoM/5sObI8ra4hbw/Pl5q6 V/sSR2Fit6GvduCsiPJA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rZHJY-00000003LCl-2UVE; Sun, 11 Feb 2024 21:24:40 +0000 Received: from mail-lf1-x132.google.com ([2a00:1450:4864:20::132]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rZHJS-00000003LAf-1WRa for linux-arm-kernel@lists.infradead.org; Sun, 11 Feb 2024 21:24:35 +0000 Received: by mail-lf1-x132.google.com with SMTP id 2adb3069b0e04-5118d65cf9cso431575e87.0 for ; Sun, 11 Feb 2024 13:24:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1707686672; x=1708291472; darn=lists.infradead.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=H6kY8ddkk0naZRr/JS0Z60TBisWL5BUY4kseNNkrQ1c=; b=BlkDuLQ43u1CbXIicYZ5Pi2yg/r/MzW/KsXvrA02iSbuqYWYZ/PhyNo7HsfHTpey0d j9CcDOALpMo3p9yh7ROUyvCN8KEHiwpPj35Vpf6ySsKDUC0YVPmTbt3qfH/nrqtrrds5 fZ+HtnWNPiXFxVrL/Epb6PvbFvpakg/7zx0ZnO2BfUNQJhiH0dAO1SXsiZScVP5YX8B0 5haxqPjmmEUbmuSr0a+7edUHFaxTWPqwtWum3VbUj0xpL5MnXczqcchEaSSYBu/yFfEu W/ecZtS/2K/OLgcRg231Gqiq6wUG9VNEDKapXKn4l09Ez6KPcVZBPG7s/0DSnUZyFgXJ YyHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707686672; x=1708291472; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=H6kY8ddkk0naZRr/JS0Z60TBisWL5BUY4kseNNkrQ1c=; b=cfqU/wVV+ko/QkMUx7YnVOLriL4IRAkb8YKdzieyQjD5SM1+r+wmUFK7U9ae2THUWq lHQc+ZZuV9XSxehaSrR2IXpIWkYIaSygbepbKF/fsritbucDEzSv7Z0VVM5fADZmR+M/ USzyh2/npScAL3zHlJlZCBZ/c+qQPjN0PK5uiWV0aBBYIF2smBkgEAPMAj+g4H3mTILc H4f2FJtYoONDOR8RD/WgVvbKud5KQV6s0JD2U2RWbNT9/PoASxRsOP2FQdqHgUw79jhO +UPkV5zAnZLBEDVyqv8FAzI+y5UDMYVrt6mW00mIRYA2W+9n02vhiSsZhqRU/y/a3iXd xWNg== X-Gm-Message-State: AOJu0YzMl6TV/9abxiWuGz4cRKh0S2QmdiAcKWOZd4hPCEmY1d5Vo6aF tcpRMC9cW9cboHTH+0T64EajlvsdPTzxuMeE9PWEZPLdr5Q3fQ0BugfZ8rki+Q5TiiLHX5v5dx3 d X-Google-Smtp-Source: AGHT+IEw4MchLPyzyM/ju8qTTJ3qNMn6Wf8LxMpMc3642UtLgXw1K9o55U7wE9CGBoY2xnb9dpzZcw== X-Received: by 2002:a05:6512:3a84:b0:511:3ef8:5 with SMTP id q4-20020a0565123a8400b005113ef80005mr3328941lfu.34.1707686672187; Sun, 11 Feb 2024 13:24:32 -0800 (PST) X-Forwarded-Encrypted: i=1; AJvYcCWzXVqKUQav1iU3kcIBjoSRs0p4hFowhWXI5q4sSafgwvu+8t/mm4HQMaww9pQVKKjJmtq3rlcQSemv8OsL3RX/Yyyjjx0SlUhzqAKj+QQrBncYopMmCcx8sf7H5j8udSb6p7oyFKe2yvcyiREir7KQp77K9BAvdNUFxpqD5HM438lALh1U+58UL8/GkTJ5j/MnZb0VP34xqJwhANmxXCiPdU5M2VLp2d35uK9eixAjww== Received: from [127.0.1.1] ([85.235.12.238]) by smtp.gmail.com with ESMTPSA id h8-20020a056512220800b005115edd71c9sm623684lfu.165.2024.02.11.13.24.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 11 Feb 2024 13:24:31 -0800 (PST) From: Linus Walleij Date: Sun, 11 Feb 2024 22:24:26 +0100 Subject: [PATCH 4/4] ARM: dts: gemini: Fix switch node names on Vitesse switches MIME-Version: 1.0 Message-Id: <20240211-gemini-dts-v1-4-6c09adeb4c2e@linaro.org> References: <20240211-gemini-dts-v1-0-6c09adeb4c2e@linaro.org> In-Reply-To: <20240211-gemini-dts-v1-0-6c09adeb4c2e@linaro.org> To: Hans Ulli Kroll , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, Linus Walleij X-Mailer: b4 0.12.4 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240211_132434_491731_C893C135 X-CRM114-Status: GOOD ( 10.65 ) 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 The formally correct node names have "ethernet-*" prefix on switch, ports and port, fix it up. Signed-off-by: Linus Walleij --- arch/arm/boot/dts/gemini/gemini-sl93512r.dts | 14 +++++++------- arch/arm/boot/dts/gemini/gemini-sq201.dts | 14 +++++++------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/arch/arm/boot/dts/gemini/gemini-sl93512r.dts b/arch/arm/boot/dts/gemini/gemini-sl93512r.dts index be06a3815e3a..4992ec276de9 100644 --- a/arch/arm/boot/dts/gemini/gemini-sl93512r.dts +++ b/arch/arm/boot/dts/gemini/gemini-sl93512r.dts @@ -93,7 +93,7 @@ spi { cs-gpios = <&gpio1 31 GPIO_ACTIVE_HIGH>; num-chipselects = <1>; - switch@0 { + ethernet-switch@0 { compatible = "vitesse,vsc7385"; reg = <0>; /* Specified for 2.5 MHz or below */ @@ -101,27 +101,27 @@ switch@0 { gpio-controller; #gpio-cells = <2>; - ports { + ethernet-ports { #address-cells = <1>; #size-cells = <0>; - port@0 { + ethernet-port@0 { reg = <0>; label = "lan1"; }; - port@1 { + ethernet-port@1 { reg = <1>; label = "lan2"; }; - port@2 { + ethernet-port@2 { reg = <2>; label = "lan3"; }; - port@3 { + ethernet-port@3 { reg = <3>; label = "lan4"; }; - vsc: port@6 { + vsc: ethernet-port@6 { reg = <6>; label = "cpu"; ethernet = <&gmac1>; diff --git a/arch/arm/boot/dts/gemini/gemini-sq201.dts b/arch/arm/boot/dts/gemini/gemini-sq201.dts index 05ef8b80f104..f8c6f6e5cdea 100644 --- a/arch/arm/boot/dts/gemini/gemini-sq201.dts +++ b/arch/arm/boot/dts/gemini/gemini-sq201.dts @@ -78,7 +78,7 @@ spi { cs-gpios = <&gpio1 31 GPIO_ACTIVE_HIGH>; num-chipselects = <1>; - switch@0 { + ethernet-switch@0 { compatible = "vitesse,vsc7395"; reg = <0>; /* Specified for 2.5 MHz or below */ @@ -86,27 +86,27 @@ switch@0 { gpio-controller; #gpio-cells = <2>; - ports { + ethernet-ports { #address-cells = <1>; #size-cells = <0>; - port@0 { + ethernet-port@0 { reg = <0>; label = "lan1"; }; - port@1 { + ethernet-port@1 { reg = <1>; label = "lan2"; }; - port@2 { + ethernet-port@2 { reg = <2>; label = "lan3"; }; - port@3 { + ethernet-port@3 { reg = <3>; label = "lan4"; }; - vsc: port@6 { + vsc: ethernet-port@6 { reg = <6>; label = "cpu"; ethernet = <&gmac1>;