ACPI / PMIC: modify the pen function signature to take bit field

Issue description: On some pmics, the policy enable for thermal alerts
refers to different bit fields of the same registers, whereas on other
pmics, the policy enable refers to the same bit field on different
registers. Previous implementation did not provide the flexibility for
supporting the first approach.

Solution: Modified the policy enable function to take bit field as well.
The use of bit field is left to the pmic specific opregion driver.

Signed-off-by: Yegnesh Iyer <yegnesh.s.iyer@intel.com>
Signed-off-by: Bin Gao <bin.gao@intel.com>
Reviewed-by: Aaron Lu <aaron.lu@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

diff --git a/drivers/acpi/pmic/intel_pmic.c b/drivers/acpi/pmic/intel_pmic.c
index bd772cd5649466943ccb2e97ca57abff5e8238fe..410e96f90791e7c9cd24cdfe0537d1847779c456 100644 (file)
--- a/drivers/acpi/pmic/intel_pmic.c
+++ b/drivers/acpi/pmic/intel_pmic.c
@@ -131,7 +131,7 @@ static int pmic_thermal_aux(struct intel_pmic_opregion *opregion, int reg,
 }
 
 static int pmic_thermal_pen(struct intel_pmic_opregion *opregion, int reg,
-                           u32 function, u64 *value)
+                           int bit, u32 function, u64 *value)
 {
        struct intel_pmic_opregion_data *d = opregion->data;
        struct regmap *regmap = opregion->regmap;
@@ -140,12 +140,12 @@ static int pmic_thermal_pen(struct intel_pmic_opregion *opregion, int reg,
                return -ENXIO;
 
        if (function == ACPI_READ)
-               return d->get_policy(regmap, reg, value);
+               return d->get_policy(regmap, reg, bit, value);
 
        if (*value != 0 && *value != 1)
                return -EINVAL;
 
-       return d->update_policy(regmap, reg, *value);
+       return d->update_policy(regmap, reg, bit, *value);
 }
 
 static bool pmic_thermal_is_temp(int address)
@@ -170,13 +170,13 @@ static acpi_status intel_pmic_thermal_handler(u32 function,
 {
        struct intel_pmic_opregion *opregion = region_context;
        struct intel_pmic_opregion_data *d = opregion->data;
-       int reg, result;
+       int reg, bit, result;
 
        if (bits != 32 || !value64)
                return AE_BAD_PARAMETER;
 
        result = pmic_get_reg_bit(address, d->thermal_table,
-                                 d->thermal_table_count, &reg, NULL);
+                                 d->thermal_table_count, &reg, &bit);
        if (result == -ENOENT)
                return AE_BAD_PARAMETER;
 
@@ -187,7 +187,8 @@ static acpi_status intel_pmic_thermal_handler(u32 function,
        else if (pmic_thermal_is_aux(address))
                result = pmic_thermal_aux(opregion, reg, function, value64);
        else if (pmic_thermal_is_pen(address))
-               result = pmic_thermal_pen(opregion, reg, function, value64);
+               result = pmic_thermal_pen(opregion, reg, bit,
+                                               function, value64);
        else
                result = -EINVAL;
 

diff --git a/drivers/acpi/pmic/intel_pmic.h b/drivers/acpi/pmic/intel_pmic.h
index d4e90af8f0dd950992bf7609481bf21e3ed9e795..e8bfa7b865a524dc106a8d0b54b923462142418b 100644 (file)
--- a/drivers/acpi/pmic/intel_pmic.h
+++ b/drivers/acpi/pmic/intel_pmic.h
@@ -12,8 +12,8 @@ struct intel_pmic_opregion_data {
        int (*update_power)(struct regmap *r, int reg, int bit, bool on);
        int (*get_raw_temp)(struct regmap *r, int reg);
        int (*update_aux)(struct regmap *r, int reg, int raw_temp);
-       int (*get_policy)(struct regmap *r, int reg, u64 *value);
-       int (*update_policy)(struct regmap *r, int reg, int enable);
+       int (*get_policy)(struct regmap *r, int reg, int bit, u64 *value);
+       int (*update_policy)(struct regmap *r, int reg, int bit, int enable);
        struct pmic_table *power_table;
        int power_table_count;
        struct pmic_table *thermal_table;

diff --git a/drivers/acpi/pmic/intel_pmic_crc.c b/drivers/acpi/pmic/intel_pmic_crc.c
index fcd1852dcdee0874e4cefffb14e441921221aab0..d7f1761ab1bc32363e2c869f9a0a5ee05de045ef 100644 (file)
--- a/drivers/acpi/pmic/intel_pmic_crc.c
+++ b/drivers/acpi/pmic/intel_pmic_crc.c
@@ -141,7 +141,8 @@ static int intel_crc_pmic_update_aux(struct regmap *regmap, int reg, int raw)
                regmap_update_bits(regmap, reg - 1, 0x3, raw >> 8) ? -EIO : 0;
 }
 
-static int intel_crc_pmic_get_policy(struct regmap *regmap, int reg, u64 *value)
+static int intel_crc_pmic_get_policy(struct regmap *regmap,
+                                       int reg, int bit, u64 *value)
 {
        int pen;
 
@@ -152,7 +153,7 @@ static int intel_crc_pmic_get_policy(struct regmap *regmap, int reg, u64 *value)
 }
 
 static int intel_crc_pmic_update_policy(struct regmap *regmap,
-                                       int reg, int enable)
+                                       int reg, int bit, int enable)
 {
        int alert0;