Received: by 10.192.165.148 with SMTP id m20csp81225imm; Fri, 4 May 2018 07:02:38 -0700 (PDT) X-Google-Smtp-Source: AB8JxZr2LHAs+L29630m46ftZ+waPhCbLkOOdqG+QjhsuWJ7xwfp6a+2fGGqhWrc4SeCySa2nknD X-Received: by 2002:a65:628a:: with SMTP id f10-v6mr22529348pgv.6.1525442558216; Fri, 04 May 2018 07:02:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1525442557; cv=none; d=google.com; s=arc-20160816; b=RtnT1yONsEHjgjQnExy63On7fBZ98BonAcUWe6ChQitFxTtk41xVfBfV0AzMGeeV69 0SxgzFx4cCTj6skAijquUDS0a6wHsK4MillTi5+29vldWgMtMlf5zba/Ez16MV8RtLKF yg4h+JRA6+9E/YXyO9EQ1AYU97Tn6AXUHqMh2wuY8QumNtqbqqfeDJgkHfW8PA3r+gs9 Zv0SyX1CFaJxAxc4DQcssvReUh3iOntdNPjSMyerJ4q23BRs2VMSyj/+GjGCOHceBAWm Wphjj5lkHgMTNLGbelPUfNc4CUHXUQp55XZiVD2QGGa0Av7KoxBE8IRNXvY/fWyim3jy YMPA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=a/lDXKRV1k5IYH6U4CrFa/yHlZp4soTiyAIJxpSefkg=; b=d+jS/TdUQTLgPY6bKh5AreAJGG+JQ+fpzV33GZjP18dYlDO3pgvw1Ai3HItM9A4G9v YZPXE3H60bbNEYWMlbWP1TPto9z7rArJe9c5N0JNKt1TtrfX4XjotD0scJcLSj0RRs9m HoTxLiqQQU3cOOrjuSQGiP7Hc+l8hitnTVIJB813zfUEs6ewB4eeCzoFYawGo5Wq9bdP vm0H31uObrTFEdLO+gzlZmaTaWdf59OlZ0gO9SjKrW93Ij+pitvQXAFOzuM2xI6R06Iu INOzpvXmLcq9WirLPtd7n/bLK/9F6W7ACE6Ok/R4E/Q6StidwZGTMGj4ZbXPGowH4O1H zbjw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id q17si133022pff.301.2018.05.04.07.02.21; Fri, 04 May 2018 07:02:37 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752083AbeEDOA0 (ORCPT + 99 others); Fri, 4 May 2018 10:00:26 -0400 Received: from mail.bootlin.com ([62.4.15.54]:60513 "EHLO mail.bootlin.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751572AbeEDOAX (ORCPT ); Fri, 4 May 2018 10:00:23 -0400 Received: by mail.bootlin.com (Postfix, from userid 110) id 696DF207CC; Fri, 4 May 2018 16:00:21 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mail.bootlin.com X-Spam-Level: X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,SHORTCIRCUIT, URIBL_BLOCKED shortcircuit=ham autolearn=disabled version=3.4.0 Received: from localhost (LStLambert-657-1-97-87.w90-63.abo.wanadoo.fr [90.63.216.87]) by mail.bootlin.com (Postfix) with ESMTPSA id E22AA20A2D; Fri, 4 May 2018 16:00:05 +0200 (CEST) From: Antoine Tenart To: davem@davemloft.net, kishon@ti.com, linux@armlinux.org.uk, gregory.clement@bootlin.com, andrew@lunn.ch, jason@lakedaemon.net, sebastian.hesselbarth@gmail.com Cc: Antoine Tenart , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, thomas.petazzoni@bootlin.com, maxime.chevallier@bootlin.com, miquel.raynal@bootlin.com, nadavh@marvell.com, stefanc@marvell.com, ymarkman@marvell.com, mw@semihalf.com, linux-arm-kernel@lists.infradead.org Subject: [PATCH net-next v2 11/13] arm64: dts: marvell: mcbin: enable the fourth network interface Date: Fri, 4 May 2018 15:56:41 +0200 Message-Id: <20180504135643.23466-12-antoine.tenart@bootlin.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180504135643.23466-1-antoine.tenart@bootlin.com> References: <20180504135643.23466-1-antoine.tenart@bootlin.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This patch enables the fourth network interface on the Marvell Macchiatobin. It is configured in the 2500Base-X PHY mode. The SFP cage is also described. Signed-off-by: Antoine Tenart --- .../boot/dts/marvell/armada-8040-mcbin.dts | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts b/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts index eaa67de8c2bb..a66958ff4de6 100644 --- a/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts +++ b/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts @@ -27,6 +27,7 @@ ethernet0 = &cp0_eth0; ethernet1 = &cp1_eth0; ethernet2 = &cp1_eth1; + ethernet3 = &cp1_eth2; }; /* Regulator labels correspond with schematics */ @@ -88,6 +89,18 @@ pinctrl-names = "default"; pinctrl-0 = <&cp1_sfpp1_pins &cp0_sfpp1_pins>; }; + + sfp_eth3: sfp-eth3 { + /* CON3,4 - CPS lane 5 */ + compatible = "sff,sfp"; + i2c-bus = <&sfp_1g_i2c>; + los-gpio = <&cp0_gpio2 22 GPIO_ACTIVE_HIGH>; + mod-def0-gpio = <&cp0_gpio2 21 GPIO_ACTIVE_LOW>; + tx-disable-gpio = <&cp1_gpio1 24 GPIO_ACTIVE_HIGH>; + tx-fault-gpio = <&cp0_gpio2 19 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&cp0_sfp_1g_pins &cp1_sfp_1g_pins>; + }; }; &uart0 { @@ -195,6 +208,10 @@ marvell,pins = "mpp47"; marvell,function = "gpio"; }; + cp0_sfp_1g_pins: sfp-1g-pins { + marvell,pins = "mpp51", "mpp53", "mpp54"; + marvell,function = "gpio"; + }; cp0_pcie_pins: pcie-pins { marvell,pins = "mpp52"; marvell,function = "gpio"; @@ -287,6 +304,17 @@ phys = <&cp1_comphy0 1>; }; +&cp1_eth2 { + /* CPS Lane 5 */ + status = "okay"; + /* Network PHY */ + phy-mode = "2500base-x"; + managed = "in-band-status"; + /* Generic PHY, providing serdes lanes */ + phys = <&cp1_comphy5 2>; + sfp = <&sfp_eth3>; +}; + &cp1_pinctrl { cp1_sfpp1_pins: sfpp1-pins { marvell,pins = "mpp8", "mpp10", "mpp11"; @@ -300,6 +328,10 @@ marvell,pins = "mpp6", "mpp7"; marvell,function = "uart0"; }; + cp1_sfp_1g_pins: sfp-1g-pins { + marvell,pins = "mpp24"; + marvell,function = "gpio"; + }; cp1_sfpp0_pins: sfpp0-pins { marvell,pins = "mpp26", "mpp27", "mpp28", "mpp29"; marvell,function = "gpio"; -- 2.17.0