hwmon: tmp513: Add max_channels variable to struct tmp51x_data

The tmp512 chip has 3 channels whereas tmp513 has 4 channels. Avoid
using tmp51x_ids for this HW difference by replacing OF/ID table
data with maximum channels supported by the device.

Replace id->max_channels variable from struct tmp51x_data and drop the
macros TMP51{2,3}_TEMP_CONFIG_DEFAULT as it can be derived from the macro
TMP51X_TEMP_CONFIG_DEFAULT and update the logic in tmp51x_is_visible(),
tmp51x_read_properties() and tmp51x_init() using max_channels.

While at it, drop enum tmp51x_ids as there is no user and remove
trailing comma in the terminator entry for OF table.

Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
Link: https://lore.kernel.org/r/20230907071404.24334-2-biju.das.jz@bp.renesas.com
Signed-off-by: Guenter Roeck <linux@roeck-us.net>

diff --git a/drivers/hwmon/tmp513.c b/drivers/hwmon/tmp513.c
index 9a180b1030c97e8d338612e72863d7490475c60a..b336b95298ab3bd89004bec84a3c0c4f0ae61cb8 100644 (file)
--- a/drivers/hwmon/tmp513.c
+++ b/drivers/hwmon/tmp513.c
@@ -73,9 +73,6 @@
 #define TMP51X_PGA_DEFAULT             8
 #define TMP51X_MAX_REGISTER_ADDR       0xFF
 
-#define TMP512_TEMP_CONFIG_DEFAULT     0xBF80
-#define TMP513_TEMP_CONFIG_DEFAULT     0xFF80
-
 // Mask and shift
 #define CURRENT_SENSE_VOLTAGE_320_MASK 0x1800
 #define CURRENT_SENSE_VOLTAGE_160_MASK 0x1000
@@ -113,6 +110,17 @@
 
 #define MAX_TEMP_HYST                  127500
 
+#define TMP512_MAX_CHANNELS            3
+#define TMP513_MAX_CHANNELS            4
+
+#define TMP51X_TEMP_CONFIG_CONV_RATE   GENMASK(9, 7)
+#define TMP51X_TEMP_CONFIG_RC          BIT(10)
+#define TMP51X_TEMP_CHANNEL_MASK(n)    (GENMASK((n) - 1, 0) << 11)
+#define TMP51X_TEMP_CONFIG_CONT                BIT(15)
+#define TMP51X_TEMP_CONFIG_DEFAULT(n)                                  \
+       (TMP51X_TEMP_CHANNEL_MASK(n) | TMP51X_TEMP_CONFIG_CONT |        \
+        TMP51X_TEMP_CONFIG_CONV_RATE | TMP51X_TEMP_CONFIG_RC)
+
 static const u8 TMP51X_TEMP_INPUT[4] = {
        TMP51X_LOCAL_TEMP_RESULT,
        TMP51X_REMOTE_TEMP_RESULT_1,
@@ -152,10 +160,6 @@ static struct regmap_config tmp51x_regmap_config = {
        .max_register = TMP51X_MAX_REGISTER_ADDR,
 };
 
-enum tmp51x_ids {
-       tmp512, tmp513
-};
-
 struct tmp51x_data {
        u16 shunt_config;
        u16 pga_gain;
@@ -169,7 +173,7 @@ struct tmp51x_data {
        u32 curr_lsb_ua;
        u32 pwr_lsb_uw;
 
-       enum tmp51x_ids id;
+       u8 max_channels;
        struct regmap *regmap;
 };
 
@@ -434,7 +438,7 @@ static umode_t tmp51x_is_visible(const void *_data,
 
        switch (type) {
        case hwmon_temp:
-               if (data->id == tmp512 && channel == 3)
+               if (channel >= data->max_channels)
                        return 0;
                switch (attr) {
                case hwmon_temp_input:
@@ -585,7 +589,7 @@ static int tmp51x_init(struct tmp51x_data *data)
        if (ret < 0)
                return ret;
 
-       if (data->id == tmp513) {
+       if (data->max_channels == TMP513_MAX_CHANNELS) {
                ret = regmap_write(data->regmap, TMP513_N_FACTOR_3,
                                   data->nfactor[2] << 8);
                if (ret < 0)
@@ -601,22 +605,16 @@ static int tmp51x_init(struct tmp51x_data *data)
 }
 
 static const struct i2c_device_id tmp51x_id[] = {
-       { "tmp512", tmp512 },
-       { "tmp513", tmp513 },
+       { "tmp512", TMP512_MAX_CHANNELS },
+       { "tmp513", TMP513_MAX_CHANNELS },
        { }
 };
 MODULE_DEVICE_TABLE(i2c, tmp51x_id);
 
 static const struct of_device_id tmp51x_of_match[] = {
-       {
-               .compatible = "ti,tmp512",
-               .data = (void *)tmp512
-       },
-       {
-               .compatible = "ti,tmp513",
-               .data = (void *)tmp513
-       },
-       { },
+       { .compatible = "ti,tmp512", .data = (void *)TMP512_MAX_CHANNELS },
+       { .compatible = "ti,tmp513", .data = (void *)TMP513_MAX_CHANNELS },
+       { }
 };
 MODULE_DEVICE_TABLE(of, tmp51x_of_match);
 
@@ -674,9 +672,9 @@ static int tmp51x_read_properties(struct device *dev, struct tmp51x_data *data)
                return ret;
 
        ret = device_property_read_u32_array(dev, "ti,nfactor", nfactor,
-                                           (data->id == tmp513) ? 3 : 2);
+                                           data->max_channels - 1);
        if (ret >= 0)
-               memcpy(data->nfactor, nfactor, (data->id == tmp513) ? 3 : 2);
+               memcpy(data->nfactor, nfactor, data->max_channels - 1);
 
        // Check if shunt value is compatible with pga-gain
        if (data->shunt_uohms > data->pga_gain * 40 * 1000 * 1000) {
@@ -698,8 +696,7 @@ static void tmp51x_use_default(struct tmp51x_data *data)
 static int tmp51x_configure(struct device *dev, struct tmp51x_data *data)
 {
        data->shunt_config = TMP51X_SHUNT_CONFIG_DEFAULT;
-       data->temp_config = (data->id == tmp513) ?
-                       TMP513_TEMP_CONFIG_DEFAULT : TMP512_TEMP_CONFIG_DEFAULT;
+       data->temp_config = TMP51X_TEMP_CONFIG_DEFAULT(data->max_channels);
 
        if (dev->of_node)
                return tmp51x_read_properties(dev, data);
@@ -720,7 +717,7 @@ static int tmp51x_probe(struct i2c_client *client)
        if (!data)
                return -ENOMEM;
 
-       data->id = (uintptr_t)i2c_get_match_data(client);
+       data->max_channels = (uintptr_t)i2c_get_match_data(client);
 
        ret = tmp51x_configure(dev, data);
        if (ret < 0) {