From: Marek Vasut <marex@denx.de>
To: netdev@vger.kernel.org
Cc: Marek Vasut <marex@denx.de>, Andrew Lunn <andrew@lunn.ch>,
Florian Fainelli <f.fainelli@gmail.com>,
Guenter Roeck <linux@roeck-us.net>,
Heiner Kallweit <hkallweit1@gmail.com>,
Jean Delvare <jdelvare@suse.com>,
linux-hwmon@vger.kernel.org
Subject: [PATCH V2] net: phy: tja11xx: Add IRQ support to the driver
Date: Tue, 28 May 2019 21:23:24 +0200 [thread overview]
Message-ID: <20190528192324.28862-1-marex@denx.de> (raw)
Add support for handling the TJA11xx PHY IRQ signal.
Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Andrew Lunn <andrew@lunn.ch>
Cc: Florian Fainelli <f.fainelli@gmail.com>
Cc: Guenter Roeck <linux@roeck-us.net>
Cc: Heiner Kallweit <hkallweit1@gmail.com>
Cc: Jean Delvare <jdelvare@suse.com>
Cc: linux-hwmon@vger.kernel.org
---
V2: - Define each bit of the MII_INTEN register and a mask
- Drop IRQ acking from tja11xx_config_intr()
---
drivers/net/phy/nxp-tja11xx.c | 48 +++++++++++++++++++++++++++++++++++
1 file changed, 48 insertions(+)
diff --git a/drivers/net/phy/nxp-tja11xx.c b/drivers/net/phy/nxp-tja11xx.c
index b705d0bd798b..b41af609607d 100644
--- a/drivers/net/phy/nxp-tja11xx.c
+++ b/drivers/net/phy/nxp-tja11xx.c
@@ -40,6 +40,29 @@
#define MII_INTSRC_TEMP_ERR BIT(1)
#define MII_INTSRC_UV_ERR BIT(3)
+#define MII_INTEN 22
+#define MII_INTEN_PWON_EN BIT(15)
+#define MII_INTEN_WAKEUP_EN BIT(14)
+#define MII_INTEN_PHY_INIT_FAIL_EN BIT(11)
+#define MII_INTEN_LINK_STATUS_FAIL_EN BIT(10)
+#define MII_INTEN_LINK_STATUS_UP_EN BIT(9)
+#define MII_INTEN_SYM_ERR_EN BIT(8)
+#define MII_INTEN_TRAINING_FAILED_EN BIT(7)
+#define MII_INTEN_SQI_WARNING_EN BIT(6)
+#define MII_INTEN_CONTROL_ERR_EN BIT(5)
+#define MII_INTEN_UV_ERR_EN BIT(3)
+#define MII_INTEN_UV_RECOVERY_EN BIT(2)
+#define MII_INTEN_TEMP_ERR_EN BIT(1)
+#define MII_INTEN_SLEEP_ABORT_EN BIT(0)
+#define MII_INTEN_MASK \
+ (MII_INTEN_PWON_EN | MII_INTEN_WAKEUP_EN | \
+ MII_INTEN_PHY_INIT_FAIL_EN | MII_INTEN_LINK_STATUS_FAIL_EN | \
+ MII_INTEN_LINK_STATUS_UP_EN | MII_INTEN_SYM_ERR_EN | \
+ MII_INTEN_TRAINING_FAILED_EN | MII_INTEN_SQI_WARNING_EN | \
+ MII_INTEN_CONTROL_ERR_EN | MII_INTEN_UV_ERR_EN | \
+ MII_INTEN_UV_RECOVERY_EN | MII_INTEN_TEMP_ERR_EN | \
+ MII_INTEN_SLEEP_ABORT_EN)
+
#define MII_COMMSTAT 23
#define MII_COMMSTAT_LINK_UP BIT(15)
@@ -239,6 +262,25 @@ static int tja11xx_read_status(struct phy_device *phydev)
return 0;
}
+static int tja11xx_config_intr(struct phy_device *phydev)
+{
+ int ret;
+
+ if (phydev->interrupts == PHY_INTERRUPT_ENABLED)
+ ret = phy_write(phydev, MII_INTEN, MII_INTEN_MASK);
+ else
+ ret = phy_write(phydev, MII_INTEN, 0);
+
+ return ret < 0 ? ret : 0;
+}
+
+static int tja11xx_ack_interrupt(struct phy_device *phydev)
+{
+ int ret = phy_read(phydev, MII_INTSRC);
+
+ return ret < 0 ? ret : 0;
+}
+
static int tja11xx_get_sset_count(struct phy_device *phydev)
{
return ARRAY_SIZE(tja11xx_hw_stats);
@@ -366,6 +408,9 @@ static struct phy_driver tja11xx_driver[] = {
.suspend = genphy_suspend,
.resume = genphy_resume,
.set_loopback = genphy_loopback,
+ /* IRQ related */
+ .config_intr = tja11xx_config_intr,
+ .ack_interrupt = tja11xx_ack_interrupt,
/* Statistics */
.get_sset_count = tja11xx_get_sset_count,
.get_strings = tja11xx_get_strings,
@@ -381,6 +426,9 @@ static struct phy_driver tja11xx_driver[] = {
.suspend = genphy_suspend,
.resume = genphy_resume,
.set_loopback = genphy_loopback,
+ /* IRQ related */
+ .config_intr = tja11xx_config_intr,
+ .ack_interrupt = tja11xx_ack_interrupt,
/* Statistics */
.get_sset_count = tja11xx_get_sset_count,
.get_strings = tja11xx_get_strings,
--
2.20.1
next reply other threads:[~2019-05-28 19:24 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-28 19:23 Marek Vasut [this message]
2019-05-28 19:28 ` [PATCH V2] net: phy: tja11xx: Add IRQ support to the driver Heiner Kallweit
2019-05-28 19:31 ` Marek Vasut
2019-05-28 19:35 ` Heiner Kallweit
2019-05-28 19:46 ` Marek Vasut
2019-05-28 19:58 ` Andrew Lunn
2019-05-28 20:00 ` Marek Vasut
2019-05-28 21:22 ` Andrew Lunn
2019-05-28 21:33 ` Marek Vasut
2019-05-29 23:29 ` Andrew Lunn
2019-05-29 23:46 ` Marek Vasut
2019-06-13 15:42 ` Marek Vasut
2019-06-17 17:16 ` Andrew Lunn
2019-06-17 17:43 ` Marek Vasut
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=20190528192324.28862-1-marex@denx.de \
--to=marex@denx.de \
--cc=andrew@lunn.ch \
--cc=f.fainelli@gmail.com \
--cc=hkallweit1@gmail.com \
--cc=jdelvare@suse.com \
--cc=linux-hwmon@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=netdev@vger.kernel.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).