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,URIBL_BLOCKED,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 B303CC5519F for ; Mon, 16 Nov 2020 12:47:15 +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 3B34821527 for ; Mon, 16 Nov 2020 12:47:15 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="mPYHddZO"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="D1GKNNtF" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3B34821527 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=5uTeHlmhmFzDCNMnA1ynZt2GJCAL0uW6jOfoffnJ1/U=; b=mPYHddZO0tLw/5ICSQJLx3VFR tI1wDyWZqYjPoL+htqyB3uhaIkwTEzeWqIg+8UrEOzss3BFShNFTwpJFmkUTvp9h6aG9hNm9+5XT5 tU6pIdeiUoBwjoXHd2a61ymU2y/AHdu4gdr1FH4oxUKhIfHmLEP6tHkaE4kYx9ZIjzeXm9RwBtM3c 8LqfUjfUdC/GgsuFE6uU7kqTOUSjY+IAhBpjLwjVaTi3GcFYXjmObC9q7AunV7MjnHsVOkquYlRId Dce+5cpDhK9lQNe0EdnI+zATA708z/zmfR3wuWGWeCejQdolRmAsLGW8yJRzCpZXNTwRTGfD/xqEa Jyu0bo5Hw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kedYd-0006gT-5n; Mon, 16 Nov 2020 12:24:31 +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 1kedYa-0006ft-KU for linux-arm-kernel@lists.infradead.org; Mon, 16 Nov 2020 12:24:29 +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 5D39D2224B; Mon, 16 Nov 2020 12:24:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1605529467; bh=jxBUVK+wyEcShLMPWoPc8VBtuVwU4pBpaJJBTEfkQwU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=D1GKNNtFsN7/O5wIDV7ABMAYZdyFQF9mCJ/V01oBB5WJcqwu6y7bBYU1johlXE4ps DR5PQKdFmQa+4UkSnjUalSBeViNT8tDpxB7V7jM9CWNEV8byUoeoovqJF/8wns02fE o9DuStA0DSDHG8gTaEJXajetkGb88F/Btku0mOTQ= From: =?UTF-8?q?Marek=20Beh=C3=BAn?= To: Gregory CLEMENT Subject: [PATCH mvebu-dt v3.1 4/7] ARM: dts: turris-omnia: add SFP node Date: Mon, 16 Nov 2020 13:24:22 +0100 Message-Id: <20201116122422.6840-1-kabel@kernel.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201115135923.11523-5-kabel@kernel.org> References: MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201116_072428_837092_05CE60F9 X-CRM114-Status: GOOD ( 20.44 ) 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 MzAgKysrKysrKysrKysrKysrKysrLQogMSBmaWxlIGNoYW5nZWQsIDI5IGluc2VydGlvbnMoKyks IDEgZGVsZXRpb24oLSkKCmRpZmYgLS1naXQgYS9hcmNoL2FybS9ib290L2R0cy9hcm1hZGEtMzg1 LXR1cnJpcy1vbW5pYS5kdHMgYi9hcmNoL2FybS9ib290L2R0cy9hcm1hZGEtMzg1LXR1cnJpcy1v bW5pYS5kdHMKaW5kZXggN2NjZWJmN2QxNzU3Li5hZWEwN2IzNTJkMjQgMTAwNjQ0Ci0tLSBhL2Fy Y2gvYXJtL2Jvb3QvZHRzL2FybWFkYS0zODUtdHVycmlzLW9tbmlhLmR0cworKysgYi9hcmNoL2Fy bS9ib290L2R0cy9hcm1hZGEtMzg1LXR1cnJpcy1vbW5pYS5kdHMKQEAgLTgyLDYgKzgyLDI0IEBA IHBjaWVAMywwIHsKIAkJCX07CiAJCX07CiAJfTsKKworCXNmcDogc2ZwIHsKKwkJY29tcGF0aWJs ZSA9ICJzZmYsc2ZwIjsKKwkJaTJjLWJ1cyA9IDwmc2ZwX2kyYz47CisJCXR4LWZhdWx0LWdwaW9z ID0gPCZwY2F3YW4gMCBHUElPX0FDVElWRV9ISUdIPjsKKwkJdHgtZGlzYWJsZS1ncGlvcyA9IDwm cGNhd2FuIDEgR1BJT19BQ1RJVkVfSElHSD47CisJCXJhdGUtc2VsZWN0MC1ncGlvcyA9IDwmcGNh d2FuIDIgR1BJT19BQ1RJVkVfSElHSD47CisJCWxvcy1ncGlvcyA9IDwmcGNhd2FuIDMgR1BJT19B Q1RJVkVfSElHSD47CisJCW1vZC1kZWYwLWdwaW9zID0gPCZwY2F3YW4gNCBHUElPX0FDVElWRV9M T1c+OworCQltYXhpbXVtLXBvd2VyLW1pbGxpd2F0dCA9IDwzMDAwPjsKKworCQkvKgorCQkgKiBG b3Igbm93IHRoaXMgaGFzIHRvIGJlIGVuYWJsZWQgYXQgYm9vdCB0aW1lIGJ5IFUtQm9vdCB3aGVu CisJCSAqIGEgU0ZQIG1vZHVsZSBpcyBwcmVzZW50LiBSZWFkIG1vcmUgaW4gdGhlIGNvbW1lbnQg aW4gdGhlCisJCSAqIGV0aDIgbm9kZSBiZWxvdy4KKwkJICovCisJCXN0YXR1cyA9ICJkaXNhYmxl ZCI7CisJfTsKIH07CiAKICZibSB7CkBAIC0xMjYsMTAgKzE0NCwyMCBAQCBmaXhlZC1saW5rIHsK IAogLyogV0FOIHBvcnQgKi8KICZldGgyIHsKKwkvKgorCSAqIGV0aDIgaXMgY29ubmVjdGVkIHZp YSBhIG11bHRpcGxleG9yIHRvIGJvdGggdGhlIFNGUCBjYWdlIGFuZCB0bworCSAqIGV0aGVybmV0 LXBoeUAxLiBUaGUgbXVsdGlwbGV4b3Igc3dpdGNoZXMgdGhlIHNpZ25hbCB0byBTRlAgY2FnZSB3 aGVuCisJICogYSBTRlAgbW9kdWxlIGlzIHByZXNlbnQsIGFzIGRldGVybWluZWQgYnkgdGhlIG1v ZGUtZGVmMCBHUElPLgorCSAqCisJICogVW50aWwga2VybmVsIHN1cHBvcnRzIHRoaXMgY29uZmln dXJhdGlvbiBwcm9wZXJseSwgaW4gY2FzZSBTRlAgbW9kdWxlCisJICogaXMgcHJlc2VudCwgVS1C b290IGhhcyB0byBlbmFibGUgdGhlIHNmcCBub2RlIGFib3ZlLCByZW1vdmUgcGh5CisJICogaGFu ZGxlIGFuZCBhZGQgbWFuYWdlZCA9ICJpbi1iYW5kLXN0YXR1cyIgcHJvcGVydHkuCisJICovCiAJ c3RhdHVzID0gIm9rYXkiOwogCXBoeS1tb2RlID0gInNnbWlpIjsKIAlwaHkgPSA8JnBoeTE+Owog CXBoeXMgPSA8JmNvbXBoeTUgMj47CisJc2ZwID0gPCZzZnA+OwogCWJ1ZmZlci1tYW5hZ2VyID0g PCZibT47CiAJYm0scG9vbC1sb25nID0gPDI+OwogCWJtLHBvb2wtc2hvcnQgPSA8Mz47CkBAIC0x OTUsNyArMjIzLDcgQEAgaTJjQDMgewogCQkJLyogcm91dGVkIHRvIFBDSWUyIGNvbm5lY3RvciAo Q042MkEpICovCiAJCX07CiAKLQkJaTJjQDQgeworCQlzZnBfaTJjOiBpMmNANCB7CiAJCQkjYWRk cmVzcy1jZWxscyA9IDwxPjsKIAkJCSNzaXplLWNlbGxzID0gPDA+OwogCQkJcmVnID0gPDQ+Owot LSAKMi4yNi4yCgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X18KbGludXgtYXJtLWtlcm5lbCBtYWlsaW5nIGxpc3QKbGludXgtYXJtLWtlcm5lbEBsaXN0cy5p bmZyYWRlYWQub3JnCmh0dHA6Ly9saXN0cy5pbmZyYWRlYWQub3JnL21haWxtYW4vbGlzdGluZm8v bGludXgtYXJtLWtlcm5lbAo= 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,URIBL_BLOCKED,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 ACF6CC8451F for ; Mon, 16 Nov 2020 12:38:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 596F920855 for ; Mon, 16 Nov 2020 12:38:33 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="D1GKNNtF" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729459AbgKPMY2 (ORCPT ); Mon, 16 Nov 2020 07:24:28 -0500 Received: from mail.kernel.org ([198.145.29.99]:45684 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728269AbgKPMY1 (ORCPT ); Mon, 16 Nov 2020 07:24:27 -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 5D39D2224B; Mon, 16 Nov 2020 12:24:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1605529467; bh=jxBUVK+wyEcShLMPWoPc8VBtuVwU4pBpaJJBTEfkQwU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=D1GKNNtFsN7/O5wIDV7ABMAYZdyFQF9mCJ/V01oBB5WJcqwu6y7bBYU1johlXE4ps DR5PQKdFmQa+4UkSnjUalSBeViNT8tDpxB7V7jM9CWNEV8byUoeoovqJF/8wns02fE o9DuStA0DSDHG8gTaEJXajetkGb88F/Btku0mOTQ= 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.1 4/7] ARM: dts: turris-omnia: add SFP node Date: Mon, 16 Nov 2020 13:24:22 +0100 Message-Id: <20201116122422.6840-1-kabel@kernel.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201115135923.11523-5-kabel@kernel.org> References: 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 | 30 ++++++++++++++++++- 1 file changed, 29 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..aea07b352d24 100644 --- a/arch/arm/boot/dts/armada-385-turris-omnia.dts +++ b/arch/arm/boot/dts/armada-385-turris-omnia.dts @@ -82,6 +82,24 @@ 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>; + maximum-power-milliwatt = <3000>; + + /* + * 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 +144,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 +223,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