linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: hanjun.guo@linaro.org (Hanjun Guo)
To: linux-arm-kernel@lists.infradead.org
Subject: [RFC PATCH for Juno 1/2] net: smsc911x add support for probing from ACPI
Date: Mon,  1 Sep 2014 23:06:00 +0800	[thread overview]
Message-ID: <1409583961-7466-2-git-send-email-hanjun.guo@linaro.org> (raw)
In-Reply-To: <1409583961-7466-1-git-send-email-hanjun.guo@linaro.org>

From: Graeme Gregory <graeme.gregory@linaro.org>

This is a standard platform device to resources are converted in the
ACPI core in the same fasion as DT resources. For the other DT
provided information there is _DSD for ACPI.

Signed-off-by: Graeme Gregory <graeme.gregory@linaro.org>
---
 drivers/net/ethernet/smsc/smsc911x.c |   38 ++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/drivers/net/ethernet/smsc/smsc911x.c b/drivers/net/ethernet/smsc/smsc911x.c
index 5e13fa5..69d725a 100644
--- a/drivers/net/ethernet/smsc/smsc911x.c
+++ b/drivers/net/ethernet/smsc/smsc911x.c
@@ -59,6 +59,7 @@
 #include <linux/of_device.h>
 #include <linux/of_gpio.h>
 #include <linux/of_net.h>
+#include <linux/acpi.h>
 #include "smsc911x.h"
 
 #define SMSC_CHIPNAME		"smsc911x"
@@ -2369,9 +2370,36 @@ static inline int smsc911x_probe_config_dt(
 }
 #endif /* CONFIG_OF */
 
+#ifdef CONFIG_ACPI
+/* Configure some sensible defaults for ACPI mode */
+static int smsc911x_probe_config_acpi(struct smsc911x_platform_config *config,
+				    acpi_handle *ahandle)
+{
+	if (!ahandle)
+		return -ENOSYS;
+
+	config->phy_interface = PHY_INTERFACE_MODE_MII;
+
+	config->flags |= SMSC911X_USE_32BIT;
+
+	config->irq_polarity = SMSC911X_IRQ_POLARITY_ACTIVE_HIGH;
+
+	config->irq_type = SMSC911X_IRQ_TYPE_PUSH_PULL;
+
+	return 0;
+}
+#else
+static int smsc911x_probe_config_acpi(struct smsc911x_platform_config *config,
+				      acpi_handle *ahandle)
+{
+	return -ENOSYS;
+}
+#endif /* CONFIG_ACPI */
+
 static int smsc911x_drv_probe(struct platform_device *pdev)
 {
 	struct device_node *np = pdev->dev.of_node;
+	acpi_handle *ahandle = ACPI_HANDLE(&pdev->dev);
 	struct net_device *dev;
 	struct smsc911x_data *pdata;
 	struct smsc911x_platform_config *config = dev_get_platdata(&pdev->dev);
@@ -2436,6 +2464,9 @@ static int smsc911x_drv_probe(struct platform_device *pdev)
 	}
 
 	retval = smsc911x_probe_config_dt(&pdata->config, np);
+	if (retval)
+		retval = smsc911x_probe_config_acpi(&pdata->config, ahandle);
+
 	if (retval && config) {
 		/* copy config parameters across to pdata */
 		memcpy(&pdata->config, config, sizeof(pdata->config));
@@ -2606,6 +2637,12 @@ static const struct of_device_id smsc911x_dt_ids[] = {
 MODULE_DEVICE_TABLE(of, smsc911x_dt_ids);
 #endif
 
+static const struct acpi_device_id smsc911x_acpi_ids[] = {
+	{ "LNRO001B", },
+	{ "ARMH9118", },
+	{ }
+};
+
 static struct platform_driver smsc911x_driver = {
 	.probe = smsc911x_drv_probe,
 	.remove = smsc911x_drv_remove,
@@ -2614,6 +2651,7 @@ static struct platform_driver smsc911x_driver = {
 		.owner	= THIS_MODULE,
 		.pm	= SMSC911X_PM_OPS,
 		.of_match_table = of_match_ptr(smsc911x_dt_ids),
+		.acpi_match_table = ACPI_PTR(smsc911x_acpi_ids),
 	},
 };
 
-- 
1.7.9.5

  reply	other threads:[~2014-09-01 15:06 UTC|newest]

Thread overview: 37+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-09-01 15:05 [RFC PATCH for Juno 0/2] Drivers for Juno to boot from ACPI Hanjun Guo
2014-09-01 15:06 ` Hanjun Guo [this message]
2014-09-01 15:17   ` [Linaro-acpi] [RFC PATCH for Juno 1/2] net: smsc911x add support for probing " Arnd Bergmann
2014-09-01 15:28     ` Graeme Gregory
2014-09-01 15:32       ` Arnd Bergmann
2014-09-01 16:53       ` Catalin Marinas
2014-09-01 16:58         ` Mark Brown
2014-09-01 17:08           ` Sudeep Holla
2014-09-01 17:14             ` Catalin Marinas
2014-09-01 17:33               ` Sudeep Holla
2014-09-01 17:03         ` Graeme Gregory
2014-09-15  4:08       ` Grant Likely
2014-09-15  9:24         ` Catalin Marinas
2014-09-01 17:04   ` Catalin Marinas
2014-09-01 17:11     ` Arnd Bergmann
2014-09-01 17:27       ` Catalin Marinas
2014-09-01 17:32       ` Graeme Gregory
2014-09-01 18:11         ` Mark Brown
2014-09-02 13:26         ` Catalin Marinas
2014-09-02 13:42           ` [Linaro-acpi] " Arnd Bergmann
2014-09-02 16:26             ` Mark Brown
2014-09-02 23:00               ` Rafael J. Wysocki
2014-09-03 15:09                 ` Arnd Bergmann
2014-09-09  6:51                   ` Jon Masters
2014-09-15  4:14       ` Grant Likely
2014-09-15 16:12         ` Mark Brown
2014-09-01 15:06 ` [RFC PATCH for Juno 2/2] tty: SBSA compatible UART Hanjun Guo
2014-09-01 15:26   ` Mark Brown
2014-09-01 17:12   ` Catalin Marinas
2014-09-01 17:18     ` Graeme Gregory
2014-09-01 17:29       ` Catalin Marinas
2014-09-01 15:29 ` [RFC PATCH for Juno 0/2] Drivers for Juno to boot from ACPI Arnd Bergmann
2014-09-09  6:55   ` Jon Masters
2014-09-09 10:55     ` Arnd Bergmann
2014-09-09 14:13       ` Jon Masters
2014-09-15 22:57       ` Grant Likely
2014-09-15 23:00         ` Jon Masters

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1409583961-7466-2-git-send-email-hanjun.guo@linaro.org \
    --to=hanjun.guo@linaro.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).