From patchwork Tue Oct 4 07:32:50 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Madalin Bucur X-Patchwork-Id: 677946 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3sp9ms6Yf4z9ryn for ; Tue, 4 Oct 2016 18:40:13 +1100 (AEDT) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3sp9ms5Z5MzDvXj for ; Tue, 4 Oct 2016 18:40:13 +1100 (AEDT) X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Received: from NAM02-SN1-obe.outbound.protection.outlook.com (mail-sn1nam02on0088.outbound.protection.outlook.com [104.47.36.88]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3sp9cq5VfzzDrP6 for ; Tue, 4 Oct 2016 18:33:15 +1100 (AEDT) Received: from BLUPR0301CA0023.namprd03.prod.outlook.com (10.162.113.161) by BY2PR0301MB2006.namprd03.prod.outlook.com (10.163.196.28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.649.16; Tue, 4 Oct 2016 07:33:11 +0000 Received: from BN1BFFO11FD039.protection.gbl (2a01:111:f400:7c10::1:164) by BLUPR0301CA0023.outlook.office365.com (2a01:111:e400:5259::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.649.16 via Frontend Transport; Tue, 4 Oct 2016 07:33:11 +0000 Authentication-Results: spf=fail (sender IP is 192.88.158.2) smtp.mailfrom=nxp.com; gmail.com; dkim=none (message not signed) header.d=none; gmail.com; dmarc=fail action=none header.from=nxp.com; Received-SPF: Fail (protection.outlook.com: domain of nxp.com does not designate 192.88.158.2 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.158.2; helo=az84smr01.freescale.net; Received: from az84smr01.freescale.net (192.88.158.2) by BN1BFFO11FD039.mail.protection.outlook.com (10.58.144.102) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.629.5 via Frontend Transport; Tue, 4 Oct 2016 07:33:08 +0000 Received: from fsr-fed2164-101.ea.freescale.net (fsr-fed2164-101.ea.freescale.net [10.171.73.197]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id u947WxJ1022632; Tue, 4 Oct 2016 00:33:06 -0700 From: Madalin Bucur To: Subject: [net-next 04/13] fsl/fman: use of_get_phy_mode() Date: Tue, 4 Oct 2016 10:32:50 +0300 Message-ID: <1475566379-5078-5-git-send-email-madalin.bucur@nxp.com> X-Mailer: git-send-email 1.8.2.3 In-Reply-To: <1475566379-5078-1-git-send-email-madalin.bucur@nxp.com> References: <1475566379-5078-1-git-send-email-madalin.bucur@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131200399907016818; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.158.2; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(7916002)(2980300002)(1109001)(1110001)(339900001)(199003)(189002)(2351001)(106466001)(356003)(8936002)(33646002)(104016004)(229853001)(11100500001)(87936001)(86362001)(85426001)(5003940100001)(68736007)(4720700002)(36756003)(6666003)(81166006)(105606002)(305945005)(69596002)(3450700001)(50226002)(8676002)(81156014)(6916009)(77096005)(2950100002)(7846002)(19580395003)(19580405001)(4326007)(43066003)(110136003)(189998001)(47776003)(2906002)(50466002)(48376002)(626004)(50986999)(53806999)(586003)(76176999)(97736004)(5660300001); DIR:OUT; SFP:1101; SCL:1; SRVR:BY2PR0301MB2006; H:az84smr01.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1BFFO11FD039; 1:DdOcLI1dDyja0LAYHbWQhxFsiAkxaX4tW+YgF1n5oPPr+8ap6J65vlWQb+S4x+kGozN6xN5FvKUNZxMtWXJ2xCVisXs3cwXwkLlJqZm0KZR402tONH2Kzqx9j6zOSytUQfxR7THD9pam7mMVISCC3lBYu5fPSOcUvFvlL+kXnfuU13yl9XZgay1YsnqJ5lUMBPgp2VhW0CQIj9gEd2N3KMTtwS9k3xhQ8SYRLNgLsd+fPqdesIFC3KjHfYtdgdwxeeLqV+wQjtutUYgvmA45yUjxooSPmBIG85s+Dnlr9o0khnuxs6nlKY7IxBWSeUuBRRmkfPocMY9fi1L8VmVjud9YVssqEhx5Xa/uKZ9KAfzCqGWJmR2Zwl/ZVdzyL/GZGlXfZrg8byUfzYx/nsMycRe+HF0MEV/BFfo7mENJv+LzsCPCdRXzxzcy5YyLyqXzF1lwco8JSXst4xRMBKkmtz7VobjaH+lfW6F6ii5NBt2qc4cSwxjuoBuIuZYOpCZDl4YzgU39T02HShACjcSqCz3EnyupuRYJEYKOd20dCOQVfLWmpS1RmAGxzsGL0gqHJdl2w7isRKkpkSy4zbewZQBhOlsJvzLSOd35GH/lLLQk2LUh8e2wG4uW2sGNuxZv MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: b1693e89-bcf3-4ed3-d072-08d3ec28b14f X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB2006; 2:swVxaQHCljGK4SdW74KhydniAXE9Fmvf3Empc6n8ofWazeZTCF9bYOZw1GolyHwFz9DUVjr7T4s4Hpj3tc9GHOIn98i38/S9Z3o7CEVgFjKyK+NNWhdlftfHp6Hd0fu59sUB8TiE/C5aNYkeMVWUpvu1dI8qZZCh9PpiRPcvlUkUVtGwVyCAOo6Ye7uEIVemvgcMWH/nKT86gKTQIEuYbA==; 3:Jmf02/e66Yycni5HLNAR2STTxVOfSo+Z5zbjkkVrcwkvPJabusy3oMFzmGNWC6EIf0xgEpZHckw+7l9wUtQezaXzlS8HkBZlv/83LbcTFJnUk0Vo8HjsfffK3k6YCRedYXy34eKn6fCsIK+5bf7OFcMhXhO2WnulNqJMDp0vQLXfr7Ssezlo+WnKVl75kR0bZV/0arhLMsEpZpcViHrq+DLNCc2L0mPNVuezeapilyTkOwu4a2GOPRsDMTawpU5f X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BY2PR0301MB2006; X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB2006; 25:1KZR5EORPVu0+E1AXvZ27di50exr+gRYtk80EO4AFhERxkg0NvNG/hAg8f6pqC1GN/llvLSnCKwnaBAbmbSm5ZjuqYzu9ryWuTJxuxp8V7u5icoX9WhwkYn0QvD3GJFShpHp3kZCHzSzsxKhxchE+9T+Yf4NkZz/FoNZ9VIE/KNbMD9GPGp8MNGNr4zaJKHD+aW36AnR971E5H6vOwp4CdLZLiUQ5XnPn67YIzTDWP9ay36pYXQBkL/vs5Hxrxw6QnkF/CWrL3t3XeQa09F8I04Rhe47wGMFpBG7/8MYgS1juwYWP6t8qaQqXBjOC77OZdKFSfxLykNJvTEpbAceRGrQ+dgAxLv9/Kk7bb1van3eHsRnHH5AlpaKWq1nilbQk4Kh1WgywyVD+J+2YlzJ5WK2sv+eHmx3/PTBw6kh7dhBQo8NsxLdnqZvy8UNmwZoAOFpBqGNGLjJDo9fsqBhaaof+y1nHwnLalB5LycU7rymxdm1J4tKFDUbhU68m/GdKr36MROr1EszFHQODuXHzuHvFPqW3/gVpcpWgmmKnzwzXem6mjIr74cyo0U8gZT0OYmR3iTY0UJs2achQKmj5BIKAgPWw2Dmll3nISGJMZHrASjB2nteGzBqi3aFFoVddEvUkW2bv3JRMKT/Jjiona2G06sA4m/GabOaCgEJEDT2ZrfNLU+kiRDNDnQ63n4PU8rJ8WlobcXlnNAdxPlKKIH8/mJo5Z1bOq1TzRhdtX4= X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB2006; 31:aC7yx/DOgIL6aTG/qXqbfz4W/3+xKa05awntxI0Vr21pURtGX78P1nHyyFtzjlcPciyTrQHROUoatvD+Eg8dW8aQAi7608VjimtA2sl+wJTcGTQ+n2QozAg+Bb/tmXiIgBQVuLuH5EpsKg7Mx+VOFDsSpTzB62pEdAioIC5EFq5XQcFNumueb3B2smcAJJKOiK8DjAIyyjQrt2sAHveExO8IlTKwkA8LzOsuvGCkk8W4ZP+8xq022f/sDgRuCOlU; 4:zldeBjZTxKmhUV1/iSd+ZtKKIRJqGydk9Qet/iW4OahSkh5/u/AJWQ7d8MvXIb1o1xeFU+VSDd6YJtBrVGCV9SeyHXlmjmir6hQhdgwQp75FWnI6seVzDp96y5Igw2j5LpbxBwpII9fu8h7Qebfro7YuqIJsnSwkABefgiNtGpuJS4HRdNg+/Z95WpS+yLgmwvzxXwAGlPa7ziURjpJp5qS7Z7fOFcFh9OJY5dkObf+u8UtIQ+FJouGPS4riY77oUQlWUPmPkXpnEIfRtF78Hi3DnmbuzQOlw/tfaU1GevIMarVuAdrvDMvEo69Dk2EJ457f9SYXWFOXVyJeO03Rk4hIriGB9F/p7djGKyfL7y4x6cIG/qFuXZ7UxsSeQ0Jtksya5i4HIdZR53ZXpdORdsKjdpohRrf64dA1clKqJyvGX16oVkcOS5oSK+ratkwQ5M89BFUn48/QkIB2ffSGUFYyrmER8At3ieL5OTf2hFEuFw9oeQ3h+7H0rlss8Fq/L57zMw5vOGE0TuI1t6DWZpqarfSFxMXA01rCzti4hc4dW473bkJlUOjmCDmrpoO8 X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(101931422205132); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040176)(601004)(2401047)(8121501046)(13018025)(13017025)(13024025)(13023025)(13015025)(5005006)(10201501046)(3002001)(6055026); SRVR:BY2PR0301MB2006; BCL:0; PCL:0; RULEID:(400006); SRVR:BY2PR0301MB2006; X-Forefront-PRVS: 00851CA28B X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BY2PR0301MB2006; 23:8c49yPGcMFLQDm0QUfblTvMUsyN7gMl6G/g90Qw?= =?us-ascii?Q?iHlRkf7DCpyHMjPkjfRxFCr3lDs1ifZx3vPQBcQbVSwPIis9poyHombfpXsK?= =?us-ascii?Q?RSusdhsl6M9VNapedJY8l6E6V0KHA0++4X5Wx6paYP5hbyCcRZDP4vyDvlpe?= =?us-ascii?Q?dILIjdRkPmibIXZRtEt0A/wTRgOXzKaY3Y/M8LXsy8rU28/8G11QkB1z8tA+?= =?us-ascii?Q?X2WIkeaPG4xCYw9kO5xdJA//b82yyLrfFwSmqZk4uUPyqsSlvx7PTWgKz3SC?= =?us-ascii?Q?JUs3FrJIJwoTC09fSHtzKc88beVX38gnqgzu26VWe/UHJU56Dzs6gMQqLR53?= =?us-ascii?Q?132rWiO1BXjGZ/lbVQSyPRKcp5BFiQSRN2qQOF87LOWy0X5C+eu9Dv3eR+lu?= =?us-ascii?Q?xWbukKS7BkBkmWoEBt1fyrGOu2x2J56JWpbUYIm/cr+a/FOQQrLb1ogmBC1y?= =?us-ascii?Q?Y4rWePHutUQ74iacUo/7Aq7el07lrVdpngTvj9MPRxnotPzKE7f0n7Q1mqgW?= =?us-ascii?Q?GWsWG8k5lszyrAZ43buPyC2rSyFajlhv+TxnM7OXU8HjQYhDyRZyipVCZZpU?= =?us-ascii?Q?2Dj2Q2zMpkv8dFRxp5VJgRrOZ8R1hjzGoID4E0UiKvvJiLln5tsefaoYvnjW?= =?us-ascii?Q?l2roBcJajOZuXDlCbojDkBC/kG4j2/WogRmAV+VX1Dv3w193xhRCVILoMUt2?= =?us-ascii?Q?ttpV/wE+PVHdbLHkkmyoLZg/sZFpypXTomD7zwo/Qd8AQzeWSRUoUAbjsij9?= =?us-ascii?Q?G4Wvv7baqZtCnnYCPSf1qXwap//O6lUUbnkbrq5n7qkzv7TrPm4y50KS3kSC?= =?us-ascii?Q?0wNRa71HIuiCSogfpBwAL3cem5vRtE9V1lSLHDLzqDn1nnEMxgKEvBzyi5fj?= =?us-ascii?Q?Ocl3k3XK4u08+Gvj2Y5aLqcS21q2YNkX8I8Bq7/dPSuNA3WoI/UUzc95caP5?= =?us-ascii?Q?K75zAnu+WrEXf+7KiCCXWTceh5qflR7vcD1eRnIQ3JkSynNuuCoPiGiQN1LH?= =?us-ascii?Q?fiU5ekUDL8Qd0FFuvEvtbujEbrOhkYkGyXOxgq807d+0kzpnY66FWfxHcHZO?= =?us-ascii?Q?SHV5PrrQzVvXIMKXjQNXfrJiyicf7W69k/C5CgpjNz771wkqebtU1mbYNeGo?= =?us-ascii?Q?WrPJ07dXU5JLR8ACtqAuPd+fOuSI6jGIs9osj4f0nzqMef/3L+NYrGySM6F9?= =?us-ascii?Q?yBzphyzfoAteFV/nOEl2q7eC9PFFK3s32/IOdoMEeWJ+p6RAnIan+fTqvWfX?= =?us-ascii?Q?KHm/jHCVsaBv+WZILACH8/h3Kl1fZvhmdT9tyjep9?= X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB2006; 6:s00O6XX4ZtuAWjoSmmiPhfL9zekoC5PdbIjut5S10AlKEgpKysT1TUW+kndLyPRCz29UuDklKxx7JQC7LQisaEPl57gXmkcrQT6icyHRPPMOT1evJyZh+fSScbiegfm2WH/AmfquH+TL2fFza+DrxqLtRX7BsmwomIIyhsGQuMADiFDYdzITWlpWKeEosR9QEH+XboCUA1PZfwuYMdOF1yb4AAL2jVO8UBpOHO23tzDiiUb1CJvFi5GuGqTaqfq7tnUfdGn96CCtrjBOWmrj5K1qMiUrcYy7v6BsozjbmVTHJON8qX53uc2y42Zh92sC; 5:7jXZ/G8U5tQRzLHO6Aum4Q/pBQS/uW2bRefTttfGABpYqoPiG8dW0Fz03YqQ1HzWQHzC00gMueqjPOchkz6vjrpXFoStrYMy4Q2OQq4tLydPslY8n/I22WZnipB6d+W8MxMZEQHqBNqBoSupHSmxvCYSuF+dVKfJnrGuy9/jJBasahnth6htYxjKqPoL6BRB; 24:0yweHZlAb//dptaYDbEpv4GkThcYgExpFOUO2ot/USv9tBD/yQSx//ia88aZGz0zC5YGQ3GcvyPYDGJV8JVZ+ShzCDX4ZwkegKN8vN9b3W4= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB2006; 7:SA7GOOAKR/4fNB2bytQLBPWMCkQy5zAmP91wboK/f6/jAMW7hfXQ/E72hTmowr3E7o5WlEpIdRadUwIc5LTxcWSzPQxfzemCOozCcHr/cuyaVE1fFVFzbMeiev5WLRIW8NT8qc1N2K2kEBM7i+aluXHqMJAD2tH3YluIN84IEMxBzkMx2HMqEE2tBjk1VJMH6PB0LlY6rM07DXeG/2jqJFQAsHf8igKPAceXW3PGkvDnM/vVo3tnDYzot9WSU0z/4thvp5gljL+7mX4ROsgWlFeJf0mj8Pk4nkcKYizHmhjHkSedewvvpRqXjHsyy1WhNl4hbENmwR1ZMG9idwdPWw== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Oct 2016 07:33:08.7360 (UTC) X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e; Ip=[192.88.158.2]; Helo=[az84smr01.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY2PR0301MB2006 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: madalin.bucur@nxp.com Cc: linuxdev.baldrick@gmail.com, linuxppc-dev@lists.ozlabs.org, davem@davemloft.net, linux-kernel@vger.kernel.org Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" From: Madalin Bucur Signed-off-by: Madalin Bucur --- drivers/net/ethernet/freescale/fman/mac.c | 33 ++----------------------------- 1 file changed, 2 insertions(+), 31 deletions(-) diff --git a/drivers/net/ethernet/freescale/fman/mac.c b/drivers/net/ethernet/freescale/fman/mac.c index e33d9d2..f94fad7 100644 --- a/drivers/net/ethernet/freescale/fman/mac.c +++ b/drivers/net/ethernet/freescale/fman/mac.c @@ -583,31 +583,6 @@ static void setup_memac(struct mac_device *mac_dev) static DEFINE_MUTEX(eth_lock); -static const char phy_str[][11] = { - [PHY_INTERFACE_MODE_MII] = "mii", - [PHY_INTERFACE_MODE_GMII] = "gmii", - [PHY_INTERFACE_MODE_SGMII] = "sgmii", - [PHY_INTERFACE_MODE_TBI] = "tbi", - [PHY_INTERFACE_MODE_RMII] = "rmii", - [PHY_INTERFACE_MODE_RGMII] = "rgmii", - [PHY_INTERFACE_MODE_RGMII_ID] = "rgmii-id", - [PHY_INTERFACE_MODE_RGMII_RXID] = "rgmii-rxid", - [PHY_INTERFACE_MODE_RGMII_TXID] = "rgmii-txid", - [PHY_INTERFACE_MODE_RTBI] = "rtbi", - [PHY_INTERFACE_MODE_XGMII] = "xgmii" -}; - -static phy_interface_t __pure __attribute__((nonnull)) str2phy(const char *str) -{ - int i; - - for (i = 0; i < ARRAY_SIZE(phy_str); i++) - if (strcmp(str, phy_str[i]) == 0) - return (phy_interface_t)i; - - return PHY_INTERFACE_MODE_MII; -} - static const u16 phy2speed[] = { [PHY_INTERFACE_MODE_MII] = SPEED_100, [PHY_INTERFACE_MODE_GMII] = SPEED_1000, @@ -686,7 +661,6 @@ static int mac_probe(struct platform_device *_of_dev) struct resource res; struct mac_priv_s *priv; const u8 *mac_addr; - const char *char_prop; const u32 *u32_prop; u8 fman_id; @@ -870,15 +844,12 @@ static int mac_probe(struct platform_device *_of_dev) } /* Get the PHY connection type */ - char_prop = (const char *)of_get_property(mac_node, - "phy-connection-type", NULL); - if (!char_prop) { + priv->phy_if = of_get_phy_mode(mac_node); + if (priv->phy_if < 0) { dev_warn(dev, "of_get_property(%s, phy-connection-type) failed. Defaulting to MII\n", mac_node->full_name); priv->phy_if = PHY_INTERFACE_MODE_MII; - } else { - priv->phy_if = str2phy(char_prop); } priv->speed = phy2speed[priv->phy_if];