From patchwork Mon Jul 30 12:45:06 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 950903 X-Patchwork-Delegate: joe.hershberger@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=amarulasolutions.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.b="aHcad3FM"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 41fKJL4x9Tz9ryt for ; Mon, 30 Jul 2018 22:53:54 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 53743C22010; Mon, 30 Jul 2018 12:52:10 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id EFF46C21FDC; Mon, 30 Jul 2018 12:46:51 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 3B93DC21FF4; Mon, 30 Jul 2018 12:45:59 +0000 (UTC) Received: from mail-pg1-f194.google.com (mail-pg1-f194.google.com [209.85.215.194]) by lists.denx.de (Postfix) with ESMTPS id 9DE75C2201B for ; Mon, 30 Jul 2018 12:45:52 +0000 (UTC) Received: by mail-pg1-f194.google.com with SMTP id z8-v6so7202533pgu.8 for ; Mon, 30 Jul 2018 05:45:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=jTn8coJw5CWTC0a0s4kxr3qv0VOqV1veIAK9XeKSFpo=; b=aHcad3FMWdmG1kjfBy5GbprFBrzk90LXKO9F1NOzfayW8EPaJUZ1TZhWq0NbbphMa3 mfTX5qUz9vao3JlIYtmDPYRj8RzdeTA9XZlAZFLNxBCTUV0hcpECPwVJyK+bGa8U830b AjtdBHHONLN2o3J448irzpWwjUMUu/tHBEiXQ= 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=jTn8coJw5CWTC0a0s4kxr3qv0VOqV1veIAK9XeKSFpo=; b=ts+lVuDKeVztQxDv8EABYCs0BBu7DsWEAHLHBnNfjWE8HlFIJCKJTcHu9jxrjzG/SF hzTPs2zX11psw8MIVv1Nb4ub657AK7tEjiQRvDzzuXyn9jac7MDoGgmlakvSTeyq8Ldg WsrydhtL6GgJCAJbMGz7YasMf1WijRddZ2yhy6HuLlJfPnPkc9qVTH9/cMbypmin2EdB 3+yuPajJAsqConK6hkUnQFQbTEDW7SpsYu51VaUs5dyM9mvfJNx5ZCB1yHzimxFN2bDN vx+kfB2iTy+K7ZxhOm1cmHrbw7vW1iRZv7jjnbJzs2prQW2bB7QD6fL/xBjtxxlyOIwJ yUDQ== X-Gm-Message-State: AOUpUlGqUBei3DPmJON3IBGCDpoi+SUxyPVUUwLr//FA1kCIugik+vD+ 3/l0sBDOb+g3vYVlNg3dHVTGKrlzyYI= X-Google-Smtp-Source: AAOMgpepas/8dVf0YOjXXzQuruj8R8QAjjnig5MM2+bEmqoFj7fkTD3WimXZsr73zHpHlAAbd5hU3Q== X-Received: by 2002:a63:a919:: with SMTP id u25-v6mr16739051pge.211.1532954751299; Mon, 30 Jul 2018 05:45:51 -0700 (PDT) Received: from localhost.localdomain ([49.206.202.146]) by smtp.gmail.com with ESMTPSA id s3-v6sm30885964pfg.2.2018.07.30.05.45.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 30 Jul 2018 05:45:50 -0700 (PDT) From: Jagan Teki To: Stefano Babic , Fabio Estevam , Peng Fan , Joe Hershberger Date: Mon, 30 Jul 2018 18:15:06 +0530 Message-Id: <20180730124509.13063-8-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.18.0.321.gffc6fa0e3 In-Reply-To: <20180730124509.13063-1-jagan@amarulasolutions.com> References: <20180730124509.13063-1-jagan@amarulasolutions.com> MIME-Version: 1.0 Cc: u-boot@lists.denx.de Subject: [U-Boot] [PATCH 07/10] dm: net: fec: Move enet init in fec_enet X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Move enet initialization code in fec_enet function, no functional changes. Signed-off-by: Jagan Teki Acked-by: Joe Hershberger --- drivers/net/fec_mxc.c | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/drivers/net/fec_mxc.c b/drivers/net/fec_mxc.c index 3ae62ff9d1..76a3bd84f0 100644 --- a/drivers/net/fec_mxc.c +++ b/drivers/net/fec_mxc.c @@ -1254,11 +1254,8 @@ static int fec_phy_init(struct udevice *dev) return 0; } -static int fecmxc_probe(struct udevice *dev) +static int fec_enet_init(struct fec_priv *priv) { - struct eth_pdata *pdata = dev_get_platdata(dev); - struct fec_priv *priv = dev_get_priv(dev); - struct mii_dev *bus = NULL; uint32_t start; int ret; @@ -1280,6 +1277,24 @@ static int fecmxc_probe(struct udevice *dev) fec_reg_setup(priv); + return 0; + +err_timeout: + fec_free_descs(priv); + return ret; +} + +static int fecmxc_probe(struct udevice *dev) +{ + struct eth_pdata *pdata = dev_get_platdata(dev); + struct fec_priv *priv = dev_get_priv(dev); + struct mii_dev *bus = NULL; + int ret; + + ret = fec_enet_init(priv); + if (ret) + return ret; + priv->dev_id = dev->seq; #ifdef CONFIG_FEC_MXC_MDIO_BASE bus = fec_get_miibus((ulong)CONFIG_FEC_MXC_MDIO_BASE, dev->seq); @@ -1303,7 +1318,6 @@ err_phy: mdio_unregister(bus); free(bus); err_mii: -err_timeout: fec_free_descs(priv); return ret; }