From patchwork Thu Sep 14 09:45:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Marko X-Patchwork-Id: 13384940 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 76698EDE99E for ; Thu, 14 Sep 2023 09:46:36 +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=8MVg0xeGiND+QlvzdrTIaTBMvz2p4wPXbDwIklUHblI=; b=p4EJ2rTOYT1RLn UxsWUlR3rY/gX01o+5HrBXZuvL7IEtFpQh/gEupQkXnxECoA5TBNVKSk7cWnvmyrLkijmw+I+3d6Y IYnwiqrPqoROYL9sD3ZSafn1Yt7vPqUVwOaSQfY69na/VW9Ar1XNDYjo3f3VRUr8kLXqhwWelhUzN R26f/at8RDxCL2oH8eYJ9AFX7VI/Cj7bnDdH/7wKhQxk/GHAUhvXi1W7z7+/w9gL7Npgb8QyMpzxP BOhHWx0k9JPIptA1pj83BtIn0yPOaF58LvWChm6MBgWlhhxjKZripxm0cPQoxQKV14TESVtb4O9hq 8JffS6GbB/HR1JnOrmMQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qgiv9-007rza-2O; Thu, 14 Sep 2023 09:45:59 +0000 Received: from mail-lj1-x232.google.com ([2a00:1450:4864:20::232]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qgiv7-007ryd-23 for linux-arm-kernel@lists.infradead.org; Thu, 14 Sep 2023 09:45:59 +0000 Received: by mail-lj1-x232.google.com with SMTP id 38308e7fff4ca-2bce552508fso10673141fa.1 for ; Thu, 14 Sep 2023 02:45:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sartura.hr; s=sartura; t=1694684754; x=1695289554; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=E7ZJS7sdRoRRRFWMj7zQxb45/LmVE5dZcYckff9SE60=; b=l4eDaMp4vk8tEJD1Yj5S7OzDuBtXm7z1E8GQ7WFzQGCtBbAu3DaG5GLcc7kRERpJrS i1j8hkL2UAqscqIKDobhIvIp9bprmy8n/phjYR5X/4tDRNyXSzWUNjKCn+pi6CG9UpLN dAGr5RVpbMnlxsUWkeaPtLT0lVnzkA+LlQBN9b+vcVZ/AmHxkk4owGMjE4qEP5fpKyZN Uz9FgWnbqWIwdmKVQL+opTwE4392Lbtnu3ThNsNuno9JmYnpuRPzE/yJ6qZfUKFGUXKU pAHfYKZgTHuuhINqgYeh04EnANpv8LQytPHOaOjCB2fx2hh1ZYhfr/9pRxaKdmAfkQaz lI2w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694684754; x=1695289554; 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=E7ZJS7sdRoRRRFWMj7zQxb45/LmVE5dZcYckff9SE60=; b=QfxDCk1FieBW+lFh/RD/ILYUvRWzzDzNFzSYlEMcEecB3qFQE1zWfYg4bKdIiDvQri aqZkWnO1w7XKBnctVoQtCaK7ed+cPp/TrE/vXP7wBneZZYGDHQM5Ny1LXYpnTGPidUld 2BoljytploPRcoea2Rl2n/CNlvyPwTG1PFpXL2ZeA9w/9Xmv0fvsW7T2AOILgl/VKVqB Kra7TUHqy2ILpejOGcKVLtrsirkcZCcfMV+AbUFAzxJCX10SA8fk8LRt8UnIRmUnkhVD L1wO6R6lSleOveMTt3Am+jV7Ylz44BgX9+w2IbQlQRpyakvzBoCdqNzSCjqBuvA6ZySK OkeQ== X-Gm-Message-State: AOJu0Yx8bP8U/iid9LjpEAbCtAATc1yYPDTqUolfvh+hsRMrB8VJsIe5 am3xFiezpE2r6Q6GIRkGUacItA== X-Google-Smtp-Source: AGHT+IHSgul+kLrJPi7KVcBBip8N6s20VQqyBuiCm2/3Tvx45VXiObBiCIa3Y7CQVbs50y5JTgmjXg== X-Received: by 2002:a05:6512:530:b0:4fb:772a:af12 with SMTP id o16-20020a056512053000b004fb772aaf12mr3871076lfc.21.1694684754247; Thu, 14 Sep 2023 02:45:54 -0700 (PDT) Received: from fedora.. (dh207-96-100.xnet.hr. [88.207.96.100]) by smtp.googlemail.com with ESMTPSA id e10-20020a50ec8a000000b0052565298bedsm690790edr.34.2023.09.14.02.45.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Sep 2023 02:45:53 -0700 (PDT) From: Robert Marko To: andrew@lunn.ch, gregory.clement@bootlin.com, sebastian.hesselbarth@gmail.com, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, conor+dt@kernel.org, linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: luka.perkov@sartura.hr, Robert Marko Subject: [PATCH 1/2] arm64: dts: marvell: uDPU: rename the SFP GPIO properties Date: Thu, 14 Sep 2023 11:45:00 +0200 Message-ID: <20230914094550.1519097-1-robert.marko@sartura.hr> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230914_024557_683631_8497C113 X-CRM114-Status: GOOD ( 10.84 ) 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 Rename the GPIO related SFP properties to include the preffered -gpios suffix as defined in the SFP schema. This fixes the following warning: arch/arm64/boot/dts/marvell/armada-3720-eDPU.dtb: sfp-eth1: 'los-gpio', 'mod-def0-gpio', 'tx-disable-gpio', 'tx-fault-gpio' do not match any of the regexes: 'pinctrl-[0-9]+' from schema $id: http://devicetree.org/schemas/net/sff,sfp.yaml# Signed-off-by: Robert Marko Reviewed-by: Andrew Lunn --- arch/arm64/boot/dts/marvell/armada-3720-uDPU.dtsi | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm64/boot/dts/marvell/armada-3720-uDPU.dtsi b/arch/arm64/boot/dts/marvell/armada-3720-uDPU.dtsi index 3f79923376fb..3a9b6907185d 100644 --- a/arch/arm64/boot/dts/marvell/armada-3720-uDPU.dtsi +++ b/arch/arm64/boot/dts/marvell/armada-3720-uDPU.dtsi @@ -61,10 +61,10 @@ led-alarm2 { sfp_eth1: sfp-eth1 { compatible = "sff,sfp"; i2c-bus = <&i2c1>; - los-gpio = <&gpiosb 7 GPIO_ACTIVE_HIGH>; - mod-def0-gpio = <&gpiosb 8 GPIO_ACTIVE_LOW>; - tx-disable-gpio = <&gpiosb 9 GPIO_ACTIVE_HIGH>; - tx-fault-gpio = <&gpiosb 10 GPIO_ACTIVE_HIGH>; + los-gpios = <&gpiosb 7 GPIO_ACTIVE_HIGH>; + mod-def0-gpios = <&gpiosb 8 GPIO_ACTIVE_LOW>; + tx-disable-gpios = <&gpiosb 9 GPIO_ACTIVE_HIGH>; + tx-fault-gpios = <&gpiosb 10 GPIO_ACTIVE_HIGH>; maximum-power-milliwatt = <3000>; }; }; From patchwork Thu Sep 14 09:45:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Marko X-Patchwork-Id: 13384939 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 5B13DEDE99C for ; Thu, 14 Sep 2023 09:46:29 +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=gEpAA2UcUmxvb8ErkdnYWFs1PVZdD4ePuHJKM3BlaJo=; b=sAbFRbE4qD2Ji1 S97DcBCL5T3pyYbjPQhXArjtqbqKmLk0zEkyTa1hzSv3pJiqmvDm73VoxxZMHmT2xFToEhaqokxiC F+uq+v7uco4hjgZ1o3RQaOslBXaT+nb1JaTUcLR+NchbRzP7MoAatljjfAnPJLUCb0UmOLtNvyK2c uj4Y3JU40UJs5aJHOGvW/OqEM2Ai0UIQrsUBl4SymReV73K/zB9JNqqE5G04AQcqT4tyXbYLQaehL p5Emxyb+C0sy+GWG75qYwsHvgKXvx34VMf5cJx0PoC/KKIgnvDLR7F10KDQS7PsknM9BSiucreyVp h5yaioAZt+lMigw5TMng==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qgivA-007rzp-0n; Thu, 14 Sep 2023 09:46:00 +0000 Received: from mail-ed1-x536.google.com ([2a00:1450:4864:20::536]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qgiv7-007ryi-2Q for linux-arm-kernel@lists.infradead.org; Thu, 14 Sep 2023 09:45:59 +0000 Received: by mail-ed1-x536.google.com with SMTP id 4fb4d7f45d1cf-52a1ce529fdso844606a12.1 for ; Thu, 14 Sep 2023 02:45:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sartura.hr; s=sartura; t=1694684755; x=1695289555; darn=lists.infradead.org; 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=Ulj0sxL109s6WRduuI+x9sWJvUGugBDVjc0AW8V0tV0=; b=wv/0CB0h/dj1X+TUNk5/2qh/8DNvl1vTQdeSWYWW01H1qNMKh0p6ZOHXcLcXXQCFiG XBq9NYe0YNXUPFwI5RkhkWRkiotRrALOJyBi3fY2y4gF4xL+TI6X5R8JJ1Nib0jOCjkX 37eUw1JF5D+fl8jMrVdFm7/AYMEX9OzRjoxnTC27SMOGE3YRDz8xy8JVrI+7+6qHn2t0 79vjegXMGqISiZ2AhD7ena4X0CESJGIas2BLjAyEuU98grpdD5bIqUM129pHkPgHiwIt oCL6OnnkM3jjjEJ+3cAbcLybgLBsaeufmSb6+p8RaOQEdrqdKAb41IMv5MffBjdCynU4 tNaA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694684755; x=1695289555; 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=Ulj0sxL109s6WRduuI+x9sWJvUGugBDVjc0AW8V0tV0=; b=SftivticD1MQC8sp17pBjS3M9pgscxNsA5ieX1oAqIJccNQ6nytYLt666sGsM5zGVy 99Btqm7zmUgq4QDv3V4H9sEQ9W1RHAjcUiNAEgUgnnOKcFlryLlv4yEXWqrPxRf5B2m+ whuW8hz79URS1YYtMiOv2cb8lJDAvNlkX8DHd+ZqsaFLv1gxoFknLtB65RvMWrONcU5o 2P4aUbFUU+cztLM5h2JXVChD1DF/ndptGWsL47mEZp/Nbaj8Gxg/FJleV/UNc0B/Jbll WUq+1B7SFxRGqlFtcAE8/UeMFZwkOETG21Q33rqyUcLg12RT3BDtY2XOre/qjioAwc+n svhw== X-Gm-Message-State: AOJu0YxxjnLZNoSh/u1Zn3QDmubaImOSJpGTvNApAyA8Z84udh7qMY4V 5oMljlUJnHf0WxXrMm3Sg0aW8g== X-Google-Smtp-Source: AGHT+IHUUXjR202tEyKfXygRVDaxtDSF35MAKczmRFFXZk/N71UuM9KZrB8zkt+OWbntduc9N+RLTQ== X-Received: by 2002:a05:6402:517b:b0:51d:d4c3:6858 with SMTP id d27-20020a056402517b00b0051dd4c36858mr4439955ede.12.1694684755560; Thu, 14 Sep 2023 02:45:55 -0700 (PDT) Received: from fedora.. (dh207-96-100.xnet.hr. [88.207.96.100]) by smtp.googlemail.com with ESMTPSA id e10-20020a50ec8a000000b0052565298bedsm690790edr.34.2023.09.14.02.45.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Sep 2023 02:45:55 -0700 (PDT) From: Robert Marko To: andrew@lunn.ch, gregory.clement@bootlin.com, sebastian.hesselbarth@gmail.com, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, conor+dt@kernel.org, linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: luka.perkov@sartura.hr, Robert Marko Subject: [PATCH 2/2] arm64: dts: marvell: eDPU: add support for version with external switch Date: Thu, 14 Sep 2023 11:45:01 +0200 Message-ID: <20230914094550.1519097-2-robert.marko@sartura.hr> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230914094550.1519097-1-robert.marko@sartura.hr> References: <20230914094550.1519097-1-robert.marko@sartura.hr> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230914_024557_787707_1FD6B63E X-CRM114-Status: GOOD ( 12.45 ) 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 New revision of eDPU uses an Marvell MV88E6361 switch to connect the SFP cage and G.hn IC instead of connecting them directly to the ethernet controllers. U-Boot will enable the switch node and disable the unused ethernet controller. Signed-off-by: Robert Marko Reviewed-by: Andrew Lunn --- .../boot/dts/marvell/armada-3720-eDPU.dts | 47 +++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/arch/arm64/boot/dts/marvell/armada-3720-eDPU.dts b/arch/arm64/boot/dts/marvell/armada-3720-eDPU.dts index 57fc698e55d0..d6d37a1f6f38 100644 --- a/arch/arm64/boot/dts/marvell/armada-3720-eDPU.dts +++ b/arch/arm64/boot/dts/marvell/armada-3720-eDPU.dts @@ -12,3 +12,50 @@ / { ð0 { phy-mode = "2500base-x"; }; + +/* + * External MV88E6361 switch is only available on v2 of the board. + * U-Boot will enable the MDIO bus and switch nodes. + */ +&mdio { + status = "disabled"; + pinctrl-names = "default"; + pinctrl-0 = <&smi_pins>; + + /* Actual device is MV88E6361 */ + switch: switch@0 { + compatible = "marvell,mv88e6190"; + #address-cells = <1>; + #size-cells = <0>; + reg = <0>; + status = "disabled"; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + port@0 { + reg = <0>; + label = "cpu"; + phy-mode = "2500base-x"; + managed = "in-band-status"; + ethernet = <ð0>; + }; + + port@9 { + reg = <9>; + label = "downlink"; + phy-mode = "2500base-x"; + managed = "in-band-status"; + }; + + port@a { + reg = <10>; + label = "uplink"; + phy-mode = "2500base-x"; + managed = "in-band-status"; + sfp = <&sfp_eth1>; + }; + }; + }; +};