From patchwork Tue Mar 19 18:32:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Murphy X-Patchwork-Id: 160612 Delivered-To: patch@linaro.org Received: by 2002:a02:5cc1:0:0:0:0:0 with SMTP id w62csp4199993jad; Tue, 19 Mar 2019 11:33:24 -0700 (PDT) X-Google-Smtp-Source: APXvYqyqg40ap9W7SKfLSFtTbzX1440to92fxVQ+dsEgO5cqNz6V5JasyIuB4xEt2ODv6F90fzVw X-Received: by 2002:a65:4145:: with SMTP id x5mr3087739pgp.144.1553020404718; Tue, 19 Mar 2019 11:33:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553020404; cv=none; d=google.com; s=arc-20160816; b=NY234qeHm4dPEA7VYQQBCafqFqRZ4CN9vaFQ4wYc8tgR9I8T2ITuYygGkeRFlIU6DD 5t/ebQeXyzAiWbMUDtqsGZtArs49vFZqmZeNT29IUnGn+8yg0ECkzCsEJP9bWLG0XnEc +ZaKR8aiCGMezk0hRiB/WYCJ0gXuxS//A6cKE22NvaSd676DZzBupYQGmt9oLOnZBul4 s1FE1SpFlxuYbqIvprSfYI8qtn41VjHmeFivQo7/Z+PDMQT+Bf3ZGL0jHh26PXS7pFqe S20v/mbQujx2pj66w+FE5SEy2PaZQATfivSXoA/aGrgZ8CForQt09AfjI6jCYRhgfJJO wJUA== 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=j9WG3homOTDAhTLIiWDJ+alfI+kbBYTrFWFNC81eTj8=; b=f1yigFAq8qcyjJ09AHK9yaZ6vHCj04twUrm5pzr+6dVAWtG6b35E4g4JL8VKmwR9PD 3ELy3KBEt8qt1vez7YqztfhgypJLUQi+RQjY2YmgIcXLglyTpfQYfdNsBWFaBrjqajQJ UVsSn4ApxB7EiVIqnfyiK1t3X4wbKNCODvAAOgSBwlasx5pKSvZvKh6vyFRTWf6QODnl sUUKsDGcBqEMQX4HDeDf9ytrfFktb9ky2N/IIAxhNpdkSWWi5wNz7/LJZ8rus6lI2Uq0 jvV+XoK60AGHVHEZEGOze0bDRrqo1ChGPH8ee8eOoQ7qlhDbM8aZuDuELRrehoPSSUcQ k9Ew== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=R342p9eY; 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 g10si12224708pge.304.2019.03.19.11.33.24; Tue, 19 Mar 2019 11:33:24 -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=R342p9eY; 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 S1727542AbfCSSdW (ORCPT + 31 others); Tue, 19 Mar 2019 14:33:22 -0400 Received: from fllv0015.ext.ti.com ([198.47.19.141]:41624 "EHLO fllv0015.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726939AbfCSSdW (ORCPT ); Tue, 19 Mar 2019 14:33:22 -0400 Received: from fllv0034.itg.ti.com ([10.64.40.246]) by fllv0015.ext.ti.com (8.15.2/8.15.2) with ESMTP id x2JIXGsX117654; Tue, 19 Mar 2019 13:33:16 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1553020396; bh=j9WG3homOTDAhTLIiWDJ+alfI+kbBYTrFWFNC81eTj8=; h=From:To:CC:Subject:Date; b=R342p9eYQBjjaVLqP4p24Nj7kOdTMt6hwe5cdc2Ka9V6iIc55HUlHuhYUiHyLa7Wb lQ8/T3XwG9wRtxGx7B8c8E2vIGTqSxWgdF8PghAC7610r+QLr6NQsM/iKzGqxmYfQe vPlAcfCOjxIZu95mmT0IaIxOnKBAQFJ+WfBcTyk4= Received: from DLEE115.ent.ti.com (dlee115.ent.ti.com [157.170.170.26]) by fllv0034.itg.ti.com (8.15.2/8.15.2) with ESMTPS id x2JIXGWo051635 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Tue, 19 Mar 2019 13:33:16 -0500 Received: from DLEE108.ent.ti.com (157.170.170.38) by DLEE115.ent.ti.com (157.170.170.26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1713.5; Tue, 19 Mar 2019 13:33:15 -0500 Received: from dlep32.itg.ti.com (157.170.170.100) by DLEE108.ent.ti.com (157.170.170.38) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.1713.5 via Frontend Transport; Tue, 19 Mar 2019 13:33:15 -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 x2JIXF1B031293; Tue, 19 Mar 2019 13:33:15 -0500 From: Dan Murphy To: , CC: , , , , Dan Murphy Subject: [PATCH] net: phy: Add DP83825I to the DP83822 driver Date: Tue, 19 Mar 2019 13:32:51 -0500 Message-ID: <20190319183251.403-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 Signed-off-by: Dan Murphy --- drivers/net/phy/dp83822.c | 36 ++++++++++++++++++++++-------------- 1 file changed, 22 insertions(+), 14 deletions(-) -- 2.20.1.390.gb5101f9297 Reviewed-by: Florian Fainelli diff --git a/drivers/net/phy/dp83822.c b/drivers/net/phy/dp83822.c index bbd8c22067f3..02dc05b86326 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,32 @@ static int dp83822_resume(struct phy_device *phydev) return 0; } +#define DP83822_PHY_DRIVER(_id, _name) \ + { \ + .phy_id = _id, \ + .phy_id_mask = 0xfffffff0, \ + .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);