From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.7 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,UPPERCASE_50_75,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E2E92C4320E for ; Fri, 27 Aug 2021 09:29:51 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id AA2D460FD8 for ; Fri, 27 Aug 2021 09:29:51 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org AA2D460FD8 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=WuCby6kZJoBsmpsBTBeQZ93vndy7PqYO5AcwA21x8Ko=; b=BTYKgGWu2Djkq1 9eAts+WshXjapwMJgVOrWo91P59AT6d1jqru495Ocdd3rjP/0Y/6wtIzI+4auVmrITo0upAzHtYsv T6+oWsucXgQAlf8fRaKTH7+ISwsRnZ7F1qo8K+7GiqDXtXPoRMo+gzF64elmJ1TaTQcq9xCZzxoKD HQM2aQvAWBdvB6QiN3PM8v7xUconYZI4NAMh4LoU5UtT2z0lOuKSjTQeqpqczAu0Lv2Gyx5uSkb+w tnkfMx+7O3UKCbz27s/CmV2+LzA+91hOc7Bdya9OMP54tlvkjpzWY+tQhNmXSyABuvhOdGUcuMAZb cU++AjxVqKbgcBY56RPQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mJYBL-00C36o-4r; Fri, 27 Aug 2021 09:29:51 +0000 Received: from mail.kernel.org ([198.145.29.99]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mJYBI-00C35Z-9l for linux-phy@lists.infradead.org; Fri, 27 Aug 2021 09:29:49 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id 3C7C360F6C; Fri, 27 Aug 2021 09:29:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1630056587; bh=Qa+Xvz2tEkd6ZojFgLnzj3Z4HtfYDVECO06IQ4IQZ0Q=; h=From:To:Cc:Subject:Date:From; b=hVzrnmwCr/1zatmWPlatKubAC95B3qTU0VHVJRMws0BZ5bbBC+8HZ/VbPVb7i8ZGS 7yOZ6xiGQYnjXAkyW6SoJncbfvOFjp3gNoTLUfYHun6JkcRnM54S5XOCKS/+R/ukkp Q3h8FM1wvWF1Qm9moZ9ZVTeMivFPZKpRMGvsWKpStQm4vjmyEX+TF3hSgk6g3nS10l FzQ/dQxacUa8WSEXJ0GZ0k6eXI6/Pait4peCFOKZgfDDqZFZObB4cMSCk7b/BEIOu5 zCucdbExI4/k74T41mRYbBgYb9rhgIHtLqLUOr/4Fj5VdqdR35ztYtNm5eMdG0U09Q 695D9m8JGC9iw== Received: by pali.im (Postfix) id 1F2E1617; Fri, 27 Aug 2021 11:29:45 +0200 (CEST) From: =?UTF-8?q?Pali=20Roh=C3=A1r?= To: Miquel Raynal , Kishon Vijay Abraham I , Vinod Koul Cc: Russell King , Andrew Lunn , =?UTF-8?q?Marek=20Beh=C3=BAn?= , Rob Herring , linux-phy@lists.infradead.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/3] phy: marvell: phy-mvebu-cp110-comphy: Rename HS-SGMMI to 2500Base-X Date: Fri, 27 Aug 2021 11:27:51 +0200 Message-Id: <20210827092753.2359-1-pali@kernel.org> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210827_022948_415523_762B5CB1 X-CRM114-Status: UNSURE ( 9.59 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-phy@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Linux Phy Mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: "linux-phy" Errors-To: linux-phy-bounces+linux-phy=archiver.kernel.org@lists.infradead.org Q29tcGh5IHBoeSBtb2RlIDB4MyBpcyBpbmNvcnJlY3RseSBuYW1lZC4gSXQgaXMgbm90IFNHTUlJ IGJ1dCByYXRoZXIKMjUwMEJhc2UtWCBtb2RlIHdoaWNoIHJ1bnMgYXQgMy4xMjUgR2JwcyBzcGVl ZC4KClJlbmFtZSBtYWNybyBuYW1lcyBhbmQgY29tbWVudHMgdG8gMjUwMEJhc2UtWC4KClNpZ25l ZC1vZmYtYnk6IFBhbGkgUm9ow6FyIDxwYWxpQGtlcm5lbC5vcmc+CkZpeGVzOiBlYjZhMWZjYjUz ZTIgKCJwaHk6IG12ZWJ1LWNwMTEwLWNvbXBoeTogQWRkIFNNQyBjYWxsIHN1cHBvcnQiKQpGaXhl czogYzJhZmIyZmVmNTk1ICgicGh5OiBtdmVidS1jcDExMC1jb21waHk6IFJlbmFtZSB0aGUgbWFj cm8gaGFuZGxpbmcgb25seSBFdGhlcm5ldCBtb2RlcyIpCi0tLQogZHJpdmVycy9waHkvbWFydmVs bC9waHktbXZlYnUtY3AxMTAtY29tcGh5LmMgfCAxNiArKysrKysrKy0tLS0tLS0tCiAxIGZpbGUg Y2hhbmdlZCwgOCBpbnNlcnRpb25zKCspLCA4IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2Ry aXZlcnMvcGh5L21hcnZlbGwvcGh5LW12ZWJ1LWNwMTEwLWNvbXBoeS5jIGIvZHJpdmVycy9waHkv bWFydmVsbC9waHktbXZlYnUtY3AxMTAtY29tcGh5LmMKaW5kZXggNTNhZDEyN2IxMDBmLi5iYmQ2 ZjJhZDZmMjQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvcGh5L21hcnZlbGwvcGh5LW12ZWJ1LWNwMTEw LWNvbXBoeS5jCisrKyBiL2RyaXZlcnMvcGh5L21hcnZlbGwvcGh5LW12ZWJ1LWNwMTEwLWNvbXBo eS5jCkBAIC0xNjcsNyArMTY3LDcgQEAKIAogI2RlZmluZSBDT01QSFlfRldfTU9ERV9TQVRBCQkw eDEKICNkZWZpbmUgQ09NUEhZX0ZXX01PREVfU0dNSUkJCTB4MiAvKiBTR01JSSAxRyAqLwotI2Rl ZmluZSBDT01QSFlfRldfTU9ERV9IU19TR01JSQkJMHgzIC8qIFNHTUlJIDIuNUcgKi8KKyNkZWZp bmUgQ09NUEhZX0ZXX01PREVfMjUwMEJBU0VYCTB4MyAvKiAyNTAwQkFTRS1YICovCiAjZGVmaW5l IENPTVBIWV9GV19NT0RFX1VTQjNICQkweDQKICNkZWZpbmUgQ09NUEhZX0ZXX01PREVfVVNCM0QJ CTB4NQogI2RlZmluZSBDT01QSFlfRldfTU9ERV9QQ0lFCQkweDYKQEAgLTIwNyw3ICsyMDcsNyBA QCBzdGF0aWMgY29uc3Qgc3RydWN0IG12ZWJ1X2NvbXBoeV9jb25mIG12ZWJ1X2NvbXBoeV9jcDEx MF9tb2Rlc1tdID0gewogCS8qIGxhbmUgMCAqLwogCUdFTl9DT05GKDAsIDAsIFBIWV9NT0RFX1BD SUUsIENPTVBIWV9GV19NT0RFX1BDSUUpLAogCUVUSF9DT05GKDAsIDEsIFBIWV9JTlRFUkZBQ0Vf TU9ERV9TR01JSSwgMHgxLCBDT01QSFlfRldfTU9ERV9TR01JSSksCi0JRVRIX0NPTkYoMCwgMSwg UEhZX0lOVEVSRkFDRV9NT0RFXzI1MDBCQVNFWCwgMHgxLCBDT01QSFlfRldfTU9ERV9IU19TR01J SSksCisJRVRIX0NPTkYoMCwgMSwgUEhZX0lOVEVSRkFDRV9NT0RFXzI1MDBCQVNFWCwgMHgxLCBD T01QSFlfRldfTU9ERV8yNTAwQkFTRVgpLAogCUdFTl9DT05GKDAsIDEsIFBIWV9NT0RFX1NBVEEs IENPTVBIWV9GV19NT0RFX1NBVEEpLAogCS8qIGxhbmUgMSAqLwogCUdFTl9DT05GKDEsIDAsIFBI WV9NT0RFX1VTQl9IT1NUX1NTLCBDT01QSFlfRldfTU9ERV9VU0IzSCksCkBAIC0yMTUsMTAgKzIx NSwxMCBAQCBzdGF0aWMgY29uc3Qgc3RydWN0IG12ZWJ1X2NvbXBoeV9jb25mIG12ZWJ1X2NvbXBo eV9jcDExMF9tb2Rlc1tdID0gewogCUdFTl9DT05GKDEsIDAsIFBIWV9NT0RFX1NBVEEsIENPTVBI WV9GV19NT0RFX1NBVEEpLAogCUdFTl9DT05GKDEsIDAsIFBIWV9NT0RFX1BDSUUsIENPTVBIWV9G V19NT0RFX1BDSUUpLAogCUVUSF9DT05GKDEsIDIsIFBIWV9JTlRFUkZBQ0VfTU9ERV9TR01JSSwg MHgxLCBDT01QSFlfRldfTU9ERV9TR01JSSksCi0JRVRIX0NPTkYoMSwgMiwgUEhZX0lOVEVSRkFD RV9NT0RFXzI1MDBCQVNFWCwgMHgxLCBDT01QSFlfRldfTU9ERV9IU19TR01JSSksCisJRVRIX0NP TkYoMSwgMiwgUEhZX0lOVEVSRkFDRV9NT0RFXzI1MDBCQVNFWCwgMHgxLCBDT01QSFlfRldfTU9E RV8yNTAwQkFTRVgpLAogCS8qIGxhbmUgMiAqLwogCUVUSF9DT05GKDIsIDAsIFBIWV9JTlRFUkZB Q0VfTU9ERV9TR01JSSwgMHgxLCBDT01QSFlfRldfTU9ERV9TR01JSSksCi0JRVRIX0NPTkYoMiwg MCwgUEhZX0lOVEVSRkFDRV9NT0RFXzI1MDBCQVNFWCwgMHgxLCBDT01QSFlfRldfTU9ERV9IU19T R01JSSksCisJRVRIX0NPTkYoMiwgMCwgUEhZX0lOVEVSRkFDRV9NT0RFXzI1MDBCQVNFWCwgMHgx LCBDT01QSFlfRldfTU9ERV8yNTAwQkFTRVgpLAogCUVUSF9DT05GKDIsIDAsIFBIWV9JTlRFUkZB Q0VfTU9ERV9SWEFVSSwgMHgxLCBDT01QSFlfRldfTU9ERV9SWEFVSSksCiAJRVRIX0NPTkYoMiwg MCwgUEhZX0lOVEVSRkFDRV9NT0RFXzEwR0JBU0VSLCAweDEsIENPTVBIWV9GV19NT0RFX1hGSSks CiAJR0VOX0NPTkYoMiwgMCwgUEhZX01PREVfVVNCX0hPU1RfU1MsIENPTVBIWV9GV19NT0RFX1VT QjNIKSwKQEAgLTIyNywyNiArMjI3LDI2IEBAIHN0YXRpYyBjb25zdCBzdHJ1Y3QgbXZlYnVfY29t cGh5X2NvbmYgbXZlYnVfY29tcGh5X2NwMTEwX21vZGVzW10gPSB7CiAJLyogbGFuZSAzICovCiAJ R0VOX0NPTkYoMywgMCwgUEhZX01PREVfUENJRSwgQ09NUEhZX0ZXX01PREVfUENJRSksCiAJRVRI X0NPTkYoMywgMSwgUEhZX0lOVEVSRkFDRV9NT0RFX1NHTUlJLCAweDIsIENPTVBIWV9GV19NT0RF X1NHTUlJKSwKLQlFVEhfQ09ORigzLCAxLCBQSFlfSU5URVJGQUNFX01PREVfMjUwMEJBU0VYLCAw eDIsIENPTVBIWV9GV19NT0RFX0hTX1NHTUlJKSwKKwlFVEhfQ09ORigzLCAxLCBQSFlfSU5URVJG QUNFX01PREVfMjUwMEJBU0VYLCAweDIsIENPTVBIWV9GV19NT0RFXzI1MDBCQVNFWCksCiAJRVRI X0NPTkYoMywgMSwgUEhZX0lOVEVSRkFDRV9NT0RFX1JYQVVJLCAweDEsIENPTVBIWV9GV19NT0RF X1JYQVVJKSwKIAlHRU5fQ09ORigzLCAxLCBQSFlfTU9ERV9VU0JfSE9TVF9TUywgQ09NUEhZX0ZX X01PREVfVVNCM0gpLAogCUdFTl9DT05GKDMsIDEsIFBIWV9NT0RFX1NBVEEsIENPTVBIWV9GV19N T0RFX1NBVEEpLAogCS8qIGxhbmUgNCAqLwogCUVUSF9DT05GKDQsIDAsIFBIWV9JTlRFUkZBQ0Vf TU9ERV9TR01JSSwgMHgyLCBDT01QSFlfRldfTU9ERV9TR01JSSksCi0JRVRIX0NPTkYoNCwgMCwg UEhZX0lOVEVSRkFDRV9NT0RFXzI1MDBCQVNFWCwgMHgyLCBDT01QSFlfRldfTU9ERV9IU19TR01J SSksCisJRVRIX0NPTkYoNCwgMCwgUEhZX0lOVEVSRkFDRV9NT0RFXzI1MDBCQVNFWCwgMHgyLCBD T01QSFlfRldfTU9ERV8yNTAwQkFTRVgpLAogCUVUSF9DT05GKDQsIDAsIFBIWV9JTlRFUkZBQ0Vf TU9ERV8xMEdCQVNFUiwgMHgyLCBDT01QSFlfRldfTU9ERV9YRkkpLAogCUVUSF9DT05GKDQsIDAs IFBIWV9JTlRFUkZBQ0VfTU9ERV9SWEFVSSwgMHgyLCBDT01QSFlfRldfTU9ERV9SWEFVSSksCiAJ R0VOX0NPTkYoNCwgMCwgUEhZX01PREVfVVNCX0RFVklDRV9TUywgQ09NUEhZX0ZXX01PREVfVVNC M0QpLAogCUdFTl9DT05GKDQsIDEsIFBIWV9NT0RFX1VTQl9IT1NUX1NTLCBDT01QSFlfRldfTU9E RV9VU0IzSCksCiAJR0VOX0NPTkYoNCwgMSwgUEhZX01PREVfUENJRSwgQ09NUEhZX0ZXX01PREVf UENJRSksCiAJRVRIX0NPTkYoNCwgMSwgUEhZX0lOVEVSRkFDRV9NT0RFX1NHTUlJLCAweDEsIENP TVBIWV9GV19NT0RFX1NHTUlJKSwKLQlFVEhfQ09ORig0LCAxLCBQSFlfSU5URVJGQUNFX01PREVf MjUwMEJBU0VYLCAtMSwgQ09NUEhZX0ZXX01PREVfSFNfU0dNSUkpLAorCUVUSF9DT05GKDQsIDEs IFBIWV9JTlRFUkZBQ0VfTU9ERV8yNTAwQkFTRVgsIC0xLCBDT01QSFlfRldfTU9ERV8yNTAwQkFT RVgpLAogCUVUSF9DT05GKDQsIDEsIFBIWV9JTlRFUkZBQ0VfTU9ERV8xMEdCQVNFUiwgLTEsIENP TVBIWV9GV19NT0RFX1hGSSksCiAJLyogbGFuZSA1ICovCiAJRVRIX0NPTkYoNSwgMSwgUEhZX0lO VEVSRkFDRV9NT0RFX1JYQVVJLCAweDIsIENPTVBIWV9GV19NT0RFX1JYQVVJKSwKIAlHRU5fQ09O Rig1LCAxLCBQSFlfTU9ERV9TQVRBLCBDT01QSFlfRldfTU9ERV9TQVRBKSwKIAlFVEhfQ09ORig1 LCAyLCBQSFlfSU5URVJGQUNFX01PREVfU0dNSUksIDB4MSwgQ09NUEhZX0ZXX01PREVfU0dNSUkp LAotCUVUSF9DT05GKDUsIDIsIFBIWV9JTlRFUkZBQ0VfTU9ERV8yNTAwQkFTRVgsIDB4MSwgQ09N UEhZX0ZXX01PREVfSFNfU0dNSUkpLAorCUVUSF9DT05GKDUsIDIsIFBIWV9JTlRFUkZBQ0VfTU9E RV8yNTAwQkFTRVgsIDB4MSwgQ09NUEhZX0ZXX01PREVfMjUwMEJBU0VYKSwKIAlHRU5fQ09ORig1 LCAyLCBQSFlfTU9ERV9QQ0lFLCBDT01QSFlfRldfTU9ERV9QQ0lFKSwKIH07CiAKLS0gCjIuMjAu MQoKCi0tIApsaW51eC1waHkgbWFpbGluZyBsaXN0CmxpbnV4LXBoeUBsaXN0cy5pbmZyYWRlYWQu b3JnCmh0dHBzOi8vbGlzdHMuaW5mcmFkZWFkLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2xpbnV4LXBo eQo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-19.7 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,UPPERCASE_50_75,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4A11FC4320A for ; Fri, 27 Aug 2021 09:30:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id F0A3160F6C for ; Fri, 27 Aug 2021 09:30:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244886AbhH0Jau (ORCPT ); Fri, 27 Aug 2021 05:30:50 -0400 Received: from mail.kernel.org ([198.145.29.99]:57146 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244657AbhH0Jag (ORCPT ); Fri, 27 Aug 2021 05:30:36 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 3C7C360F6C; Fri, 27 Aug 2021 09:29:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1630056587; bh=Qa+Xvz2tEkd6ZojFgLnzj3Z4HtfYDVECO06IQ4IQZ0Q=; h=From:To:Cc:Subject:Date:From; b=hVzrnmwCr/1zatmWPlatKubAC95B3qTU0VHVJRMws0BZ5bbBC+8HZ/VbPVb7i8ZGS 7yOZ6xiGQYnjXAkyW6SoJncbfvOFjp3gNoTLUfYHun6JkcRnM54S5XOCKS/+R/ukkp Q3h8FM1wvWF1Qm9moZ9ZVTeMivFPZKpRMGvsWKpStQm4vjmyEX+TF3hSgk6g3nS10l FzQ/dQxacUa8WSEXJ0GZ0k6eXI6/Pait4peCFOKZgfDDqZFZObB4cMSCk7b/BEIOu5 zCucdbExI4/k74T41mRYbBgYb9rhgIHtLqLUOr/4Fj5VdqdR35ztYtNm5eMdG0U09Q 695D9m8JGC9iw== Received: by pali.im (Postfix) id 1F2E1617; Fri, 27 Aug 2021 11:29:45 +0200 (CEST) From: =?UTF-8?q?Pali=20Roh=C3=A1r?= To: Miquel Raynal , Kishon Vijay Abraham I , Vinod Koul Cc: Russell King , Andrew Lunn , =?UTF-8?q?Marek=20Beh=C3=BAn?= , Rob Herring , linux-phy@lists.infradead.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/3] phy: marvell: phy-mvebu-cp110-comphy: Rename HS-SGMMI to 2500Base-X Date: Fri, 27 Aug 2021 11:27:51 +0200 Message-Id: <20210827092753.2359-1-pali@kernel.org> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Comphy phy mode 0x3 is incorrectly named. It is not SGMII but rather 2500Base-X mode which runs at 3.125 Gbps speed. Rename macro names and comments to 2500Base-X. Signed-off-by: Pali Rohár Fixes: eb6a1fcb53e2 ("phy: mvebu-cp110-comphy: Add SMC call support") Fixes: c2afb2fef595 ("phy: mvebu-cp110-comphy: Rename the macro handling only Ethernet modes") --- drivers/phy/marvell/phy-mvebu-cp110-comphy.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/phy/marvell/phy-mvebu-cp110-comphy.c b/drivers/phy/marvell/phy-mvebu-cp110-comphy.c index 53ad127b100f..bbd6f2ad6f24 100644 --- a/drivers/phy/marvell/phy-mvebu-cp110-comphy.c +++ b/drivers/phy/marvell/phy-mvebu-cp110-comphy.c @@ -167,7 +167,7 @@ #define COMPHY_FW_MODE_SATA 0x1 #define COMPHY_FW_MODE_SGMII 0x2 /* SGMII 1G */ -#define COMPHY_FW_MODE_HS_SGMII 0x3 /* SGMII 2.5G */ +#define COMPHY_FW_MODE_2500BASEX 0x3 /* 2500BASE-X */ #define COMPHY_FW_MODE_USB3H 0x4 #define COMPHY_FW_MODE_USB3D 0x5 #define COMPHY_FW_MODE_PCIE 0x6 @@ -207,7 +207,7 @@ static const struct mvebu_comphy_conf mvebu_comphy_cp110_modes[] = { /* lane 0 */ GEN_CONF(0, 0, PHY_MODE_PCIE, COMPHY_FW_MODE_PCIE), ETH_CONF(0, 1, PHY_INTERFACE_MODE_SGMII, 0x1, COMPHY_FW_MODE_SGMII), - ETH_CONF(0, 1, PHY_INTERFACE_MODE_2500BASEX, 0x1, COMPHY_FW_MODE_HS_SGMII), + ETH_CONF(0, 1, PHY_INTERFACE_MODE_2500BASEX, 0x1, COMPHY_FW_MODE_2500BASEX), GEN_CONF(0, 1, PHY_MODE_SATA, COMPHY_FW_MODE_SATA), /* lane 1 */ GEN_CONF(1, 0, PHY_MODE_USB_HOST_SS, COMPHY_FW_MODE_USB3H), @@ -215,10 +215,10 @@ static const struct mvebu_comphy_conf mvebu_comphy_cp110_modes[] = { GEN_CONF(1, 0, PHY_MODE_SATA, COMPHY_FW_MODE_SATA), GEN_CONF(1, 0, PHY_MODE_PCIE, COMPHY_FW_MODE_PCIE), ETH_CONF(1, 2, PHY_INTERFACE_MODE_SGMII, 0x1, COMPHY_FW_MODE_SGMII), - ETH_CONF(1, 2, PHY_INTERFACE_MODE_2500BASEX, 0x1, COMPHY_FW_MODE_HS_SGMII), + ETH_CONF(1, 2, PHY_INTERFACE_MODE_2500BASEX, 0x1, COMPHY_FW_MODE_2500BASEX), /* lane 2 */ ETH_CONF(2, 0, PHY_INTERFACE_MODE_SGMII, 0x1, COMPHY_FW_MODE_SGMII), - ETH_CONF(2, 0, PHY_INTERFACE_MODE_2500BASEX, 0x1, COMPHY_FW_MODE_HS_SGMII), + ETH_CONF(2, 0, PHY_INTERFACE_MODE_2500BASEX, 0x1, COMPHY_FW_MODE_2500BASEX), ETH_CONF(2, 0, PHY_INTERFACE_MODE_RXAUI, 0x1, COMPHY_FW_MODE_RXAUI), ETH_CONF(2, 0, PHY_INTERFACE_MODE_10GBASER, 0x1, COMPHY_FW_MODE_XFI), GEN_CONF(2, 0, PHY_MODE_USB_HOST_SS, COMPHY_FW_MODE_USB3H), @@ -227,26 +227,26 @@ static const struct mvebu_comphy_conf mvebu_comphy_cp110_modes[] = { /* lane 3 */ GEN_CONF(3, 0, PHY_MODE_PCIE, COMPHY_FW_MODE_PCIE), ETH_CONF(3, 1, PHY_INTERFACE_MODE_SGMII, 0x2, COMPHY_FW_MODE_SGMII), - ETH_CONF(3, 1, PHY_INTERFACE_MODE_2500BASEX, 0x2, COMPHY_FW_MODE_HS_SGMII), + ETH_CONF(3, 1, PHY_INTERFACE_MODE_2500BASEX, 0x2, COMPHY_FW_MODE_2500BASEX), ETH_CONF(3, 1, PHY_INTERFACE_MODE_RXAUI, 0x1, COMPHY_FW_MODE_RXAUI), GEN_CONF(3, 1, PHY_MODE_USB_HOST_SS, COMPHY_FW_MODE_USB3H), GEN_CONF(3, 1, PHY_MODE_SATA, COMPHY_FW_MODE_SATA), /* lane 4 */ ETH_CONF(4, 0, PHY_INTERFACE_MODE_SGMII, 0x2, COMPHY_FW_MODE_SGMII), - ETH_CONF(4, 0, PHY_INTERFACE_MODE_2500BASEX, 0x2, COMPHY_FW_MODE_HS_SGMII), + ETH_CONF(4, 0, PHY_INTERFACE_MODE_2500BASEX, 0x2, COMPHY_FW_MODE_2500BASEX), ETH_CONF(4, 0, PHY_INTERFACE_MODE_10GBASER, 0x2, COMPHY_FW_MODE_XFI), ETH_CONF(4, 0, PHY_INTERFACE_MODE_RXAUI, 0x2, COMPHY_FW_MODE_RXAUI), GEN_CONF(4, 0, PHY_MODE_USB_DEVICE_SS, COMPHY_FW_MODE_USB3D), GEN_CONF(4, 1, PHY_MODE_USB_HOST_SS, COMPHY_FW_MODE_USB3H), GEN_CONF(4, 1, PHY_MODE_PCIE, COMPHY_FW_MODE_PCIE), ETH_CONF(4, 1, PHY_INTERFACE_MODE_SGMII, 0x1, COMPHY_FW_MODE_SGMII), - ETH_CONF(4, 1, PHY_INTERFACE_MODE_2500BASEX, -1, COMPHY_FW_MODE_HS_SGMII), + ETH_CONF(4, 1, PHY_INTERFACE_MODE_2500BASEX, -1, COMPHY_FW_MODE_2500BASEX), ETH_CONF(4, 1, PHY_INTERFACE_MODE_10GBASER, -1, COMPHY_FW_MODE_XFI), /* lane 5 */ ETH_CONF(5, 1, PHY_INTERFACE_MODE_RXAUI, 0x2, COMPHY_FW_MODE_RXAUI), GEN_CONF(5, 1, PHY_MODE_SATA, COMPHY_FW_MODE_SATA), ETH_CONF(5, 2, PHY_INTERFACE_MODE_SGMII, 0x1, COMPHY_FW_MODE_SGMII), - ETH_CONF(5, 2, PHY_INTERFACE_MODE_2500BASEX, 0x1, COMPHY_FW_MODE_HS_SGMII), + ETH_CONF(5, 2, PHY_INTERFACE_MODE_2500BASEX, 0x1, COMPHY_FW_MODE_2500BASEX), GEN_CONF(5, 2, PHY_MODE_PCIE, COMPHY_FW_MODE_PCIE), }; -- 2.20.1