Commit 1b5239f7 authored by Nuno Sa's avatar Nuno Sa Committed by Guenter Roeck

hwmon: (axi-fan-control) Use device firmware agnostic API

Don't directly use OF and use device property APIs. In addition, this
makes the probe() code neater and also allow us to move the
of_device_id table to it's natural place.

While at it, make sure to explicitly include mod_devicetable.h for the
of_device_id table.
Signed-off-by: default avatarNuno Sa <nuno.sa@analog.com>
Link: https://lore.kernel.org/r/20240214-axi-fan-control-no-of-v1-1-43ca656fe2e3@analog.comSigned-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
parent 692cf83b
...@@ -13,8 +13,9 @@ ...@@ -13,8 +13,9 @@
#include <linux/io.h> #include <linux/io.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/of.h> #include <linux/mod_devicetable.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/property.h>
/* register map */ /* register map */
#define ADI_REG_RSTN 0x0080 #define ADI_REG_RSTN 0x0080
...@@ -368,12 +369,12 @@ static irqreturn_t axi_fan_control_irq_handler(int irq, void *data) ...@@ -368,12 +369,12 @@ static irqreturn_t axi_fan_control_irq_handler(int irq, void *data)
} }
static int axi_fan_control_init(struct axi_fan_control_data *ctl, static int axi_fan_control_init(struct axi_fan_control_data *ctl,
const struct device_node *np) const struct device *dev)
{ {
int ret; int ret;
/* get fan pulses per revolution */ /* get fan pulses per revolution */
ret = of_property_read_u32(np, "pulses-per-revolution", &ctl->ppr); ret = device_property_read_u32(dev, "pulses-per-revolution", &ctl->ppr);
if (ret) if (ret)
return ret; return ret;
...@@ -443,25 +444,16 @@ static struct attribute *axi_fan_control_attrs[] = { ...@@ -443,25 +444,16 @@ static struct attribute *axi_fan_control_attrs[] = {
}; };
ATTRIBUTE_GROUPS(axi_fan_control); ATTRIBUTE_GROUPS(axi_fan_control);
static const u32 version_1_0_0 = ADI_AXI_PCORE_VER(1, 0, 'a');
static const struct of_device_id axi_fan_control_of_match[] = {
{ .compatible = "adi,axi-fan-control-1.00.a",
.data = (void *)&version_1_0_0},
{},
};
MODULE_DEVICE_TABLE(of, axi_fan_control_of_match);
static int axi_fan_control_probe(struct platform_device *pdev) static int axi_fan_control_probe(struct platform_device *pdev)
{ {
struct axi_fan_control_data *ctl; struct axi_fan_control_data *ctl;
struct clk *clk; struct clk *clk;
const struct of_device_id *id; const unsigned int *id;
const char *name = "axi_fan_control"; const char *name = "axi_fan_control";
u32 version; u32 version;
int ret; int ret;
id = of_match_node(axi_fan_control_of_match, pdev->dev.of_node); id = device_get_match_data(&pdev->dev);
if (!id) if (!id)
return -EINVAL; return -EINVAL;
...@@ -485,18 +477,18 @@ static int axi_fan_control_probe(struct platform_device *pdev) ...@@ -485,18 +477,18 @@ static int axi_fan_control_probe(struct platform_device *pdev)
version = axi_ioread(ADI_AXI_REG_VERSION, ctl); version = axi_ioread(ADI_AXI_REG_VERSION, ctl);
if (ADI_AXI_PCORE_VER_MAJOR(version) != if (ADI_AXI_PCORE_VER_MAJOR(version) !=
ADI_AXI_PCORE_VER_MAJOR((*(u32 *)id->data))) { ADI_AXI_PCORE_VER_MAJOR((*id))) {
dev_err(&pdev->dev, "Major version mismatch. Expected %d.%.2d.%c, Reported %d.%.2d.%c\n", dev_err(&pdev->dev, "Major version mismatch. Expected %d.%.2d.%c, Reported %d.%.2d.%c\n",
ADI_AXI_PCORE_VER_MAJOR((*(u32 *)id->data)), ADI_AXI_PCORE_VER_MAJOR(*id),
ADI_AXI_PCORE_VER_MINOR((*(u32 *)id->data)), ADI_AXI_PCORE_VER_MINOR(*id),
ADI_AXI_PCORE_VER_PATCH((*(u32 *)id->data)), ADI_AXI_PCORE_VER_PATCH(*id),
ADI_AXI_PCORE_VER_MAJOR(version), ADI_AXI_PCORE_VER_MAJOR(version),
ADI_AXI_PCORE_VER_MINOR(version), ADI_AXI_PCORE_VER_MINOR(version),
ADI_AXI_PCORE_VER_PATCH(version)); ADI_AXI_PCORE_VER_PATCH(version));
return -ENODEV; return -ENODEV;
} }
ret = axi_fan_control_init(ctl, pdev->dev.of_node); ret = axi_fan_control_init(ctl, &pdev->dev);
if (ret) { if (ret) {
dev_err(&pdev->dev, "Failed to initialize device\n"); dev_err(&pdev->dev, "Failed to initialize device\n");
return ret; return ret;
...@@ -527,6 +519,15 @@ static int axi_fan_control_probe(struct platform_device *pdev) ...@@ -527,6 +519,15 @@ static int axi_fan_control_probe(struct platform_device *pdev)
return 0; return 0;
} }
static const u32 version_1_0_0 = ADI_AXI_PCORE_VER(1, 0, 'a');
static const struct of_device_id axi_fan_control_of_match[] = {
{ .compatible = "adi,axi-fan-control-1.00.a",
.data = (void *)&version_1_0_0},
{},
};
MODULE_DEVICE_TABLE(of, axi_fan_control_of_match);
static struct platform_driver axi_fan_control_driver = { static struct platform_driver axi_fan_control_driver = {
.driver = { .driver = {
.name = "axi_fan_control_driver", .name = "axi_fan_control_driver",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment