Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Soha Jin <soha@lohu.info>
To:     Giuseppe Cavallaro <peppe.cavallaro@st.com>,
        Alexandre Torgue <alexandre.torgue@foss.st.com>,
        Jose Abreu <joabreu@synopsys.com>,
        "David S. Miller" <davem@davemloft.net>,
        Eric Dumazet <edumazet@google.com>,
        Jakub Kicinski <kuba@kernel.org>,
        Paolo Abeni <pabeni@redhat.com>
Cc:     Yangyu Chen <cyy@cyyself.name>, netdev@vger.kernel.org,
        linux-kernel@vger.kernel.org, Soha Jin <soha@lohu.info>
Subject: [PATCH 2/3] net: stmmac: add Phytium's PHYT0004 to dwmac-generic compatible devices
Date:   Mon, 10 Oct 2022 00:22:46 +0800
Message-Id: <20221009162247.1336-3-soha@lohu.info>
In-Reply-To: <20221009162247.1336-1-soha@lohu.info>
References: <20221009162247.1336-1-soha@lohu.info>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Feedback-ID: bizesmtp:lohu.info:qybglogicsvr:qybglogicsvr3
Precedence: bulk

Phytium's GMAC devices (ACPI HID: PHYT0004) can be run by DWMAC's generic
driver, add it to the match table.

Signed-off-by: Soha Jin <soha@lohu.info>
Tested-by: Yangyu Chen <cyy@cyyself.name>
---
 drivers/net/ethernet/stmicro/stmmac/dwmac-generic.c | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-generic.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-generic.c
index 4d272605a8b7..bde827bc7b72 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-generic.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-generic.c
@@ -66,7 +66,7 @@ static int dwmac_generic_probe(struct platform_device *pdev)
 	return ret;
 }
 
-static const struct of_device_id dwmac_generic_match[] = {
+static const struct of_device_id dwmac_generic_match_of[] = {
 	{ .compatible = "st,spear600-gmac"},
 	{ .compatible = "snps,dwmac-3.40a"},
 	{ .compatible = "snps,dwmac-3.50a"},
@@ -80,7 +80,13 @@ static const struct of_device_id dwmac_generic_match[] = {
 	{ .compatible = "snps,dwxgmac"},
 	{ }
 };
-MODULE_DEVICE_TABLE(of, dwmac_generic_match);
+MODULE_DEVICE_TABLE(of, dwmac_generic_match_of);
+
+static const struct acpi_device_id dwmac_generic_match_acpi[] = {
+	{"PHYT0004"},
+	{}
+};
+MODULE_DEVICE_TABLE(acpi, dwmac_generic_match_acpi);
 
 static struct platform_driver dwmac_generic_driver = {
 	.probe  = dwmac_generic_probe,
@@ -88,7 +94,8 @@ static struct platform_driver dwmac_generic_driver = {
 	.driver = {
 		.name           = STMMAC_RESOURCE_NAME,
 		.pm		= &stmmac_pltfr_pm_ops,
-		.of_match_table = of_match_ptr(dwmac_generic_match),
+		.of_match_table = dwmac_generic_match_of,
+		.acpi_match_table = dwmac_generic_match_acpi
 	},
 };
 module_platform_driver(dwmac_generic_driver);
-- 
2.30.2