From: Kory Maincent (Dent Project) <kory.maincent@xxxxxxxxxxx>
Add support for devm_pse_irq_helper(), a wrapper for
devm_regulator_irq_helper(). This aims to report events such as
over-current or over-temperature conditions similarly to how the regulator
API handles them. Additionally, this patch introduces several define
wrappers to keep regulator naming conventions out of PSE drivers.
Signed-off-by: Kory Maincent <kory.maincent@xxxxxxxxxxx>
---
drivers/net/pse-pd/pse_core.c | 32 +++++++++++++++++++++++++++++++-
include/linux/pse-pd/pse.h | 24 ++++++++++++++++++++++++
2 files changed, 55 insertions(+), 1 deletion(-)
diff --git a/drivers/net/pse-pd/pse_core.c b/drivers/net/pse-pd/pse_core.c
index d365fb7c8a98..a9f102507f5e 100644
--- a/drivers/net/pse-pd/pse_core.c
+++ b/drivers/net/pse-pd/pse_core.c
@@ -8,7 +8,6 @@
#include <linux/device.h>
#include <linux/of.h>
#include <linux/pse-pd/pse.h>
-#include <linux/regulator/driver.h>
#include <linux/regulator/machine.h>
static DEFINE_MUTEX(pse_list_mutex);
@@ -536,6 +535,37 @@ int devm_pse_controller_register(struct device *dev,
}
EXPORT_SYMBOL_GPL(devm_pse_controller_register);
+int devm_pse_irq_helper(struct pse_controller_dev *pcdev, int irq,
+ int irq_flags, int supported_errs,
+ const struct pse_irq_desc *d)
+{
+ struct regulator_dev **rdevs;
+ void *irq_helper;
+ int i;
+
+ rdevs = devm_kcalloc(pcdev->dev, pcdev->nr_lines,
+ sizeof(struct regulator_dev *), GFP_KERNEL);
+ if (!rdevs)
+ return -ENOMEM;
+
+ for (i = 0; i < pcdev->nr_lines; i++)
+ rdevs[i] = pcdev->pi[i].rdev;
+
+ /* Register notifiers - can fail if IRQ is not given */
+ irq_helper = devm_regulator_irq_helper(pcdev->dev, d, irq,
+ 0, supported_errs, NULL,
+ &rdevs[0], pcdev->nr_lines);
+ if (IS_ERR(irq_helper)) {
+ if (PTR_ERR(irq_helper) == -EPROBE_DEFER)
+ return -EPROBE_DEFER;
+
+ dev_warn(pcdev->dev, "IRQ disabled %pe\n", irq_helper);
+ }
+
+ return 0;
+}
+EXPORT_SYMBOL_GPL(devm_pse_irq_helper);
+
/* PSE control section */
static void __pse_control_release(struct kref *kref)
diff --git a/include/linux/pse-pd/pse.h b/include/linux/pse-pd/pse.h
index b60fc56923bd..ba3d6630d768 100644
--- a/include/linux/pse-pd/pse.h
+++ b/include/linux/pse-pd/pse.h
@@ -8,6 +8,7 @@
#include <linux/ethtool.h>
#include <linux/list.h>
#include <uapi/linux/ethtool.h>
+#include <linux/regulator/driver.h>
/* Maximum current in uA according to IEEE 802.3-2022 Table 145-1 */
#define MAX_PI_CURRENT 1920000
@@ -15,6 +16,26 @@
struct phy_device;
struct pse_controller_dev;
+/* structure and define wrappers from PSE to regulator */
+#define pse_irq_desc regulator_irq_desc
+#define pse_irq_data regulator_irq_data
+#define pse_err_data regulator_err_data
+#define pse_err_state regulator_err_state
+
+#define PSE_EVENT_TABLE(event) REGULATOR_EVENT_##event
+#define PSE_ERROR_TABLE(error) REGULATOR_ERROR_##error
+
+#define PSE_EVENT_OVER_CURRENT PSE_EVENT_TABLE(OVER_CURRENT)
+#define PSE_EVENT_OVER_TEMP PSE_EVENT_TABLE(OVER_TEMP)
+
+#define PSE_ERROR_OVER_CURRENT PSE_ERROR_TABLE(OVER_CURRENT)
+#define PSE_ERROR_OVER_TEMP PSE_ERROR_TABLE(OVER_TEMP)
+
+/* Return values for PSE IRQ helpers */
+#define PSE_ERROR_CLEARED PSE_ERROR_TABLE(CLEARED)
+#define PSE_FAILED_RETRY REGULATOR_FAILED_RETRY
+#define PSE_ERROR_ON PSE_ERROR_TABLE(ON)
+
/**
* struct pse_control_config - PSE control/channel configuration.
*
@@ -180,6 +201,9 @@ void pse_controller_unregister(struct pse_controller_dev *pcdev);
struct device;
int devm_pse_controller_register(struct device *dev,
struct pse_controller_dev *pcdev);
+int devm_pse_irq_helper(struct pse_controller_dev *pcdev, int irq,
+ int irq_flags, int supported_errs,
+ const struct pse_irq_desc *d);
struct pse_control *of_pse_control_get(struct device_node *node);
void pse_control_put(struct pse_control *psec);
--
2.34.1
