From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E8808C2D0E4 for ; Sun, 15 Nov 2020 14:00:37 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 9D3C322447 for ; Sun, 15 Nov 2020 14:00:37 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="S+uVv+j6"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="QvNjKjre" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9D3C322447 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=8U0rHa9tdy09AcZMZzCM2hQXg/O3+xqOZ4Laed0wmNw=; b=S+uVv+j6dSAKQiTbAOuydOGl3 TvlND0476/ZP/xKDYvIXgU8VgUavmJrxyECus0uRuX95UyYGiG0bzgQFUTZVFH1nQz5fHyJEuU4Bp Ni5zgOOmZ0HqZ1PJCVCns+Zqg5JUBQl9gzXoGLlWuYNFJ/gmubSlcv23ugMa2SQvAHkG4QunN2fTJ bvdoT/7kC0kDVX8PBSKxplVoLukZpqbGx4uJXRiCt8CHEklscdab62ng9HMXN03uFGNrLuco+BVCR u0aAb9wZYMpPwPFSu+4pE5xACxLUv2214zLcbhOXPgIBSCdxlh/sflCTgJ4iH9cXavQZL9iLViR4D iPnpLOeXQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1keIZH-0005T5-SH; Sun, 15 Nov 2020 13:59:47 +0000 Received: from mail.kernel.org ([198.145.29.99]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1keIZ7-0005RC-9F for linux-arm-kernel@lists.infradead.org; Sun, 15 Nov 2020 13:59:38 +0000 Received: from dellmb.labs.office.nic.cz (nat-1.nic.cz [217.31.205.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 9ADD52344C; Sun, 15 Nov 2020 13:59:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1605448776; bh=we+yyfWYBsb/xAQlgmkzu6Pex8YwPIxVvTjuJiK+Cxk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QvNjKjrezF0D7+LBGnPnx2gtV5HOcM67f1xKlRsxQ5U2D2qgBZXaYWUVS6sR0uDi2 7wb2Jy+khGh24i4dd5eQUZm8rnoipwpSahrQ+8nsl3u0bza7IshybEDRmUgqSPrv1M SskyNyve0UZkUnKx+Ocf2P2IuzlrfBxwDKuD02js= From: =?UTF-8?q?Marek=20Beh=C3=BAn?= To: Gregory CLEMENT Subject: [PATCH mvebu-dt v3 4/7] ARM: dts: turris-omnia: add SFP node Date: Sun, 15 Nov 2020 14:59:20 +0100 Message-Id: <20201115135923.11523-5-kabel@kernel.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201115135923.11523-1-kabel@kernel.org> References: <20201115135923.11523-1-kabel@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201115_085937_510061_589FE819 X-CRM114-Status: GOOD ( 20.74 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Marek=20Beh=C3=BAn?= , Andrew Lunn , Jason Cooper , =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= , devicetree@vger.kernel.org, Russell King - ARM Linux admin , Rob Herring , arm@kernel.org, =?UTF-8?q?Andreas=20F=C3=A4rber?= , linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org VHVycmlzIE9tbmlhIGhhcyBhbiBTRlAgY2FnZSB0aGF0LCB0b2dldGhlciB3aXRoIFdBTiBQSFks IGlzIGNvbm5lY3RlZAp0byBldGgyIFNlckRlcyB2aWEgYSBTZXJEZXMgbXVsdGlwbGV4b3IuIFdo ZW4gYSBTRlAgbW9kdWxlIGlzIHByZXNlbnQsCnRoZSBtdWx0aXBsZXhvciBzd2l0Y2hlcyB0aGUg U2VyRGVzIHNpZ25hbCBmcm9tIFBIWSB0byBTRlAuCgpEZXNjcmliZSB0aGUgU0ZQIGNhZ2UsIGJ1 dCBsZWF2ZSBpdCBkaXNhYmxlZC4gVW50aWwgcGh5bGluayBoYXMgc3VwcG9ydApmb3Igc3VjaCBj b25maWd1cmF0aW9uLCB3ZSBhcmUgbGVhdmluZyBpdCB0byBVLUJvb3QgdG8gZW5hYmxlIFNGUCBh bmQKZGlzYWJsZSBXQU4gUEhZIGF0IGJvb3QgdGltZSBkZXBlbmRpbmcgb24gd2hldGhlciBhIFNG UCBtb2R1bGUgaXMKcHJlc2VudC4KClNpZ25lZC1vZmYtYnk6IE1hcmVrIEJlaMO6biA8a2FiZWxA a2VybmVsLm9yZz4KRml4ZXM6IDI2Y2E4YjUyZDZlMSAoIkFSTTogZHRzOiBhZGQgc3VwcG9ydCBm b3IgVHVycmlzIE9tbmlhIikKUmV2aWV3ZWQtYnk6IEFuZHJldyBMdW5uIDxhbmRyZXdAbHVubi5j aD4KQ2M6IFJ1c3NlbGwgS2luZyAtIEFSTSBMaW51eCBhZG1pbiA8bGludXhAYXJtbGludXgub3Jn LnVrPgpDYzogbGludXgtYXJtLWtlcm5lbEBsaXN0cy5pbmZyYWRlYWQub3JnCkNjOiBVd2UgS2xl aW5lLUvDtm5pZyA8dXdlQGtsZWluZS1rb2VuaWcub3JnPgpDYzogSmFzb24gQ29vcGVyIDxqYXNv bkBsYWtlZGFlbW9uLm5ldD4KQ2M6IEdyZWdvcnkgQ0xFTUVOVCA8Z3JlZ29yeS5jbGVtZW50QGJv b3RsaW4uY29tPgpDYzogQW5kcmVhcyBGw6RyYmVyIDxhZmFlcmJlckBzdXNlLmRlPgpDYzogUm9i IEhlcnJpbmcgPHJvYmgrZHRAa2VybmVsLm9yZz4KQ2M6IGRldmljZXRyZWVAdmdlci5rZXJuZWwu b3JnCi0tLQogYXJjaC9hcm0vYm9vdC9kdHMvYXJtYWRhLTM4NS10dXJyaXMtb21uaWEuZHRzIHwg MjkgKysrKysrKysrKysrKysrKysrLQogMSBmaWxlIGNoYW5nZWQsIDI4IGluc2VydGlvbnMoKyks IDEgZGVsZXRpb24oLSkKCmRpZmYgLS1naXQgYS9hcmNoL2FybS9ib290L2R0cy9hcm1hZGEtMzg1 LXR1cnJpcy1vbW5pYS5kdHMgYi9hcmNoL2FybS9ib290L2R0cy9hcm1hZGEtMzg1LXR1cnJpcy1v bW5pYS5kdHMKaW5kZXggN2NjZWJmN2QxNzU3Li5mNzQ5ODU0M2M5YWQgMTAwNjQ0Ci0tLSBhL2Fy Y2gvYXJtL2Jvb3QvZHRzL2FybWFkYS0zODUtdHVycmlzLW9tbmlhLmR0cworKysgYi9hcmNoL2Fy bS9ib290L2R0cy9hcm1hZGEtMzg1LXR1cnJpcy1vbW5pYS5kdHMKQEAgLTgyLDYgKzgyLDIzIEBA IHBjaWVAMywwIHsKIAkJCX07CiAJCX07CiAJfTsKKworCXNmcDogc2ZwIHsKKwkJY29tcGF0aWJs ZSA9ICJzZmYsc2ZwIjsKKwkJaTJjLWJ1cyA9IDwmc2ZwX2kyYz47CisJCXR4LWZhdWx0LWdwaW9z ID0gPCZwY2F3YW4gMCBHUElPX0FDVElWRV9ISUdIPjsKKwkJdHgtZGlzYWJsZS1ncGlvcyA9IDwm cGNhd2FuIDEgR1BJT19BQ1RJVkVfSElHSD47CisJCXJhdGUtc2VsZWN0MC1ncGlvcyA9IDwmcGNh d2FuIDIgR1BJT19BQ1RJVkVfSElHSD47CisJCWxvcy1ncGlvcyA9IDwmcGNhd2FuIDMgR1BJT19B Q1RJVkVfSElHSD47CisJCW1vZC1kZWYwLWdwaW9zID0gPCZwY2F3YW4gNCBHUElPX0FDVElWRV9M T1c+OworCisJCS8qCisJCSAqIEZvciBub3cgdGhpcyBoYXMgdG8gYmUgZW5hYmxlZCBhdCBib290 IHRpbWUgYnkgVS1Cb290IHdoZW4KKwkJICogYSBTRlAgbW9kdWxlIGlzIHByZXNlbnQuIFJlYWQg bW9yZSBpbiB0aGUgY29tbWVudCBpbiB0aGUKKwkJICogZXRoMiBub2RlIGJlbG93LgorCQkgKi8K KwkJc3RhdHVzID0gImRpc2FibGVkIjsKKwl9OwogfTsKIAogJmJtIHsKQEAgLTEyNiwxMCArMTQz LDIwIEBAIGZpeGVkLWxpbmsgewogCiAvKiBXQU4gcG9ydCAqLwogJmV0aDIgeworCS8qCisJICog ZXRoMiBpcyBjb25uZWN0ZWQgdmlhIGEgbXVsdGlwbGV4b3IgdG8gYm90aCB0aGUgU0ZQIGNhZ2Ug YW5kIHRvCisJICogZXRoZXJuZXQtcGh5QDEuIFRoZSBtdWx0aXBsZXhvciBzd2l0Y2hlcyB0aGUg c2lnbmFsIHRvIFNGUCBjYWdlIHdoZW4KKwkgKiBhIFNGUCBtb2R1bGUgaXMgcHJlc2VudCwgYXMg ZGV0ZXJtaW5lZCBieSB0aGUgbW9kZS1kZWYwIEdQSU8uCisJICoKKwkgKiBVbnRpbCBrZXJuZWwg c3VwcG9ydHMgdGhpcyBjb25maWd1cmF0aW9uIHByb3Blcmx5LCBpbiBjYXNlIFNGUCBtb2R1bGUK KwkgKiBpcyBwcmVzZW50LCBVLUJvb3QgaGFzIHRvIGVuYWJsZSB0aGUgc2ZwIG5vZGUgYWJvdmUs IHJlbW92ZSBwaHkKKwkgKiBoYW5kbGUgYW5kIGFkZCBtYW5hZ2VkID0gImluLWJhbmQtc3RhdHVz IiBwcm9wZXJ0eS4KKwkgKi8KIAlzdGF0dXMgPSAib2theSI7CiAJcGh5LW1vZGUgPSAic2dtaWki OwogCXBoeSA9IDwmcGh5MT47CiAJcGh5cyA9IDwmY29tcGh5NSAyPjsKKwlzZnAgPSA8JnNmcD47 CiAJYnVmZmVyLW1hbmFnZXIgPSA8JmJtPjsKIAlibSxwb29sLWxvbmcgPSA8Mj47CiAJYm0scG9v bC1zaG9ydCA9IDwzPjsKQEAgLTE5NSw3ICsyMjIsNyBAQCBpMmNAMyB7CiAJCQkvKiByb3V0ZWQg dG8gUENJZTIgY29ubmVjdG9yIChDTjYyQSkgKi8KIAkJfTsKIAotCQlpMmNANCB7CisJCXNmcF9p MmM6IGkyY0A0IHsKIAkJCSNhZGRyZXNzLWNlbGxzID0gPDE+OwogCQkJI3NpemUtY2VsbHMgPSA8 MD47CiAJCQlyZWcgPSA8ND47Ci0tIAoyLjI2LjIKCgpfX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fXwpsaW51eC1hcm0ta2VybmVsIG1haWxpbmcgbGlzdApsaW51 eC1hcm0ta2VybmVsQGxpc3RzLmluZnJhZGVhZC5vcmcKaHR0cDovL2xpc3RzLmluZnJhZGVhZC5v cmcvbWFpbG1hbi9saXN0aW5mby9saW51eC1hcm0ta2VybmVsCg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 314A6C63777 for ; Sun, 15 Nov 2020 13:59:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E70B32344C for ; Sun, 15 Nov 2020 13:59:49 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="QvNjKjre" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727174AbgKON7h (ORCPT ); Sun, 15 Nov 2020 08:59:37 -0500 Received: from mail.kernel.org ([198.145.29.99]:40660 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726743AbgKON7h (ORCPT ); Sun, 15 Nov 2020 08:59:37 -0500 Received: from dellmb.labs.office.nic.cz (nat-1.nic.cz [217.31.205.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 9ADD52344C; Sun, 15 Nov 2020 13:59:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1605448776; bh=we+yyfWYBsb/xAQlgmkzu6Pex8YwPIxVvTjuJiK+Cxk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QvNjKjrezF0D7+LBGnPnx2gtV5HOcM67f1xKlRsxQ5U2D2qgBZXaYWUVS6sR0uDi2 7wb2Jy+khGh24i4dd5eQUZm8rnoipwpSahrQ+8nsl3u0bza7IshybEDRmUgqSPrv1M SskyNyve0UZkUnKx+Ocf2P2IuzlrfBxwDKuD02js= From: =?UTF-8?q?Marek=20Beh=C3=BAn?= To: Gregory CLEMENT Cc: arm@kernel.org, =?UTF-8?q?Marek=20Beh=C3=BAn?= , Andrew Lunn , Russell King - ARM Linux admin , linux-arm-kernel@lists.infradead.org, =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= , Jason Cooper , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Rob Herring , devicetree@vger.kernel.org Subject: [PATCH mvebu-dt v3 4/7] ARM: dts: turris-omnia: add SFP node Date: Sun, 15 Nov 2020 14:59:20 +0100 Message-Id: <20201115135923.11523-5-kabel@kernel.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201115135923.11523-1-kabel@kernel.org> References: <20201115135923.11523-1-kabel@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Turris Omnia has an SFP cage that, together with WAN PHY, is connected to eth2 SerDes via a SerDes multiplexor. When a SFP module is present, the multiplexor switches the SerDes signal from PHY to SFP. Describe the SFP cage, but leave it disabled. Until phylink has support for such configuration, we are leaving it to U-Boot to enable SFP and disable WAN PHY at boot time depending on whether a SFP module is present. Signed-off-by: Marek Behún Fixes: 26ca8b52d6e1 ("ARM: dts: add support for Turris Omnia") Reviewed-by: Andrew Lunn Cc: Russell King - ARM Linux admin Cc: linux-arm-kernel@lists.infradead.org Cc: Uwe Kleine-König Cc: Jason Cooper Cc: Gregory CLEMENT Cc: Andreas Färber Cc: Rob Herring Cc: devicetree@vger.kernel.org --- arch/arm/boot/dts/armada-385-turris-omnia.dts | 29 ++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/armada-385-turris-omnia.dts b/arch/arm/boot/dts/armada-385-turris-omnia.dts index 7ccebf7d1757..f7498543c9ad 100644 --- a/arch/arm/boot/dts/armada-385-turris-omnia.dts +++ b/arch/arm/boot/dts/armada-385-turris-omnia.dts @@ -82,6 +82,23 @@ pcie@3,0 { }; }; }; + + sfp: sfp { + compatible = "sff,sfp"; + i2c-bus = <&sfp_i2c>; + tx-fault-gpios = <&pcawan 0 GPIO_ACTIVE_HIGH>; + tx-disable-gpios = <&pcawan 1 GPIO_ACTIVE_HIGH>; + rate-select0-gpios = <&pcawan 2 GPIO_ACTIVE_HIGH>; + los-gpios = <&pcawan 3 GPIO_ACTIVE_HIGH>; + mod-def0-gpios = <&pcawan 4 GPIO_ACTIVE_LOW>; + + /* + * For now this has to be enabled at boot time by U-Boot when + * a SFP module is present. Read more in the comment in the + * eth2 node below. + */ + status = "disabled"; + }; }; &bm { @@ -126,10 +143,20 @@ fixed-link { /* WAN port */ ð2 { + /* + * eth2 is connected via a multiplexor to both the SFP cage and to + * ethernet-phy@1. The multiplexor switches the signal to SFP cage when + * a SFP module is present, as determined by the mode-def0 GPIO. + * + * Until kernel supports this configuration properly, in case SFP module + * is present, U-Boot has to enable the sfp node above, remove phy + * handle and add managed = "in-band-status" property. + */ status = "okay"; phy-mode = "sgmii"; phy = <&phy1>; phys = <&comphy5 2>; + sfp = <&sfp>; buffer-manager = <&bm>; bm,pool-long = <2>; bm,pool-short = <3>; @@ -195,7 +222,7 @@ i2c@3 { /* routed to PCIe2 connector (CN62A) */ }; - i2c@4 { + sfp_i2c: i2c@4 { #address-cells = <1>; #size-cells = <0>; reg = <4>; -- 2.26.2