From patchwork Mon Feb 4 17:30:40 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Moritz Fischer X-Patchwork-Id: 1036086 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=ettus.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=ettus-com.20150623.gappssmtp.com header.i=@ettus-com.20150623.gappssmtp.com header.b="hUUUihBr"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43tZW04Q8Wz9sMl for ; Tue, 5 Feb 2019 04:31:08 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728546AbfBDRbG (ORCPT ); Mon, 4 Feb 2019 12:31:06 -0500 Received: from mail-pg1-f194.google.com ([209.85.215.194]:46807 "EHLO mail-pg1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727656AbfBDRa7 (ORCPT ); Mon, 4 Feb 2019 12:30:59 -0500 Received: by mail-pg1-f194.google.com with SMTP id w7so199516pgp.13 for ; Mon, 04 Feb 2019 09:30:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ettus-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=CQIR+vQkRw03k7f92bCCQ4fkFdpX2pG/UQ43gReR3v4=; b=hUUUihBrOU63Ld/TuDFBawn3XJYBlwYLusn++lYN0EMoyw1EFSJGqb+1U6OPJruy+k X3JdQf/ELBjAk9D39XW9kV42mu4CRMpqoetJXG0UhnFQEjGSJ+FocV8cIgMljAdSJYM/ i+vCQ6a9t0LtPGM5FAp3qb/fDc7XSpjlnhkoknv2G6GgOudoDvMC1nO3SCtt6q73jGi4 thvTc04fwlK0KlYjIXj3YTmjfcRY6ODLyB40NXJ336Q5bBbysLOfHFU8/4un8u0e7oPG rndbNBH0VfTEXk9BERN5hzCaHrC60DqSW2GakD06Rp84qhhxtyGSZlvQ/8RvBHp6KxcF B+jQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=CQIR+vQkRw03k7f92bCCQ4fkFdpX2pG/UQ43gReR3v4=; b=dyxkw982aLVBv/q7Zsp9rrB4gVeTGkNh0toc/lf1rh+km7yjiVqvj3NRBANF8wbccL jLeoo6mOdJy/yrtKtfC4uaus7sn7G93SDYDhBkimw7LQWw5HuhQBJcqtGBcO+nVbDKD9 L9ibfx4SxH9t/gQdyZzPnThd+m0qdRkfi3yVQxfaGtB7EXgIBzIDr+t/xndRCNRik8Qb vvDOsUejoiVik5mP1oldH0L7S+JzXs4DnLfoZP8yu7HcXnzsw6xcAP8jWxNPydmpuS3j Vpywdhxasz1exmvYnD1D9CVllqxMwpM30Hy78KCgPuLmKNN/dgaF+ApvFh4JilDpz8Z2 xVYA== X-Gm-Message-State: AHQUAua+PLx+EXZ0Xj9/APRJxrksf0daKJrhq0mKK1WDchFYgT6gWJdC wm1/IlWw18S8iPGYI6/6chXJP8nVQlE= X-Google-Smtp-Source: AHgI3Ib4WCSRBf+WFdSunDIaUdDJOwXjIkqwp+XXCV49C6XfgX5YUHWr5DdBrMDGcvrDfqXikQ6ROw== X-Received: by 2002:a62:53c5:: with SMTP id h188mr478199pfb.190.1549301458476; Mon, 04 Feb 2019 09:30:58 -0800 (PST) Received: from localhost ([207.114.172.147]) by smtp.gmail.com with ESMTPSA id d18sm815373pfj.47.2019.02.04.09.30.57 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 04 Feb 2019 09:30:58 -0800 (PST) From: Moritz Fischer To: netdev@vger.kernel.org Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, alex.williams@ni.com, andrew@lunn.ch, robh+dt@kernel.org, davem@davemloft.net, moritz.fischer@ettus.com, Moritz Fischer Subject: [PATCH net-next 3/3] dt-bindings: net: Add fixed-link support Date: Mon, 4 Feb 2019 09:30:40 -0800 Message-Id: <20190204173040.5538-4-moritz.fischer@ettus.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190204173040.5538-1-moritz.fischer@ettus.com> References: <20190204173040.5538-1-moritz.fischer@ettus.com> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Moritz Fischer Update device-tree binding with fixed-link support. With fixed-link support the formerly required property 'phy-handle' is now optional if 'fixed-link' child is present. Signed-off-by: Moritz Fischer --- .../devicetree/bindings/net/nixge.txt | 33 ++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/net/nixge.txt b/Documentation/devicetree/bindings/net/nixge.txt index bb2929f9c64f..85d7240a9b20 100644 --- a/Documentation/devicetree/bindings/net/nixge.txt +++ b/Documentation/devicetree/bindings/net/nixge.txt @@ -12,12 +12,14 @@ Required properties: - interrupts: Should contain tx and rx interrupt - interrupt-names: Should be "rx" and "tx" - phy-mode: See ethernet.txt file in the same directory. -- phy-handle: See ethernet.txt file in the same directory. - nvmem-cells: Phandle of nvmem cell containing the MAC address - nvmem-cell-names: Should be "address" Optional properties: - mdio subnode to indicate presence of MDIO controller +- fixed-link : Assume a fixed link. See fixed-link.txt in the same directory. + Use instead of phy-handle. +- phy-handle: See ethernet.txt file in the same directory. Examples (10G generic PHY): nixge0: ethernet@40000000 { @@ -59,3 +61,32 @@ Examples (10G generic PHY, no MDIO): phy-mode = "xgmii"; phy-handle = <ðernet_phy1>; }; + +Examples (1G generic fixed-link + MDIO): + nixge0: ethernet@40000000 { + compatible = "ni,xge-enet-2.00"; + reg = <0x40000000 0x6000>; + + nvmem-cells = <ð1_addr>; + nvmem-cell-names = "address"; + + interrupts = <0 29 IRQ_TYPE_LEVEL_HIGH>, <0 30 IRQ_TYPE_LEVEL_HIGH>; + interrupt-names = "rx", "tx"; + interrupt-parent = <&intc>; + + phy-mode = "xgmii"; + + fixed-link { + speed = <1000>; + pause; + link-gpios = <&gpio0 63 GPIO_ACTIVE_HIGH>; + }; + + mdio { + ethernet_phy1: ethernet-phy@4 { + compatible = "ethernet-phy-ieee802.3-c22"; + reg = <4>; + }; + }; + + };