Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'hwmon-for-v6.18-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
Pull hwmon fixes from Guenter Roeck:
- gpd-fan: Fix compilation error for non-ACPI builds, and initialize EC
when loading the driver
* tag 'hwmon-for-v6.18-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
hwmon: (gpd-fan) initialize EC on driver load for Win 4
hwmon: (gpd-fan) Fix compilation error in non-ACPI builds
+26
-28
+26
-28
drivers/hwmon/gpd-fan.c
+26
-28
drivers/hwmon/gpd-fan.c
···
12
12
* Copyright (c) 2024 Cryolitia PukNgae
13
13
*/
14
14
15
-
#include <linux/acpi.h>
16
15
#include <linux/dmi.h>
17
16
#include <linux/hwmon.h>
17
+
#include <linux/io.h>
18
18
#include <linux/ioport.h>
19
19
#include <linux/kernel.h>
20
20
#include <linux/module.h>
···
276
276
return (u16)high << 8 | low;
277
277
}
278
278
279
-
static void gpd_win4_init_ec(void)
280
-
{
281
-
u8 chip_id, chip_ver;
282
-
283
-
gpd_ecram_read(0x2000, &chip_id);
284
-
285
-
if (chip_id == 0x55) {
286
-
gpd_ecram_read(0x1060, &chip_ver);
287
-
gpd_ecram_write(0x1060, chip_ver | 0x80);
288
-
}
289
-
}
290
-
291
-
static int gpd_win4_read_rpm(void)
292
-
{
293
-
int ret;
294
-
295
-
ret = gpd_generic_read_rpm();
296
-
297
-
if (ret == 0)
298
-
// Re-init EC when speed is 0
299
-
gpd_win4_init_ec();
300
-
301
-
return ret;
302
-
}
303
-
304
279
static int gpd_wm2_read_rpm(void)
305
280
{
306
281
for (u16 pwm_ctr_offset = GPD_PWM_CTR_OFFSET;
···
295
320
static int gpd_read_rpm(void)
296
321
{
297
322
switch (gpd_driver_priv.drvdata->board) {
323
+
case win4_6800u:
298
324
case win_mini:
299
325
case duo:
300
326
return gpd_generic_read_rpm();
301
-
case win4_6800u:
302
-
return gpd_win4_read_rpm();
303
327
case win_max_2:
304
328
return gpd_wm2_read_rpm();
305
329
}
···
581
607
.info = gpd_fan_hwmon_channel_info
582
608
};
583
609
610
+
static void gpd_win4_init_ec(void)
611
+
{
612
+
u8 chip_id, chip_ver;
613
+
614
+
gpd_ecram_read(0x2000, &chip_id);
615
+
616
+
if (chip_id == 0x55) {
617
+
gpd_ecram_read(0x1060, &chip_ver);
618
+
gpd_ecram_write(0x1060, chip_ver | 0x80);
619
+
}
620
+
}
621
+
622
+
static void gpd_init_ec(void)
623
+
{
624
+
// The buggy firmware won't initialize EC properly on boot.
625
+
// Before its initialization, reading RPM will always return 0,
626
+
// and writing PWM will have no effect.
627
+
// Initialize it manually on driver load.
628
+
if (gpd_driver_priv.drvdata->board == win4_6800u)
629
+
gpd_win4_init_ec();
630
+
}
631
+
584
632
static int gpd_fan_probe(struct platform_device *pdev)
585
633
{
586
634
struct device *dev = &pdev->dev;
···
629
633
if (IS_ERR(hwdev))
630
634
return dev_err_probe(dev, PTR_ERR(hwdev),
631
635
"Failed to register hwmon device\n");
636
+
637
+
gpd_init_ec();
632
638
633
639
return 0;
634
640
}