From patchwork Tue Oct 22 03:30:01 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Fan X-Patchwork-Id: 1181019 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) 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=fail (p=none dis=none) header.from=nxp.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="WkTU+TwQ"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 46xzb23cHBz9sP4 for ; Tue, 22 Oct 2019 14:32:14 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 2FCBCC21DAF; Tue, 22 Oct 2019 03:31: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=SPF_HELO_PASS, 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 E9D32C21DEC; Tue, 22 Oct 2019 03:31:08 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id C3B77C21DAF; Tue, 22 Oct 2019 03:30:05 +0000 (UTC) Received: from EUR03-VE1-obe.outbound.protection.outlook.com (mail-eopbgr50058.outbound.protection.outlook.com [40.107.5.58]) by lists.denx.de (Postfix) with ESMTPS id 607A2C21E16 for ; Tue, 22 Oct 2019 03:30:02 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XD6gxrjCJXJTXVY9NbRO5gRQXg96uEVohOqWrbS4uGuhWsNQFnT2X60rjuXBIdUUdEMHbw/euf+NnTT6zFAVxp3vXv/X4yIj5kgu0EbG+puZe9AYU6EHfGjaIyH61FYrmF5KiM4XrXgNKmf+wliU0so2e13Sn0GIKEsJNpB8BjdR1GGZcBQ4yUizU7hlrXwWYPiqf+OrJA8Bl0gHiUvcttA4yxhKWYLRb7e5lp2TPSYSV0nFO9CKlrcQ6Jtjm0uC4dMFQC/pCusyOp7bnTrd3dPodHWj7+1mXkHkYLhszVEGbpb4exmxgs46S9NojjxJMuggUX0LsU+RoTx81X9lPA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=nRs+LDmRHsRqMs99qRPXQ/3nK82kTC7B5P/7PpBPH5U=; b=mJYl8N1KKxdR8vtDravwXxjBI4bAnFB5ooKk+4+vXl4xzGUmY4QRZIbjpUZRarrWA2V+erUpXogjlQah5hrvk1cYhXLrYcE8YKiQVX73fp78GGuodEKQkIpcxXrQg3KDO7oTQG3ihHiyxU/CaAlbsByJBdHfdbfywDto9HZOGTywjLuORllUjuH9BZG2zgdYWzZfqWzeXFIpzE3s6qndBTz0jRg3IJDiYZVJbwMriI6St1LBGCs+bAj92jJ/DnxgACqKEKFVgJl+i+yaUOSfhcrattztdyoTkdGDxT1kMCpYVDi8sETwUZcDyNKRm031xXMn0E1EAyxcQHfStHKpWA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=nRs+LDmRHsRqMs99qRPXQ/3nK82kTC7B5P/7PpBPH5U=; b=WkTU+TwQBHKejs1SrraGoDgGuVyD4Yh6jN2ec7Eb6/jceNXByZfA10uo1QiOrPQR9LENsQW+MMPUgjA5wBT4jAEWGq11Uz38NuxW+ehWyHxUSbWlNl1fTm2tD0Es38HLf8d7V+c21euARaUpt51ZRk8uvjCvsUFS6PcvubeA5vM= Received: from AM0PR04MB4481.eurprd04.prod.outlook.com (52.135.147.15) by AM0PR04MB5859.eurprd04.prod.outlook.com (20.178.202.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2347.21; Tue, 22 Oct 2019 03:30:01 +0000 Received: from AM0PR04MB4481.eurprd04.prod.outlook.com ([fe80::843c:e722:27cb:74e1]) by AM0PR04MB4481.eurprd04.prod.outlook.com ([fe80::843c:e722:27cb:74e1%5]) with mapi id 15.20.2347.029; Tue, 22 Oct 2019 03:30:01 +0000 From: Peng Fan To: "sbabic@denx.de" , "festevam@gmail.com" , "lukma@denx.de" , "joe.hershberger@ni.com" Thread-Topic: [PATCH V1 5/6] net: fec_mxc: support i.MX8M with CLK_CCF Thread-Index: AQHViIj8QHqhfCHaXEmjdQn47Jg01w== Date: Tue, 22 Oct 2019 03:30:01 +0000 Message-ID: <20191022034714.27781-6-peng.fan@nxp.com> References: <20191022034714.27781-1-peng.fan@nxp.com> In-Reply-To: <20191022034714.27781-1-peng.fan@nxp.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 2.16.4 x-clientproxiedby: HK0PR03CA0101.apcprd03.prod.outlook.com (2603:1096:203:b0::17) To AM0PR04MB4481.eurprd04.prod.outlook.com (2603:10a6:208:70::15) authentication-results: spf=none (sender IP is ) smtp.mailfrom=peng.fan@nxp.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [119.31.174.71] x-ms-publictraffictype: Email x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: f5ca446c-2b13-4742-45ab-08d756a01f10 x-ms-traffictypediagnostic: AM0PR04MB5859:|AM0PR04MB5859: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:2089; x-forefront-prvs: 01986AE76B x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(979002)(4636009)(376002)(136003)(346002)(366004)(39860400002)(396003)(199004)(189003)(8936002)(50226002)(52116002)(44832011)(71190400001)(102836004)(71200400001)(36756003)(76176011)(476003)(2906002)(99286004)(2501003)(8676002)(446003)(11346002)(81166006)(81156014)(26005)(186003)(6506007)(386003)(2616005)(486006)(305945005)(7736002)(6116002)(3846002)(256004)(66446008)(1076003)(86362001)(2201001)(110136005)(54906003)(4326008)(5660300002)(316002)(14454004)(478600001)(25786009)(66066001)(6512007)(66476007)(66556008)(64756008)(66946007)(6436002)(6486002)(969003)(989001)(999001)(1009001)(1019001); DIR:OUT; SFP:1101; SCL:1; SRVR:AM0PR04MB5859; H:AM0PR04MB4481.eurprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; received-spf: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: GQQUjyPc853FvchDQ23XC7qygZjlUmvtBpv5rstnWE8Lm+bzJqWXEe0YCWGNRl01oyw6hGunhSfIQPpBD9m/u28Qxf/GjzNdBQ/OyRsQ1iGy2wU0ywwQeNexQascEM5XcmjV6I34ndFYRb8WJfkwy5m0qDqArFDgiE28Yz9L6XhtQd2YS3920V0IEvnzLZaKJxafNiTdGbo1CjJ6tCH+Mm84oyZ11DzX3wSWNmEPpZpuHXNdnwnNgH23sBm12uquDmHIRrbu0vu2RoZ0EblUg3M+kP9QtaoSgndrNh0ivWXnI/AlvbLnteO6knaOI8EI7zQyLufxf+NPNLVAVBGUJvKrMUlAt87lZpR18sT29Y1OtKkAnL4dose0FSP5oRWrQj22nnYxd0QLQE6RHdEv9FARibfNPf4hmhA3quZiKiF9eYlkaQA284Gdug8befu4 MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: f5ca446c-2b13-4742-45ab-08d756a01f10 X-MS-Exchange-CrossTenant-originalarrivaltime: 22 Oct 2019 03:30:01.4169 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: VAtUu8GlgCqKrVW6EWw5KcrEISbcIA+0Ys7849JgKC4uBt2bhyfzxcdq/z7tGiqrMAM5oPBEnsKl/gCsdrkDPA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB5859 Cc: "u-boot@lists.denx.de" , dl-uboot-imx Subject: [U-Boot] [PATCH V1 5/6] net: fec_mxc: support i.MX8M with CLK_CCF 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" Add more clks for fec_mxc according to Linux Kernel 5.4.0-rc1 drivers/net/ethernet/freescale/fec_main.c. Since i.MX8MQ not support CLK_CCF, so add a check to restrict the code only effect when CONFIG_IMX8M and CONFIG_CLK_CCF both defined. Signed-off-by: Peng Fan --- drivers/net/fec_mxc.c | 74 ++++++++++++++++++++++++++++++++++++++++----------- drivers/net/fec_mxc.h | 4 +++ 2 files changed, 63 insertions(+), 15 deletions(-) diff --git a/drivers/net/fec_mxc.c b/drivers/net/fec_mxc.c index 080dbcf7db..9362aa0d05 100644 --- a/drivers/net/fec_mxc.c +++ b/drivers/net/fec_mxc.c @@ -125,28 +125,29 @@ static int fec_mdio_read(struct ethernet_regs *eth, uint8_t phyaddr, static int fec_get_clk_rate(void *udev, int idx) { -#if IS_ENABLED(CONFIG_IMX8) struct fec_priv *fec; struct udevice *dev; int ret; - dev = udev; - if (!dev) { - ret = uclass_get_device(UCLASS_ETH, idx, &dev); - if (ret < 0) { - debug("Can't get FEC udev: %d\n", ret); - return ret; + if (IS_ENABLED(CONFIG_IMX8) || + (IS_ENABLED(CONFIG_IMX8M) && IS_ENABLED(CONFIG_CLK_CCF))) { + dev = udev; + if (!dev) { + ret = uclass_get_device(UCLASS_ETH, idx, &dev); + if (ret < 0) { + debug("Can't get FEC udev: %d\n", ret); + return ret; + } } - } - fec = dev_get_priv(dev); - if (fec) - return fec->clk_rate; + fec = dev_get_priv(dev); + if (fec) + return fec->clk_rate; - return -EINVAL; -#else - return imx_get_fecclk(); -#endif + return -EINVAL; + } else { + return imx_get_fecclk(); + } } static void fec_mii_setspeed(struct ethernet_regs *eth) @@ -1335,6 +1336,49 @@ static int fecmxc_probe(struct udevice *dev) return ret; } + priv->clk_rate = clk_get_rate(&priv->ipg_clk); + } else if (IS_ENABLED(CONFIG_IMX8M) && IS_ENABLED(CONFIG_CLK_CCF)) { + ret = clk_get_by_name(dev, "ipg", &priv->ipg_clk); + if (ret < 0) { + debug("Can't get FEC ipg clk: %d\n", ret); + return ret; + } else { + ret = clk_enable(&priv->ipg_clk); + if(ret) + return ret; + } + + ret = clk_get_by_name(dev, "ipg", &priv->ahb_clk); + if (ret < 0) { + debug("Can't get FEC ahb clk: %d\n", ret); + return ret; + } else { + ret = clk_enable(&priv->ahb_clk); + if (ret) + return ret; + } + + ret = clk_get_by_name(dev, "enet_out", &priv->clk_enet_out); + if (!ret) { + ret = clk_enable(&priv->clk_enet_out); + if (ret) + return ret; + } + + ret = clk_get_by_name(dev, "enet_clk_ref", &priv->clk_ref); + if (!ret) { + ret = clk_enable(&priv->clk_ref); + if (ret) + return ret; + } + + ret = clk_get_by_name(dev, "ptp", &priv->clk_ptp); + if (!ret) { + ret = clk_enable(&priv->clk_ptp); + if (ret) + return ret; + } + priv->clk_rate = clk_get_rate(&priv->ipg_clk); } diff --git a/drivers/net/fec_mxc.h b/drivers/net/fec_mxc.h index e5f2dd75c5..723b06a651 100644 --- a/drivers/net/fec_mxc.h +++ b/drivers/net/fec_mxc.h @@ -264,6 +264,10 @@ struct fec_priv { u32 interface; #endif struct clk ipg_clk; + struct clk ahb_clk; + struct clk clk_enet_out; + struct clk clk_ref; + struct clk clk_ptp; u32 clk_rate; };