From patchwork Thu Mar 22 22:31:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathias Kresin X-Patchwork-Id: 889711 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=kresin.me Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=kresin-me.20150623.gappssmtp.com header.i=@kresin-me.20150623.gappssmtp.com header.b="Duui7B+u"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 406hML3SCTz9s1P for ; Fri, 23 Mar 2018 09:35:26 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752145AbeCVWeM (ORCPT ); Thu, 22 Mar 2018 18:34:12 -0400 Received: from mail-wr0-f196.google.com ([209.85.128.196]:44985 "EHLO mail-wr0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751632AbeCVWeI (ORCPT ); Thu, 22 Mar 2018 18:34:08 -0400 Received: by mail-wr0-f196.google.com with SMTP id u46so10276648wrc.11 for ; Thu, 22 Mar 2018 15:34:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kresin-me.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=qgSjEyj1LCysEUZXObnYIytp1a7S0T9Py6UgNmVpHss=; b=Duui7B+u+iJ5BsL+LB/um+EcDGmC01WHL27TH2LjQf2T8wBA2ACkJBNfMMRI547oM5 ZmoakJCHel+hS0gHfCh1+RkHweNHx6+sVeVNlpUlTrp0w074+2mqxWXZ4nSVeFoWfjW8 8iZ5v8gcquoEWWP5rnncTCuazaHGtFCZ2ajYffo/Ki5amZDrfHIOw+vD9Bty/4Nkzjl1 zph+3YN/oU3VhR8ok5RB/p94mE1OoNXWpftLHkJpcHAoATdOmJ7hizpTmLg7FJuimBBc MV+L0zzWEaT0o1QpSnDjGYZ2TVw1V1Nw+YlbZqBlZSmBXZ85Z4lEn2QktcOa6X6QpBE0 GTRQ== 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; bh=qgSjEyj1LCysEUZXObnYIytp1a7S0T9Py6UgNmVpHss=; b=S5sMJ7ANdueTgc3iEIcjPkL1NfjfvgUiZazebu/Nq0Oo61rjniKiXczWBjTzXP6mlf uckuBUBLzo/faeZG1WYn0fy4FIBqxzn4QWtl583r1m5mCUjtWuyEWOPQFOJTOwXnLwov VnqTFIsTrekPCbY/id/Voq3RSGH4jkMZYonEQI99yKrXcz3vKwThpfHTEHByckRRh9KN qSQXDVMH5NxuKSTxXqVfq8Rxs/qd0bQH7aM7dowlumXk1Nr0xQwN9qMeiv8lyBTtIsnl BKlbtGhEHD7ZugVTBUo7FrjiYCrqW0jTvjnWMBV63BED48bcv81MU1XkjL/uaLdp2VoW I47A== X-Gm-Message-State: AElRT7H92Ta9q3B5Y0qDk1eOBPcpV/8J5jxzPM7Aa4D7b/jY9y8XjRAS e1CVrYfgfZKTElQDADcS2Zmmag== X-Google-Smtp-Source: AG47ELuaLzGZnRQGkLFXab+iI+kwMSZ3ui+fxiVz+z1horoeNkUPTB8f7GSbrdy7TOrGyThabTZZDA== X-Received: by 10.223.181.148 with SMTP id c20mr16345207wre.65.1521758046668; Thu, 22 Mar 2018 15:34:06 -0700 (PDT) Received: from desktop.wvd.kresin.me (p2003008C2F1C6400A13E2F695A539B1D.dip0.t-ipconnect.de. [2003:8c:2f1c:6400:a13e:2f69:5a53:9b1d]) by smtp.gmail.com with ESMTPSA id 14sm11163805wml.41.2018.03.22.15.34.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 22 Mar 2018 15:34:06 -0700 (PDT) From: Mathias Kresin To: andrew@lunn.ch, f.fainelli@gmail.com, hauke@hauke-m.de Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/2] net: phy: intel-xway: add VR9 version number Date: Thu, 22 Mar 2018 23:31:38 +0100 Message-Id: <1521757899-27813-1-git-send-email-dev@kresin.me> X-Mailer: git-send-email 2.7.4 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The VR9 phy ids are matching only for the SoC version 1.2. Rename the macros and change the names to take this into account. Signed-off-by: Mathias Kresin --- drivers/net/phy/intel-xway.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/net/phy/intel-xway.c b/drivers/net/phy/intel-xway.c index a11f80c..c7eff67 100644 --- a/drivers/net/phy/intel-xway.c +++ b/drivers/net/phy/intel-xway.c @@ -149,8 +149,8 @@ #define PHY_ID_PHY22F_1_4 0xD565A410 #define PHY_ID_PHY11G_1_5 0xD565A401 #define PHY_ID_PHY22F_1_5 0xD565A411 -#define PHY_ID_PHY11G_VR9 0xD565A409 -#define PHY_ID_PHY22F_VR9 0xD565A419 +#define PHY_ID_PHY11G_VR9_1_2 0xD565A409 +#define PHY_ID_PHY22F_VR9_1_2 0xD565A419 static int xway_gphy_config_init(struct phy_device *phydev) { @@ -312,9 +312,9 @@ static struct phy_driver xway_gphy[] = { .suspend = genphy_suspend, .resume = genphy_resume, }, { - .phy_id = PHY_ID_PHY11G_VR9, + .phy_id = PHY_ID_PHY11G_VR9_1_2, .phy_id_mask = 0xffffffff, - .name = "Intel XWAY PHY11G (xRX integrated)", + .name = "Intel XWAY PHY11G (xRX v1.2 integrated)", .features = PHY_GBIT_FEATURES, .flags = PHY_HAS_INTERRUPT, .config_init = xway_gphy_config_init, @@ -324,9 +324,9 @@ static struct phy_driver xway_gphy[] = { .suspend = genphy_suspend, .resume = genphy_resume, }, { - .phy_id = PHY_ID_PHY22F_VR9, + .phy_id = PHY_ID_PHY22F_VR9_1_2, .phy_id_mask = 0xffffffff, - .name = "Intel XWAY PHY22F (xRX integrated)", + .name = "Intel XWAY PHY22F (xRX v1.2 integrated)", .features = PHY_BASIC_FEATURES, .flags = PHY_HAS_INTERRUPT, .config_init = xway_gphy_config_init, @@ -346,8 +346,8 @@ static struct mdio_device_id __maybe_unused xway_gphy_tbl[] = { { PHY_ID_PHY22F_1_4, 0xffffffff }, { PHY_ID_PHY11G_1_5, 0xffffffff }, { PHY_ID_PHY22F_1_5, 0xffffffff }, - { PHY_ID_PHY11G_VR9, 0xffffffff }, - { PHY_ID_PHY22F_VR9, 0xffffffff }, + { PHY_ID_PHY11G_VR9_1_2, 0xffffffff }, + { PHY_ID_PHY22F_VR9_1_2, 0xffffffff }, { } }; MODULE_DEVICE_TABLE(mdio, xway_gphy_tbl); From patchwork Thu Mar 22 22:31:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathias Kresin X-Patchwork-Id: 889712 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=kresin.me Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=kresin-me.20150623.gappssmtp.com header.i=@kresin-me.20150623.gappssmtp.com header.b="VvZXuKto"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 406hMX1pFfz9s1P for ; Fri, 23 Mar 2018 09:35:36 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752109AbeCVWeM (ORCPT ); Thu, 22 Mar 2018 18:34:12 -0400 Received: from mail-wr0-f195.google.com ([209.85.128.195]:42866 "EHLO mail-wr0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751999AbeCVWeJ (ORCPT ); Thu, 22 Mar 2018 18:34:09 -0400 Received: by mail-wr0-f195.google.com with SMTP id s18so10271461wrg.9 for ; Thu, 22 Mar 2018 15:34:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kresin-me.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=5zP1Xm9jGZS4VnZDsi5sl2WoTNbp8MuErgX1ZDSL6m8=; b=VvZXuKto0uGHpACwtnuS9Akf85JwUTUW1uNRM2PdWiS9lQvCIxzbe3WJbhze48ERCY fiiztYCjH7TAmawUgG6UfMaFqOKcbe7kpqddDOKzKxXWTAMdS8OtF8lJJ8a+hKR+IwVb SaRbSQzYplVACTf+W0aqX/JUAyCekwX3Oq61CbFu02DJDjuMGf5ksRaq6DN0u5Qijd/o 4IliuLVCUpyTY+xjBYCWQrA2kDd1uCB2BU6Nio1ryA78TJt4s2ZiNsxHgnBzk39ue2e0 LqTfGT4jm1GsG/SI0STpfRfM8wyHGISvBogBcj871iwLTue1SRYypPC0hxuzk5s8QPIs h5uA== 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; bh=5zP1Xm9jGZS4VnZDsi5sl2WoTNbp8MuErgX1ZDSL6m8=; b=r54quyjW/zQ8FxNFH1OazAqbR1ykqoVhANXIVH7QQuP65WDzR+mcxbFx2TbIGcPvSe ZO9ypK+oAUAPT/ITXxXZBF8AhYWHmvUYkj65a4EO1rDKI5KwP7l4gzEjNhLcmJGsJ3e/ JfSoiy4K0vbFbbFFgmHhyIjAOKyZP2fjO9emwv0uppz/kJzsrc7r2mL1p27Xxu5JvmM9 /zw8oS8wMWz/HGH4039wvcZFl7jE9JwhPn68u1jrSgQWd9gBF7miF2Zqr26FsNpxg5zJ OmBW5yMEgyodRhi9BcGCYWV1cPiJ+JXG9C/rXAf5RUwx3cjTiWM4qTfbBIjbshnlWXy5 vCQg== X-Gm-Message-State: AElRT7E0NL2i1fF3OCcqN/4chrnFwDMSGXs5CElf3ft0tFNTHPWuUMaF g4LQTGLIQUTRVt0DBC8/e3/QrQ== X-Google-Smtp-Source: AG47ELuOR+sqFjDkseRDViXZ+uCBUh7CLaBlSLQozosFdeQkDubvsAkcAkcW5YG1bOB1XMjl3O2MkA== X-Received: by 10.223.171.164 with SMTP id s33mr22015621wrc.181.1521758047623; Thu, 22 Mar 2018 15:34:07 -0700 (PDT) Received: from desktop.wvd.kresin.me (p2003008C2F1C6400A13E2F695A539B1D.dip0.t-ipconnect.de. [2003:8c:2f1c:6400:a13e:2f69:5a53:9b1d]) by smtp.gmail.com with ESMTPSA id 14sm11163805wml.41.2018.03.22.15.34.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 22 Mar 2018 15:34:07 -0700 (PDT) From: Mathias Kresin To: andrew@lunn.ch, f.fainelli@gmail.com, hauke@hauke-m.de Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/2] net: phy: intel-xway: add VR9 v1.1 phy ids Date: Thu, 22 Mar 2018 23:31:39 +0100 Message-Id: <1521757899-27813-2-git-send-email-dev@kresin.me> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1521757899-27813-1-git-send-email-dev@kresin.me> References: <1521757899-27813-1-git-send-email-dev@kresin.me> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The phys embedded into the v1.1 of the VR9 SoC are using different phy ids. Add the phy ids to use the driver for this VR9 version as well. Signed-off-by: Mathias Kresin --- drivers/net/phy/intel-xway.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/drivers/net/phy/intel-xway.c b/drivers/net/phy/intel-xway.c index c7eff67..7d936fb 100644 --- a/drivers/net/phy/intel-xway.c +++ b/drivers/net/phy/intel-xway.c @@ -149,6 +149,8 @@ #define PHY_ID_PHY22F_1_4 0xD565A410 #define PHY_ID_PHY11G_1_5 0xD565A401 #define PHY_ID_PHY22F_1_5 0xD565A411 +#define PHY_ID_PHY11G_VR9_1_1 0xD565A408 +#define PHY_ID_PHY22F_VR9_1_1 0xD565A418 #define PHY_ID_PHY11G_VR9_1_2 0xD565A409 #define PHY_ID_PHY22F_VR9_1_2 0xD565A419 @@ -312,6 +314,30 @@ static struct phy_driver xway_gphy[] = { .suspend = genphy_suspend, .resume = genphy_resume, }, { + .phy_id = PHY_ID_PHY11G_VR9_1_1, + .phy_id_mask = 0xffffffff, + .name = "Intel XWAY PHY11G (xRX v1.1 integrated)", + .features = PHY_GBIT_FEATURES, + .flags = PHY_HAS_INTERRUPT, + .config_init = xway_gphy_config_init, + .ack_interrupt = xway_gphy_ack_interrupt, + .did_interrupt = xway_gphy_did_interrupt, + .config_intr = xway_gphy_config_intr, + .suspend = genphy_suspend, + .resume = genphy_resume, + }, { + .phy_id = PHY_ID_PHY22F_VR9_1_1, + .phy_id_mask = 0xffffffff, + .name = "Intel XWAY PHY22F (xRX v1.1 integrated)", + .features = PHY_BASIC_FEATURES, + .flags = PHY_HAS_INTERRUPT, + .config_init = xway_gphy_config_init, + .ack_interrupt = xway_gphy_ack_interrupt, + .did_interrupt = xway_gphy_did_interrupt, + .config_intr = xway_gphy_config_intr, + .suspend = genphy_suspend, + .resume = genphy_resume, + }, { .phy_id = PHY_ID_PHY11G_VR9_1_2, .phy_id_mask = 0xffffffff, .name = "Intel XWAY PHY11G (xRX v1.2 integrated)", @@ -346,6 +372,8 @@ static struct mdio_device_id __maybe_unused xway_gphy_tbl[] = { { PHY_ID_PHY22F_1_4, 0xffffffff }, { PHY_ID_PHY11G_1_5, 0xffffffff }, { PHY_ID_PHY22F_1_5, 0xffffffff }, + { PHY_ID_PHY11G_VR9_1_1, 0xffffffff }, + { PHY_ID_PHY22F_VR9_1_1, 0xffffffff }, { PHY_ID_PHY11G_VR9_1_2, 0xffffffff }, { PHY_ID_PHY22F_VR9_1_2, 0xffffffff }, { }