From patchwork Wed Dec 18 16:47:20 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Pargmann X-Patchwork-Id: 3370851 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.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id B8CC8C0D4A for ; Wed, 18 Dec 2013 16:50:39 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5857D2057E for ; Wed, 18 Dec 2013 16:50:38 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 17EC12057F for ; Wed, 18 Dec 2013 16:50:34 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VtKJ8-000493-Ta; Wed, 18 Dec 2013 16:49:15 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VtKIp-0003eN-Me; Wed, 18 Dec 2013 16:48:55 +0000 Received: from metis.ext.pengutronix.de ([2001:6f8:1178:4:290:27ff:fe1d:cc33]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VtKIS-0003YX-DK for linux-arm-kernel@lists.infradead.org; Wed, 18 Dec 2013 16:48:35 +0000 Received: from dude.hi.pengutronix.de ([2001:6f8:1178:2:21e:67ff:fe11:9c5c]) by metis.ext.pengutronix.de with esmtp (Exim 4.72) (envelope-from ) id 1VtKHc-0006Qi-6T; Wed, 18 Dec 2013 17:47:40 +0100 Received: from mpa by dude.hi.pengutronix.de with local (Exim 4.82) (envelope-from ) id 1VtKHY-00043f-I4; Wed, 18 Dec 2013 17:47:36 +0100 From: Markus Pargmann To: "David S. Miller" , =?UTF-8?q?Beno=C3=AEt=20Cousson?= Subject: [PATCH 4/6] net: cpsw: Use cpsw-ctrl-macid driver Date: Wed, 18 Dec 2013 17:47:20 +0100 Message-Id: <1387385242-1161-5-git-send-email-mpa@pengutronix.de> X-Mailer: git-send-email 1.8.5.1 In-Reply-To: <1387385242-1161-1-git-send-email-mpa@pengutronix.de> References: <1387385242-1161-1-git-send-email-mpa@pengutronix.de> X-SA-Exim-Connect-IP: 2001:6f8:1178:2:21e:67ff:fe11:9c5c X-SA-Exim-Mail-From: mpa@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-arm-kernel@lists.infradead.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20131218_114833_004272_255A413D X-CRM114-Status: GOOD ( 17.49 ) X-Spam-Score: -2.4 (--) Cc: Markus Pargmann , devicetree@vger.kernel.org, linux-omap@vger.kernel.org, kernel@pengutronix.de, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , 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=-4.7 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, 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 Use ctrl-macid driver to obtain the macids stored in the processor. This is only done when defined in DT. Signed-off-by: Markus Pargmann --- Documentation/devicetree/bindings/net/cpsw.txt | 5 +++++ drivers/net/ethernet/ti/cpsw.c | 18 ++++++++++++++---- drivers/net/ethernet/ti/cpsw.h | 2 ++ 3 files changed, 21 insertions(+), 4 deletions(-) diff --git a/Documentation/devicetree/bindings/net/cpsw.txt b/Documentation/devicetree/bindings/net/cpsw.txt index c39f077..b95c38b 100644 --- a/Documentation/devicetree/bindings/net/cpsw.txt +++ b/Documentation/devicetree/bindings/net/cpsw.txt @@ -34,6 +34,11 @@ Required properties: Optional properties: - dual_emac_res_vlan : Specifies VID to be used to segregate the ports - mac-address : Specifies slave MAC address +- ti,mac-address-ctrl : When cpsw-ctrl-macid support is compiledin, this can + be set to a phandle with one argument, see + cpsw-ctrl-macid.txt. If this method fails, cpsw falls + back to mac-address or random mac-address. + Note: "ti,hwmods" field is used to fetch the base address and irq resources from TI, omap hwmod data base during device registration. diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c index 5120d9c..382d793 100644 --- a/drivers/net/ethernet/ti/cpsw.c +++ b/drivers/net/ethernet/ti/cpsw.c @@ -1804,9 +1804,16 @@ static int cpsw_probe_dt(struct cpsw_platform_data *data, snprintf(slave_data->phy_id, sizeof(slave_data->phy_id), PHY_ID_FMT, mdio->name, phyid); - mac_addr = of_get_mac_address(slave_node); - if (mac_addr) - memcpy(slave_data->mac_addr, mac_addr, ETH_ALEN); + ret = cpsw_ctrl_macid_read(slave_node, slave_data->mac_addr); + if (ret) { + if (ret == -EPROBE_DEFER) + return ret; + + mac_addr = of_get_mac_address(slave_node); + if (mac_addr) + memcpy(slave_data->mac_addr, mac_addr, + ETH_ALEN); + } slave_data->phy_if = of_get_phy_mode(slave_node); @@ -1946,10 +1953,13 @@ static int cpsw_probe(struct platform_device *pdev) /* Select default pin state */ pinctrl_pm_select_default_state(&pdev->dev); - if (cpsw_probe_dt(&priv->data, pdev)) { + ret = cpsw_probe_dt(&priv->data, pdev); + if (ret == -EINVAL) { pr_err("cpsw: platform data missing\n"); ret = -ENODEV; goto clean_runtime_disable_ret; + } else if (ret) { + goto clean_runtime_disable_ret; } data = &priv->data; diff --git a/drivers/net/ethernet/ti/cpsw.h b/drivers/net/ethernet/ti/cpsw.h index 1b71067..222eebe 100644 --- a/drivers/net/ethernet/ti/cpsw.h +++ b/drivers/net/ethernet/ti/cpsw.h @@ -42,4 +42,6 @@ struct cpsw_platform_data { void cpsw_phy_sel(struct device *dev, phy_interface_t phy_mode, int slave); +int cpsw_ctrl_macid_read(struct device_node *np, u8 *mac_addr); + #endif /* __CPSW_H__ */