diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-07-24 11:20:55 +1000 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-07-24 11:20:55 +1000 |
commit | 8d5e094c0a2a28462a4907275efb4961464acdd2 (patch) | |
tree | 61eba83b781b91d1fbb37a8d21da0b87042a50be /drivers | |
parent | ef06843801c678430e40a4963175fa4b5a8314c9 (diff) | |
parent | 2732fc0ffb35bf3c50710c674369804ad5dcbf6a (diff) |
Merge remote-tracking branch 'hwmon-staging/hwmon-next'
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/hwmon/adc128d818.c | 2 | ||||
-rw-r--r-- | drivers/hwmon/ads1015.c | 14 | ||||
-rw-r--r-- | drivers/hwmon/adt7475.c | 16 | ||||
-rw-r--r-- | drivers/hwmon/hwmon.c | 2 | ||||
-rw-r--r-- | drivers/hwmon/i5k_amb.c | 2 | ||||
-rw-r--r-- | drivers/hwmon/jc42.c | 19 | ||||
-rw-r--r-- | drivers/hwmon/nct7802.c | 10 |
7 files changed, 41 insertions, 24 deletions
diff --git a/drivers/hwmon/adc128d818.c b/drivers/hwmon/adc128d818.c index a557b46dbe8e..bd2ca315c9d8 100644 --- a/drivers/hwmon/adc128d818.c +++ b/drivers/hwmon/adc128d818.c @@ -384,7 +384,7 @@ static struct attribute *adc128_attrs[] = { NULL }; -static struct attribute_group adc128_group = { +static const struct attribute_group adc128_group = { .attrs = adc128_attrs, .is_visible = adc128_is_visible, }; diff --git a/drivers/hwmon/ads1015.c b/drivers/hwmon/ads1015.c index 357b42607164..98c704d3366a 100644 --- a/drivers/hwmon/ads1015.c +++ b/drivers/hwmon/ads1015.c @@ -191,24 +191,23 @@ static int ads1015_get_channels_config_of(struct i2c_client *client) unsigned int data_rate = ADS1015_DEFAULT_DATA_RATE; if (of_property_read_u32(node, "reg", &pval)) { - dev_err(&client->dev, "invalid reg on %s\n", - node->full_name); + dev_err(&client->dev, "invalid reg on %pOF\n", node); continue; } channel = pval; if (channel >= ADS1015_CHANNELS) { dev_err(&client->dev, - "invalid channel index %d on %s\n", - channel, node->full_name); + "invalid channel index %d on %pOF\n", + channel, node); continue; } if (!of_property_read_u32(node, "ti,gain", &pval)) { pga = pval; if (pga > 6) { - dev_err(&client->dev, "invalid gain on %s\n", - node->full_name); + dev_err(&client->dev, "invalid gain on %pOF\n", + node); return -EINVAL; } } @@ -217,8 +216,7 @@ static int ads1015_get_channels_config_of(struct i2c_client *client) data_rate = pval; if (data_rate > 7) { dev_err(&client->dev, - "invalid data_rate on %s\n", - node->full_name); + "invalid data_rate on %pOF\n", node); return -EINVAL; } } diff --git a/drivers/hwmon/adt7475.c b/drivers/hwmon/adt7475.c index 1baa213a60bd..9ef84998c7f3 100644 --- a/drivers/hwmon/adt7475.c +++ b/drivers/hwmon/adt7475.c @@ -1319,14 +1319,14 @@ static struct attribute *vid_attrs[] = { NULL }; -static struct attribute_group adt7475_attr_group = { .attrs = adt7475_attrs }; -static struct attribute_group fan4_attr_group = { .attrs = fan4_attrs }; -static struct attribute_group pwm2_attr_group = { .attrs = pwm2_attrs }; -static struct attribute_group in0_attr_group = { .attrs = in0_attrs }; -static struct attribute_group in3_attr_group = { .attrs = in3_attrs }; -static struct attribute_group in4_attr_group = { .attrs = in4_attrs }; -static struct attribute_group in5_attr_group = { .attrs = in5_attrs }; -static struct attribute_group vid_attr_group = { .attrs = vid_attrs }; +static const struct attribute_group adt7475_attr_group = { .attrs = adt7475_attrs }; +static const struct attribute_group fan4_attr_group = { .attrs = fan4_attrs }; +static const struct attribute_group pwm2_attr_group = { .attrs = pwm2_attrs }; +static const struct attribute_group in0_attr_group = { .attrs = in0_attrs }; +static const struct attribute_group in3_attr_group = { .attrs = in3_attrs }; +static const struct attribute_group in4_attr_group = { .attrs = in4_attrs }; +static const struct attribute_group in5_attr_group = { .attrs = in5_attrs }; +static const struct attribute_group vid_attr_group = { .attrs = vid_attrs }; static int adt7475_detect(struct i2c_client *client, struct i2c_board_info *info) diff --git a/drivers/hwmon/hwmon.c b/drivers/hwmon/hwmon.c index dd6e17c1076b..2ac578a94b1f 100644 --- a/drivers/hwmon/hwmon.c +++ b/drivers/hwmon/hwmon.c @@ -85,7 +85,7 @@ static umode_t hwmon_dev_name_is_visible(struct kobject *kobj, return attr->mode; } -static struct attribute_group hwmon_dev_attr_group = { +static const struct attribute_group hwmon_dev_attr_group = { .attrs = hwmon_dev_attrs, .is_visible = hwmon_dev_name_is_visible, }; diff --git a/drivers/hwmon/i5k_amb.c b/drivers/hwmon/i5k_amb.c index a5a9f457b7f7..9397d2f0e79a 100644 --- a/drivers/hwmon/i5k_amb.c +++ b/drivers/hwmon/i5k_amb.c @@ -495,7 +495,7 @@ static struct { }; #ifdef MODULE -static struct pci_device_id i5k_amb_ids[] = { +static const struct pci_device_id i5k_amb_ids[] = { { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_5000_ERR) }, { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_5400_ERR) }, { 0, } diff --git a/drivers/hwmon/jc42.c b/drivers/hwmon/jc42.c index 1bf22eff0b08..5f11dc014ed6 100644 --- a/drivers/hwmon/jc42.c +++ b/drivers/hwmon/jc42.c @@ -72,6 +72,8 @@ static const unsigned short normal_i2c[] = { #define NXP_MANID 0x1131 /* NXP Semiconductors */ #define ONS_MANID 0x1b09 /* ON Semiconductor */ #define STM_MANID 0x104a /* ST Microelectronics */ +#define GT_MANID 0x1c68 /* Giantec */ +#define GT_MANID2 0x132d /* Giantec, 2nd mfg ID */ /* Supported chips */ @@ -86,6 +88,13 @@ static const unsigned short normal_i2c[] = { #define AT30TSE004_DEVID 0x2200 #define AT30TSE004_DEVID_MASK 0xffff +/* Giantec */ +#define GT30TS00_DEVID 0x2200 +#define GT30TS00_DEVID_MASK 0xff00 + +#define GT34TS02_DEVID 0x3300 +#define GT34TS02_DEVID_MASK 0xff00 + /* IDT */ #define TSE2004_DEVID 0x2200 #define TSE2004_DEVID_MASK 0xff00 @@ -130,6 +139,12 @@ static const unsigned short normal_i2c[] = { #define CAT6095_DEVID 0x0800 /* Also matches CAT34TS02 */ #define CAT6095_DEVID_MASK 0xffe0 +#define CAT34TS02C_DEVID 0x0a00 +#define CAT34TS02C_DEVID_MASK 0xfff0 + +#define CAT34TS04_DEVID 0x2200 +#define CAT34TS04_DEVID_MASK 0xfff0 + /* ST Microelectronics */ #define STTS424_DEVID 0x0101 #define STTS424_DEVID_MASK 0xffff @@ -158,6 +173,8 @@ static struct jc42_chips jc42_chips[] = { { ADT_MANID, ADT7408_DEVID, ADT7408_DEVID_MASK }, { ATMEL_MANID, AT30TS00_DEVID, AT30TS00_DEVID_MASK }, { ATMEL_MANID2, AT30TSE004_DEVID, AT30TSE004_DEVID_MASK }, + { GT_MANID, GT30TS00_DEVID, GT30TS00_DEVID_MASK }, + { GT_MANID2, GT34TS02_DEVID, GT34TS02_DEVID_MASK }, { IDT_MANID, TSE2004_DEVID, TSE2004_DEVID_MASK }, { IDT_MANID, TS3000_DEVID, TS3000_DEVID_MASK }, { IDT_MANID, TS3001_DEVID, TS3001_DEVID_MASK }, @@ -170,6 +187,8 @@ static struct jc42_chips jc42_chips[] = { { MCP_MANID, MCP9843_DEVID, MCP9843_DEVID_MASK }, { NXP_MANID, SE97_DEVID, SE97_DEVID_MASK }, { ONS_MANID, CAT6095_DEVID, CAT6095_DEVID_MASK }, + { ONS_MANID, CAT34TS02C_DEVID, CAT34TS02C_DEVID_MASK }, + { ONS_MANID, CAT34TS04_DEVID, CAT34TS04_DEVID_MASK }, { NXP_MANID, SE98_DEVID, SE98_DEVID_MASK }, { STM_MANID, STTS424_DEVID, STTS424_DEVID_MASK }, { STM_MANID, STTS424E_DEVID, STTS424E_DEVID_MASK }, diff --git a/drivers/hwmon/nct7802.c b/drivers/hwmon/nct7802.c index 12b94b094c0d..2876c18ed841 100644 --- a/drivers/hwmon/nct7802.c +++ b/drivers/hwmon/nct7802.c @@ -704,7 +704,7 @@ static umode_t nct7802_temp_is_visible(struct kobject *kobj, return attr->mode; } -static struct attribute_group nct7802_temp_group = { +static const struct attribute_group nct7802_temp_group = { .attrs = nct7802_temp_attrs, .is_visible = nct7802_temp_is_visible, }; @@ -802,7 +802,7 @@ static umode_t nct7802_in_is_visible(struct kobject *kobj, return attr->mode; } -static struct attribute_group nct7802_in_group = { +static const struct attribute_group nct7802_in_group = { .attrs = nct7802_in_attrs, .is_visible = nct7802_in_is_visible, }; @@ -880,7 +880,7 @@ static umode_t nct7802_fan_is_visible(struct kobject *kobj, return attr->mode; } -static struct attribute_group nct7802_fan_group = { +static const struct attribute_group nct7802_fan_group = { .attrs = nct7802_fan_attrs, .is_visible = nct7802_fan_is_visible, }; @@ -898,7 +898,7 @@ static struct attribute *nct7802_pwm_attrs[] = { NULL }; -static struct attribute_group nct7802_pwm_group = { +static const struct attribute_group nct7802_pwm_group = { .attrs = nct7802_pwm_attrs, }; @@ -1011,7 +1011,7 @@ static struct attribute *nct7802_auto_point_attrs[] = { NULL }; -static struct attribute_group nct7802_auto_point_group = { +static const struct attribute_group nct7802_auto_point_group = { .attrs = nct7802_auto_point_attrs, }; |