Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit dc99bf78238a7554578a319d8fd06655151121a3

Authored by Linus Torvalds
2 parents 5d43a1de26 0a6bf658c3
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging 

* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging:
  hwmon: (ltc4215) make sysfs file match the alarm cause

Showing 1 changed file Side-by-side Diff

drivers/hwmon/ltc4215.c
Diff comments   View file @ dc99bf7
... ... @@ -205,7 +205,6 @@
205 205  
206 206 /* Power (virtual) */
207 207 LTC4215_POWER(power1_input);
208   -LTC4215_ALARM(power1_alarm, (1 << 3), LTC4215_STATUS);
209 208  
210 209 /* Input Voltage */
211 210 LTC4215_VOLTAGE(in1_input, LTC4215_ADIN);
... ... @@ -214,6 +213,7 @@
214 213  
215 214 /* Output Voltage */
216 215 LTC4215_VOLTAGE(in2_input, LTC4215_SOURCE);
  216 +LTC4215_ALARM(in2_min_alarm, (1 << 3), LTC4215_STATUS);
217 217  
218 218 /* Finally, construct an array of pointers to members of the above objects,
219 219 * as required for sysfs_create_group()
220 220  
... ... @@ -223,13 +223,13 @@
223 223 &sensor_dev_attr_curr1_max_alarm.dev_attr.attr,
224 224  
225 225 &sensor_dev_attr_power1_input.dev_attr.attr,
226   - &sensor_dev_attr_power1_alarm.dev_attr.attr,
227 226  
228 227 &sensor_dev_attr_in1_input.dev_attr.attr,
229 228 &sensor_dev_attr_in1_max_alarm.dev_attr.attr,
230 229 &sensor_dev_attr_in1_min_alarm.dev_attr.attr,
231 230  
232 231 &sensor_dev_attr_in2_input.dev_attr.attr,
  232 + &sensor_dev_attr_in2_min_alarm.dev_attr.attr,
233 233  
234 234 NULL,
235 235 };