diff mbox series

[1/3] hwmon: Modify to support Phytium FT2000/4 CPU for acpi

Message ID 1CD578BA572E3037+Y37fk/eKlI3u5+77@TP-P15V.lan
State New
Headers
Series [1/3] hwmon: Modify to support Phytium FT2000/4 CPU for acpi |

Commit Message

Wang Honghui Nov. 24, 2022, 3:05 a.m. UTC 
  Modify to support Phytium FT2000/4 CPU for acpi

Signed-off-by: Wang Honghui <honghui.wang@ucas.com.cn>
---
 drivers/hwmon/scpi-hwmon.c | 30 +++++++++++++++++++++++++-----
 1 file changed, 25 insertions(+), 5 deletions(-)

Comments

Guenter Roeck Nov. 24, 2022, 2:35 p.m. UTC | #1 
On 11/23/22 19:05, Wang Honghui wrote:
> Modify to support Phytium FT2000/4 CPU for acpi
> 
> Signed-off-by: Wang Honghui <honghui.wang@ucas.com.cn>
> ---
>   drivers/hwmon/scpi-hwmon.c | 30 +++++++++++++++++++++++++-----
>   1 file changed, 25 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/hwmon/scpi-hwmon.c b/drivers/hwmon/scpi-hwmon.c
> index 4d75385f7d5e..6021ae00b334 100644
> --- a/drivers/hwmon/scpi-hwmon.c
> +++ b/drivers/hwmon/scpi-hwmon.c
> @@ -14,6 +14,7 @@
>   #include <linux/slab.h>
>   #include <linux/sysfs.h>
>   #include <linux/thermal.h>
> +#include <linux/acpi.h>
>   
Alphabetic include file order, please.

>   struct sensor_data {
>   	unsigned int scale;
> @@ -132,6 +133,13 @@ static const struct of_device_id scpi_of_match[] = {
>   };
>   MODULE_DEVICE_TABLE(of, scpi_of_match);
>   
> +/* Wang Honghui add to support Phytium FT2000/4 CPU for acpi */

Irrelevant comment.

> +static const struct acpi_device_id scpi_sensors_acpi_match[] = {
> +        { .id = "PHYT000D" },
> +        { }
> +};
> +MODULE_DEVICE_TABLE(acpi, scpi_sensors_acpi_match);
> +
>   static int scpi_hwmon_probe(struct platform_device *pdev)
>   {
>   	u16 nr_sensors, i;
> @@ -141,6 +149,7 @@ static int scpi_hwmon_probe(struct platform_device *pdev)
>   	struct scpi_ops *scpi_ops;
>   	struct device *hwdev, *dev = &pdev->dev;
>   	struct scpi_sensors *scpi_sensors;
> +	const struct acpi_device_id *match;
>   	int idx, ret;
>   
>   	scpi_ops = get_scpi_ops();
> @@ -170,11 +179,22 @@ static int scpi_hwmon_probe(struct platform_device *pdev)
>   
>   	scpi_sensors->scpi_ops = scpi_ops;
>   
> -	scale = of_device_get_match_data(&pdev->dev);
> -	if (!scale) {
> -		dev_err(&pdev->dev, "Unable to initialize scpi-hwmon data\n");
> -		return -ENODEV;
> -	}
> +	/* Wang Honghui modified to support Phytium FT2000/4 CPU for acpi */

Irrelevant comment.

> +	if (dev->of_node) {
> +		scale = of_device_get_match_data(&pdev->dev);
> +		if (!scale) {
> +			dev_err(&pdev->dev, "Unable to initialize scpi-hwmon data\n");
> +			return -ENODEV;
> +		}
> +	} else {
> +                match = acpi_match_device(dev->driver->acpi_match_table, dev);
> +                if (!match) {
> +                        dev_err(dev, "scpi-hwmon: Error ACPI match data is missing\n");
> +                        return -ENODEV;
> +                }
> +
> +                scale = scpi_scale;
> +        }

	scale = device_get_match_data(&pdev->dev);

should do after setting it in the acpi_device_id array.

Guenter

>   
>   	for (i = 0, idx = 0; i < nr_sensors; i++) {
>   		struct sensor_data *sensor = &scpi_sensors->data[idx];
diff mbox series

Patch

diff --git a/drivers/hwmon/scpi-hwmon.c b/drivers/hwmon/scpi-hwmon.c
index 4d75385f7d5e..6021ae00b334 100644
--- a/drivers/hwmon/scpi-hwmon.c
+++ b/drivers/hwmon/scpi-hwmon.c
@@ -14,6 +14,7 @@ 
 #include <linux/slab.h>
 #include <linux/sysfs.h>
 #include <linux/thermal.h>
+#include <linux/acpi.h>
 
 struct sensor_data {
 	unsigned int scale;
@@ -132,6 +133,13 @@  static const struct of_device_id scpi_of_match[] = {
 };
 MODULE_DEVICE_TABLE(of, scpi_of_match);
 
+/* Wang Honghui add to support Phytium FT2000/4 CPU for acpi */
+static const struct acpi_device_id scpi_sensors_acpi_match[] = {
+        { .id = "PHYT000D" },
+        { }
+};
+MODULE_DEVICE_TABLE(acpi, scpi_sensors_acpi_match);
+
 static int scpi_hwmon_probe(struct platform_device *pdev)
 {
 	u16 nr_sensors, i;
@@ -141,6 +149,7 @@  static int scpi_hwmon_probe(struct platform_device *pdev)
 	struct scpi_ops *scpi_ops;
 	struct device *hwdev, *dev = &pdev->dev;
 	struct scpi_sensors *scpi_sensors;
+	const struct acpi_device_id *match;
 	int idx, ret;
 
 	scpi_ops = get_scpi_ops();
@@ -170,11 +179,22 @@  static int scpi_hwmon_probe(struct platform_device *pdev)
 
 	scpi_sensors->scpi_ops = scpi_ops;
 
-	scale = of_device_get_match_data(&pdev->dev);
-	if (!scale) {
-		dev_err(&pdev->dev, "Unable to initialize scpi-hwmon data\n");
-		return -ENODEV;
-	}
+	/* Wang Honghui modified to support Phytium FT2000/4 CPU for acpi */
+	if (dev->of_node) {
+		scale = of_device_get_match_data(&pdev->dev);
+		if (!scale) {
+			dev_err(&pdev->dev, "Unable to initialize scpi-hwmon data\n");
+			return -ENODEV;
+		}
+	} else {
+                match = acpi_match_device(dev->driver->acpi_match_table, dev);
+                if (!match) {
+                        dev_err(dev, "scpi-hwmon: Error ACPI match data is missing\n");
+                        return -ENODEV;
+                }   
+    
+                scale = scpi_scale;
+        }
 
 	for (i = 0, idx = 0; i < nr_sensors; i++) {
 		struct sensor_data *sensor = &scpi_sensors->data[idx];