From patchwork Thu Apr 4 10:27:12 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 233705 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id EA7812C0134 for ; Thu, 4 Apr 2013 21:27:46 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759099Ab3DDK1f (ORCPT ); Thu, 4 Apr 2013 06:27:35 -0400 Received: from zmc.proxad.net ([212.27.53.206]:51599 "EHLO zmc.proxad.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759070Ab3DDK1e (ORCPT ); Thu, 4 Apr 2013 06:27:34 -0400 Received: from localhost (localhost [127.0.0.1]) by zmc.proxad.net (Postfix) with ESMTP id E8556C83825; Thu, 4 Apr 2013 12:27:32 +0200 (CEST) X-Virus-Scanned: amavisd-new at localhost Received: from zmc.proxad.net ([127.0.0.1]) by localhost (zmc.proxad.net [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id f9EbplHQRBz0; Thu, 4 Apr 2013 12:27:32 +0200 (CEST) Received: from flexo.iliad.local (freebox.vlq16.iliad.fr [213.36.7.13]) by zmc.proxad.net (Postfix) with ESMTPSA id 7906CC8350A; Thu, 4 Apr 2013 12:27:32 +0200 (CEST) From: Florian Fainelli To: davem@davemloft.net Cc: netdev@vger.kernel.org, linux-arm-kernel@lists.infradead.org, devicetree-discuss@lists.ozlabs.org, thomas.petazzoni@free-electrons.com, jm@lentin.co.uk, moinejf@free.fr, sebastian.hesselbarth@gmail.com, buytenh@wantstofly.org, andrew@lunn.ch, jason@lakedaemon.net, grant.likely@secretlab.ca, rob.herring@calxeda.com, jogo@openwrt.org, Florian Fainelli Subject: [PATCH 2/5] mv643xx_eth: update Device Tree bindings documentation Date: Thu, 4 Apr 2013 12:27:12 +0200 Message-Id: <1365071235-11611-3-git-send-email-florian@openwrt.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1365071235-11611-1-git-send-email-florian@openwrt.org> References: <1365071235-11611-1-git-send-email-florian@openwrt.org> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This patch updates the Device Tree bindings documentation for the Marvell MV643xx ethernet controller node and makes the "local-mac-address" and "phy" properties optional instead of required. The absence of a "phy" node is legal and describes a MAC to switch configuration, while not specifying the "local-mac-address" allows for reuse of the MAC address already programmed into the Ethernet controller. Signed-off-by: Florian Fainelli --- Documentation/devicetree/bindings/marvell.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/devicetree/bindings/marvell.txt b/Documentation/devicetree/bindings/marvell.txt index e70a013..994b933 100644 --- a/Documentation/devicetree/bindings/marvell.txt +++ b/Documentation/devicetree/bindings/marvell.txt @@ -141,11 +141,11 @@ prefixed with the string "marvell,", for Marvell Technology Group Ltd. - interrupts : where a is the interrupt number for the port. - interrupt-parent : the phandle for the interrupt controller that services interrupts for this device. + + Optional properties: - phy : the phandle for the PHY connected to this ethernet controller. - local-mac-address : 6 bytes, MAC address - - Optional properties: - clocks : Phandle to the clock control device and gate bit - clock-names : String describing the clock gate bit - speed : Speed to force the link (10, 100, 1000), used when no