From patchwork Thu Apr 28 01:42:47 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "David Rivshin (Allworx)" X-Patchwork-Id: 8965181 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 8647FBF29F for ; Thu, 28 Apr 2016 01:44:57 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9BF5F2026D for ; Thu, 28 Apr 2016 01:44:56 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 713E620220 for ; Thu, 28 Apr 2016 01:44:55 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1avazC-0008C1-W1; Thu, 28 Apr 2016 01:43:23 +0000 Received: from mail-qg0-x242.google.com ([2607:f8b0:400d:c04::242]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1avazA-00089P-HK for linux-arm-kernel@lists.infradead.org; Thu, 28 Apr 2016 01:43:21 +0000 Received: by mail-qg0-x242.google.com with SMTP id f74so4516484qge.3 for ; Wed, 27 Apr 2016 18:43:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=q0cdjW3Xsbes3IojjTk4Y+UTU4TU1MgsXEwFWIbjuqI=; b=MilHYwPhCI6fTccDa7RgHPq/zh4e/X862AxgMMYk/6NlrzqyjhGlk2cpWvSPq4gubs 2rKo5Pl/cbg67t3oFZY/tehhtSH/ILBoLd3Xf6cgsiT6fVlUtypraRuRFla3KjO3pBlz yxpyKtwlEuNdC55sTRHwyTVXMU9bKOLLjz40eGEROrrTVL1Sogvj6su62sLgxxjW6BrU FjI0kHcZ0i7WSidIwy5e4gTQuxfmcXXuAJ3CEODNLUtugkffi23PQWCeF6DFoQXfXsWH 7LU1mV4kAGsq0KxfO53XKxlZh+DGTY0ydPAETvlRAhmxLXK5xDisSz9wqJQ1P00grGNE 7F8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=q0cdjW3Xsbes3IojjTk4Y+UTU4TU1MgsXEwFWIbjuqI=; b=KfptffWsK5cs2rDis40HAw3XD4hvBj2p0V6t47Hn7rCb62KbPR00oDgTKylBAbe6oi k0GLee23yJryOLH525b2Z6cHYWISa1gbgFXCDwCm0hP5JBKhiUODVNVRVDh5cDlvnDGL B/bss+2oXzruzqvKsbIyWr3bYNzGzSYlWpp+NChRTvsJDCEwTUguq0Ga2IH4byzD3+t4 YAzWT8cnK+VlsS9xtDX7N/spfWgZYtwDxvQipMxZDK5F0B56XvY88VBRBBt66VulexDz 3iYfVfs3sZ5cmyUI+RBKpPQOmEkWktcvP1zR+RtFmE7rFr3lhhmOPNyNLQYcDbN8GUKG ZyVA== X-Gm-Message-State: AOPr4FW7hqny4pXDdBtGTCaUZZICuYEvrXXYtdN8QF/NpIvum9huSOpevgP2qk+9k2AgSA== X-Received: by 10.140.248.84 with SMTP id t81mr12186750qhc.94.1461807779531; Wed, 27 Apr 2016 18:42:59 -0700 (PDT) Received: from drivshin-linux.crosskeys.inscitek.com ([24.213.148.66]) by smtp.gmail.com with ESMTPSA id d6sm2109750qkb.13.2016.04.27.18.42.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 27 Apr 2016 18:42:59 -0700 (PDT) From: "David Rivshin (Allworx)" To: netdev@vger.kernel.org, linux-omap@vger.kernel.org Subject: [PATCH net v3 4/5] dt: cpsw: phy-handle, phy_id, and fixed-link are mutually exclusive Date: Wed, 27 Apr 2016 21:42:47 -0400 Message-Id: <1461807767-4563-1-git-send-email-drivshin.allworx@gmail.com> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1461805808-4102-1-git-send-email-drivshin.allworx@gmail.com> References: <1461805808-4102-1-git-send-email-drivshin.allworx@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160427_184320_650255_4A376C6F X-CRM114-Status: GOOD ( 11.19 ) X-Spam-Score: -2.7 (--) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Markus Brunner , devicetree@vger.kernel.org, Grygorii Strashko , Mugunthan V N , Nicolas Chauvet , linux-kernel@vger.kernel.org, Andrew Goodbody , David Miller , linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-5.1 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: David Rivshin The phy-handle, phy_id, and fixed-link properties are mutually exclusive, and only one need be specified. Make this clear in the binding doc. Also mark the phy_id property as deprecated, as phy-handle should be used instead. Signed-off-by: David Rivshin Reviewed-by: Mugunthan V N Acked-by: Rob Herring --- Changes since v2 [1]: - split from previous patch 2 - marked the phy_id property as deprecated [3] - removed Rob Herring's Acked-by due to above change Changes since v1 [2]: - Rebased (no conflicts) - Added Tested-by from Nicolas Chauvet - Added Acked-by from Rob Herring for the binding change [1] http://patchwork.ozlabs.org/patch/613260/ [2] http://patchwork.ozlabs.org/patch/560324/ [3] https://lkml.org/lkml/2016/4/22/494 Documentation/devicetree/bindings/net/cpsw.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Documentation/devicetree/bindings/net/cpsw.txt b/Documentation/devicetree/bindings/net/cpsw.txt index 28a4781..0ae0649 100644 --- a/Documentation/devicetree/bindings/net/cpsw.txt +++ b/Documentation/devicetree/bindings/net/cpsw.txt @@ -41,21 +41,21 @@ Optional properties: Slave Properties: Required properties: - phy-mode : See ethernet.txt file in the same directory Optional properties: - dual_emac_res_vlan : Specifies VID to be used to segregate the ports - mac-address : See ethernet.txt file in the same directory -- phy_id : Specifies slave phy id +- phy_id : Specifies slave phy id (deprecated, use phy-handle) - phy-handle : See ethernet.txt file in the same directory Slave sub-nodes: - fixed-link : See fixed-link.txt file in the same directory - Either the property phy_id, or the sub-node - fixed-link can be specified + +Note: Exactly one of phy_id, phy-handle, or fixed-link must be specified. Note: "ti,hwmods" field is used to fetch the base address and irq resources from TI, omap hwmod data base during device registration. Future plan is to migrate hwmod data base contents into device tree blob so that, all the required data will be used from device tree dts file.