From patchwork Wed Mar 20 12:36:55 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Murphy X-Patchwork-Id: 160658 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp236218jan; Wed, 20 Mar 2019 05:37:31 -0700 (PDT) X-Google-Smtp-Source: APXvYqx5kgdHKnnHHLLGw4dWCGN//bjj8X2UVnS5zyLs3+J4RMkOpMZ1nMrbmE9fjq6iY6GGSY4R X-Received: by 2002:a62:b40b:: with SMTP id h11mr7410034pfn.108.1553085451030; Wed, 20 Mar 2019 05:37:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553085451; cv=none; d=google.com; s=arc-20160816; b=Mc55ENgB74xlC8XQcR/kzWytJB0llugErF/EqougB92uBf7/daHbB87PMbEvT3EOHW +NdgFLVhI0HPkN1sZL7lKeJln/uAQ2/PsN1gOdv96mEMUmlxDPCIwFo1dF+J6nQbs03V 1yf1/+w9kI71hffuyD0Kr8E1GHUzurqCLeULi5eQ32Yno+2/wck2XVPWNvd+aUTESboe DqF89sn6C3imgohbkXdKdUvt4v6D8Cd2kCOyZB+woCqlo9+YtDPSnvvMIzC8TAwrmsnb 4Vgu7H/0lvrzBqpyd9ngs61wSiE77eCA8TZb/drG00c058plrLW02n2kTnm8ygqXNcjU LcdQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:message-id:date:subject:cc :to:from:dkim-signature; bh=KcdPyOwDBneVWZGmbzL8ddvTQtfe4EjO663fhCFVqEc=; b=TuTlKPLcaIbFcOXNNjua33KR37MMi9kFd8+RKnoJLiZ4YA7HvZhWVPiIVDoeW28gjZ 9uUGWg3Iv0uddufB463Ey1HjmJfkiQGuXx4yJ2tCnXzFGoRnQqX917/29+BJR/U1yNXU kIjTIxiCsq0Box3lcApg2n4zo2Lmrdo5CkaDTGdvub0RBZrY4eaS7ZMmRJcesVbWuq4e Q1oGC10fWjbkNKChXRKc6/Z8jDwALoKECJ1vvrg3SSABW6aTWT2kXwsbD4rpgRZZkdJD 8NazEi23pIJ9G3AvHs7oB9TKw5kuBNXq/3hMPsrtOdKW0Yx8TAfqlWuwsRwgqmO8YuF1 +XfA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=mejCWGbP; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id d132si1548259pgc.482.2019.03.20.05.37.30; Wed, 20 Mar 2019 05:37:31 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=mejCWGbP; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727817AbfCTMh3 (ORCPT + 31 others); Wed, 20 Mar 2019 08:37:29 -0400 Received: from lelv0143.ext.ti.com ([198.47.23.248]:51420 "EHLO lelv0143.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727366AbfCTMh2 (ORCPT ); Wed, 20 Mar 2019 08:37:28 -0400 Received: from lelv0266.itg.ti.com ([10.180.67.225]) by lelv0143.ext.ti.com (8.15.2/8.15.2) with ESMTP id x2KCbLeI013780; Wed, 20 Mar 2019 07:37:21 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1553085441; bh=KcdPyOwDBneVWZGmbzL8ddvTQtfe4EjO663fhCFVqEc=; h=From:To:CC:Subject:Date; b=mejCWGbPeP/vystmGGxF7X+UcmADZGsYE2wxNSYomKTojhFBnOqY230FM4P+pfBxH TPNZQIdp9aa4e4+no+MgwOtiiFVoRTMUnTDeaFxJLFjhN4dJqrGZu5nScdP7vKzB2x 5J7d+asV9ZfjurYQq/7RXz+AWN0SQETPDk9hKuKQ= Received: from DFLE109.ent.ti.com (dfle109.ent.ti.com [10.64.6.30]) by lelv0266.itg.ti.com (8.15.2/8.15.2) with ESMTPS id x2KCbLdl056869 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Wed, 20 Mar 2019 07:37:21 -0500 Received: from DFLE113.ent.ti.com (10.64.6.34) by DFLE109.ent.ti.com (10.64.6.30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1713.5; Wed, 20 Mar 2019 07:37:21 -0500 Received: from dlep32.itg.ti.com (157.170.170.100) by DFLE113.ent.ti.com (10.64.6.34) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.1713.5 via Frontend Transport; Wed, 20 Mar 2019 07:37:21 -0500 Received: from localhost (ileax41-snat.itg.ti.com [10.172.224.153]) by dlep32.itg.ti.com (8.14.3/8.13.8) with ESMTP id x2KCbLAi010052; Wed, 20 Mar 2019 07:37:21 -0500 From: Dan Murphy To: , CC: , , , , Dan Murphy Subject: [PATCH v2] net: phy: Add DP83825I to the DP83822 driver Date: Wed, 20 Mar 2019 07:36:55 -0500 Message-ID: <20190320123655.6289-1-dmurphy@ti.com> X-Mailer: git-send-email 2.12.2 MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add the DP83825I ethernet PHY to the DP83822 driver. These devices share the same WoL register bits and addresses. The phy_driver init was made into a macro as there may be future devices appended to this driver that will share the register space. http://www.ti.com/lit/gpn/dp83825i Reviewed-by: Florian Fainelli Signed-off-by: Dan Murphy --- v2 - Updated id and mask to new ID_MATCH macro, removed extra line - https://lore.kernel.org/patchwork/patch/1052329/ drivers/net/phy/dp83822.c | 34 ++++++++++++++++++++-------------- 1 file changed, 20 insertions(+), 14 deletions(-) -- 2.20.1.390.gb5101f9297 diff --git a/drivers/net/phy/dp83822.c b/drivers/net/phy/dp83822.c index bbd8c22067f3..97d45bd5b38e 100644 --- a/drivers/net/phy/dp83822.c +++ b/drivers/net/phy/dp83822.c @@ -15,6 +15,8 @@ #include #define DP83822_PHY_ID 0x2000a240 +#define DP83825I_PHY_ID 0x2000a150 + #define DP83822_DEVADDR 0x1f #define MII_DP83822_PHYSCR 0x11 @@ -304,26 +306,30 @@ static int dp83822_resume(struct phy_device *phydev) return 0; } +#define DP83822_PHY_DRIVER(_id, _name) \ + { \ + PHY_ID_MATCH_MODEL(_id), \ + .name = (_name), \ + .features = PHY_BASIC_FEATURES, \ + .soft_reset = dp83822_phy_reset, \ + .config_init = dp83822_config_init, \ + .get_wol = dp83822_get_wol, \ + .set_wol = dp83822_set_wol, \ + .ack_interrupt = dp83822_ack_interrupt, \ + .config_intr = dp83822_config_intr, \ + .suspend = dp83822_suspend, \ + .resume = dp83822_resume, \ + } + static struct phy_driver dp83822_driver[] = { - { - .phy_id = DP83822_PHY_ID, - .phy_id_mask = 0xfffffff0, - .name = "TI DP83822", - .features = PHY_BASIC_FEATURES, - .config_init = dp83822_config_init, - .soft_reset = dp83822_phy_reset, - .get_wol = dp83822_get_wol, - .set_wol = dp83822_set_wol, - .ack_interrupt = dp83822_ack_interrupt, - .config_intr = dp83822_config_intr, - .suspend = dp83822_suspend, - .resume = dp83822_resume, - }, + DP83822_PHY_DRIVER(DP83822_PHY_ID, "TI DP83822"), + DP83822_PHY_DRIVER(DP83825I_PHY_ID, "TI DP83825I"), }; module_phy_driver(dp83822_driver); static struct mdio_device_id __maybe_unused dp83822_tbl[] = { { DP83822_PHY_ID, 0xfffffff0 }, + { DP83825I_PHY_ID, 0xfffffff0 }, { }, }; MODULE_DEVICE_TABLE(mdio, dp83822_tbl);