Message ID | 20240925031131.14645-3-yikai.tsai.wiwynn@gmail.com (mailing list archive) |
---|---|
State | Superseded |
Delegated to: | Geert Uytterhoeven |
Headers | show |
Series | hwmon: (isl28022) new driver for ISL28022 power monitor | expand |
Hi Yikai, On Wed, Sep 25, 2024 at 5:11 AM Yikai Tsai <yikai.tsai.wiwynn@gmail.com> wrote: > Driver for Renesas ISL28022 power monitor with I2C interface. > The device monitors voltage, current via shunt resistor > and calculated power. > > Signed-off-by: Carsten Spieß <mail@carsten-spiess.de> > Signed-off-by: Yikai Tsai <yikai.tsai.wiwynn@gmail.com> Thanks for your patch! > --- /dev/null > +++ b/drivers/hwmon/isl28022.c > +static int isl28022_read_properties(struct device *dev, struct isl28022_data *data) > +{ > + u32 val; > + int err; > + > + err = device_property_read_u32(dev, "shunt-resistor-micro-ohms", &val); > + if (err == -EINVAL) > + val = 10000; > + else if (err < 0) > + return err; > + data->shunt = val; > + > + err = device_property_read_u32(dev, "renesas,shunt-range-microvolt", &val); > + if (err == -EINVAL) > + val = 320000; > + else if (err < 0) > + return err; > + > + switch (val) { > + case 40000: > + data->gain = 1; > + if (data->shunt < 800) > + goto shunt_invalid; > + break; > + case 80000: > + data->gain = 2; > + if (data->shunt < 1600) > + goto shunt_invalid; > + break; > + case 160000: > + data->gain = 4; > + if (data->shunt < 3200) > + goto shunt_invalid; > + break; > + case 320000: > + data->gain = 8; > + if (data->shunt < 6400) > + goto shunt_invalid; > + break; > + default: > + dev_err_probe(dev, "renesas,shunt-range-microvolt invalid value %d\n", val); I doubt this compiles well? > + return -EINVAL; return dev_err_probe(dev, -EINVAL, "renesas,shunt-range-microvolt invalid value %d\n", val); > + } > + > + err = device_property_read_u32(dev, "renesas,average-samples", &val); > + if (err == -EINVAL) > + val = 1; > + else if (err < 0) > + return err; > + if (val > 128 || hweight32(val) != 1) { > + dev_err_probe(dev, "renesas,average-samples invalid value %d\n", val); > + return -EINVAL; Likewise. > + } > + data->average = val; > + > + return 0; > + > +shunt_invalid: > + dev_err_probe(dev, "renesas,shunt-resistor-microvolt invalid value %d\n", data->shunt); > + return -EINVAL; One more. > +} Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
Hi Yikai, kernel test robot noticed the following build warnings: [auto build test WARNING on groeck-staging/hwmon-next] [also build test WARNING on linus/master v6.11 next-20240925] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in https://git-scm.com/docs/git-format-patch#_base_tree_information] url: https://github.com/intel-lab-lkp/linux/commits/Yikai-Tsai/dt-bindings-hwmon-add-renesas-isl28022/20240925-111332 base: https://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git hwmon-next patch link: https://lore.kernel.org/r/20240925031131.14645-3-yikai.tsai.wiwynn%40gmail.com patch subject: [PATCH v7 2/2] hwmon: (isl28022) new driver for ISL28022 power monitor config: arc-allyesconfig (https://download.01.org/0day-ci/archive/20240925/202409252223.s09tP6IL-lkp@intel.com/config) compiler: arceb-elf-gcc (GCC) 13.2.0 reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20240925/202409252223.s09tP6IL-lkp@intel.com/reproduce) If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags | Reported-by: kernel test robot <lkp@intel.com> | Closes: https://lore.kernel.org/oe-kbuild-all/202409252223.s09tP6IL-lkp@intel.com/ All warnings (new ones prefixed by >>): drivers/hwmon/isl28022.c: In function 'isl28022_read_properties': >> drivers/hwmon/isl28022.c:396:36: warning: passing argument 2 of 'dev_err_probe' makes integer from pointer without a cast [-Wint-conversion] 396 | dev_err_probe(dev, "renesas,shunt-range-microvolt invalid value %d\n", val); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | | | char * In file included from include/linux/device.h:15, from include/linux/acpi.h:14, from include/linux/i2c.h:13, from drivers/hwmon/isl28022.c:11: include/linux/dev_printk.h:278:64: note: expected 'int' but argument is of type 'char *' 278 | __printf(3, 4) int dev_err_probe(const struct device *dev, int err, const char *fmt, ...); | ~~~~^~~ >> drivers/hwmon/isl28022.c:396:88: warning: passing argument 3 of 'dev_err_probe' makes pointer from integer without a cast [-Wint-conversion] 396 | dev_err_probe(dev, "renesas,shunt-range-microvolt invalid value %d\n", val); | ^~~ | | | u32 {aka unsigned int} include/linux/dev_printk.h:278:81: note: expected 'const char *' but argument is of type 'u32' {aka 'unsigned int'} 278 | __printf(3, 4) int dev_err_probe(const struct device *dev, int err, const char *fmt, ...); | ~~~~~~~~~~~~^~~ drivers/hwmon/isl28022.c:406:36: warning: passing argument 2 of 'dev_err_probe' makes integer from pointer without a cast [-Wint-conversion] 406 | dev_err_probe(dev, "renesas,average-samples invalid value %d\n", val); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | | | char * include/linux/dev_printk.h:278:64: note: expected 'int' but argument is of type 'char *' 278 | __printf(3, 4) int dev_err_probe(const struct device *dev, int err, const char *fmt, ...); | ~~~~^~~ drivers/hwmon/isl28022.c:406:82: warning: passing argument 3 of 'dev_err_probe' makes pointer from integer without a cast [-Wint-conversion] 406 | dev_err_probe(dev, "renesas,average-samples invalid value %d\n", val); | ^~~ | | | u32 {aka unsigned int} include/linux/dev_printk.h:278:81: note: expected 'const char *' but argument is of type 'u32' {aka 'unsigned int'} 278 | __printf(3, 4) int dev_err_probe(const struct device *dev, int err, const char *fmt, ...); | ~~~~~~~~~~~~^~~ drivers/hwmon/isl28022.c:414:28: warning: passing argument 2 of 'dev_err_probe' makes integer from pointer without a cast [-Wint-conversion] 414 | dev_err_probe(dev, "renesas,shunt-resistor-microvolt invalid value %d\n", data->shunt); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | | | char * include/linux/dev_printk.h:278:64: note: expected 'int' but argument is of type 'char *' 278 | __printf(3, 4) int dev_err_probe(const struct device *dev, int err, const char *fmt, ...); | ~~~~^~~ drivers/hwmon/isl28022.c:414:87: warning: passing argument 3 of 'dev_err_probe' makes pointer from integer without a cast [-Wint-conversion] 414 | dev_err_probe(dev, "renesas,shunt-resistor-microvolt invalid value %d\n", data->shunt); | ~~~~^~~~~~~ | | | u32 {aka unsigned int} include/linux/dev_printk.h:278:81: note: expected 'const char *' but argument is of type 'u32' {aka 'unsigned int'} 278 | __printf(3, 4) int dev_err_probe(const struct device *dev, int err, const char *fmt, ...); | ~~~~~~~~~~~~^~~ vim +/dev_err_probe +396 drivers/hwmon/isl28022.c 346 347 /* 348 * read property values and make consistency checks. 349 * 350 * following values for shunt range and resistor are allowed: 351 * 40 mV -> gain 1, shunt min. 800 micro ohms 352 * 80 mV -> gain 2, shunt min. 1600 micro ohms 353 * 160 mV -> gain 4, shunt min. 3200 micro ohms 354 * 320 mV -> gain 8, shunt min. 6400 micro ohms 355 */ 356 static int isl28022_read_properties(struct device *dev, struct isl28022_data *data) 357 { 358 u32 val; 359 int err; 360 361 err = device_property_read_u32(dev, "shunt-resistor-micro-ohms", &val); 362 if (err == -EINVAL) 363 val = 10000; 364 else if (err < 0) 365 return err; 366 data->shunt = val; 367 368 err = device_property_read_u32(dev, "renesas,shunt-range-microvolt", &val); 369 if (err == -EINVAL) 370 val = 320000; 371 else if (err < 0) 372 return err; 373 374 switch (val) { 375 case 40000: 376 data->gain = 1; 377 if (data->shunt < 800) 378 goto shunt_invalid; 379 break; 380 case 80000: 381 data->gain = 2; 382 if (data->shunt < 1600) 383 goto shunt_invalid; 384 break; 385 case 160000: 386 data->gain = 4; 387 if (data->shunt < 3200) 388 goto shunt_invalid; 389 break; 390 case 320000: 391 data->gain = 8; 392 if (data->shunt < 6400) 393 goto shunt_invalid; 394 break; 395 default: > 396 dev_err_probe(dev, "renesas,shunt-range-microvolt invalid value %d\n", val); 397 return -EINVAL; 398 } 399 400 err = device_property_read_u32(dev, "renesas,average-samples", &val); 401 if (err == -EINVAL) 402 val = 1; 403 else if (err < 0) 404 return err; 405 if (val > 128 || hweight32(val) != 1) { 406 dev_err_probe(dev, "renesas,average-samples invalid value %d\n", val); 407 return -EINVAL; 408 } 409 data->average = val; 410 411 return 0; 412 413 shunt_invalid: 414 dev_err_probe(dev, "renesas,shunt-resistor-microvolt invalid value %d\n", data->shunt); 415 return -EINVAL; 416 } 417
Hi Yikai, kernel test robot noticed the following build errors: [auto build test ERROR on groeck-staging/hwmon-next] [also build test ERROR on linus/master v6.11 next-20240925] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in https://git-scm.com/docs/git-format-patch#_base_tree_information] url: https://github.com/intel-lab-lkp/linux/commits/Yikai-Tsai/dt-bindings-hwmon-add-renesas-isl28022/20240925-111332 base: https://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git hwmon-next patch link: https://lore.kernel.org/r/20240925031131.14645-3-yikai.tsai.wiwynn%40gmail.com patch subject: [PATCH v7 2/2] hwmon: (isl28022) new driver for ISL28022 power monitor config: openrisc-allyesconfig (https://download.01.org/0day-ci/archive/20240925/202409252244.3ZXLJlyK-lkp@intel.com/config) compiler: or1k-linux-gcc (GCC) 14.1.0 reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20240925/202409252244.3ZXLJlyK-lkp@intel.com/reproduce) If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags | Reported-by: kernel test robot <lkp@intel.com> | Closes: https://lore.kernel.org/oe-kbuild-all/202409252244.3ZXLJlyK-lkp@intel.com/ All errors (new ones prefixed by >>): drivers/hwmon/isl28022.c: In function 'isl28022_read_properties': >> drivers/hwmon/isl28022.c:396:36: error: passing argument 2 of 'dev_err_probe' makes integer from pointer without a cast [-Wint-conversion] 396 | dev_err_probe(dev, "renesas,shunt-range-microvolt invalid value %d\n", val); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | | | char * In file included from include/linux/device.h:15, from include/linux/acpi.h:14, from include/linux/i2c.h:13, from drivers/hwmon/isl28022.c:11: include/linux/dev_printk.h:278:64: note: expected 'int' but argument is of type 'char *' 278 | __printf(3, 4) int dev_err_probe(const struct device *dev, int err, const char *fmt, ...); | ~~~~^~~ >> drivers/hwmon/isl28022.c:396:88: error: passing argument 3 of 'dev_err_probe' makes pointer from integer without a cast [-Wint-conversion] 396 | dev_err_probe(dev, "renesas,shunt-range-microvolt invalid value %d\n", val); | ^~~ | | | u32 {aka unsigned int} include/linux/dev_printk.h:278:81: note: expected 'const char *' but argument is of type 'u32' {aka 'unsigned int'} 278 | __printf(3, 4) int dev_err_probe(const struct device *dev, int err, const char *fmt, ...); | ~~~~~~~~~~~~^~~ drivers/hwmon/isl28022.c:406:36: error: passing argument 2 of 'dev_err_probe' makes integer from pointer without a cast [-Wint-conversion] 406 | dev_err_probe(dev, "renesas,average-samples invalid value %d\n", val); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | | | char * include/linux/dev_printk.h:278:64: note: expected 'int' but argument is of type 'char *' 278 | __printf(3, 4) int dev_err_probe(const struct device *dev, int err, const char *fmt, ...); | ~~~~^~~ drivers/hwmon/isl28022.c:406:82: error: passing argument 3 of 'dev_err_probe' makes pointer from integer without a cast [-Wint-conversion] 406 | dev_err_probe(dev, "renesas,average-samples invalid value %d\n", val); | ^~~ | | | u32 {aka unsigned int} include/linux/dev_printk.h:278:81: note: expected 'const char *' but argument is of type 'u32' {aka 'unsigned int'} 278 | __printf(3, 4) int dev_err_probe(const struct device *dev, int err, const char *fmt, ...); | ~~~~~~~~~~~~^~~ drivers/hwmon/isl28022.c:414:28: error: passing argument 2 of 'dev_err_probe' makes integer from pointer without a cast [-Wint-conversion] 414 | dev_err_probe(dev, "renesas,shunt-resistor-microvolt invalid value %d\n", data->shunt); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | | | char * include/linux/dev_printk.h:278:64: note: expected 'int' but argument is of type 'char *' 278 | __printf(3, 4) int dev_err_probe(const struct device *dev, int err, const char *fmt, ...); | ~~~~^~~ drivers/hwmon/isl28022.c:414:87: error: passing argument 3 of 'dev_err_probe' makes pointer from integer without a cast [-Wint-conversion] 414 | dev_err_probe(dev, "renesas,shunt-resistor-microvolt invalid value %d\n", data->shunt); | ~~~~^~~~~~~ | | | u32 {aka unsigned int} include/linux/dev_printk.h:278:81: note: expected 'const char *' but argument is of type 'u32' {aka 'unsigned int'} 278 | __printf(3, 4) int dev_err_probe(const struct device *dev, int err, const char *fmt, ...); | ~~~~~~~~~~~~^~~ vim +/dev_err_probe +396 drivers/hwmon/isl28022.c 346 347 /* 348 * read property values and make consistency checks. 349 * 350 * following values for shunt range and resistor are allowed: 351 * 40 mV -> gain 1, shunt min. 800 micro ohms 352 * 80 mV -> gain 2, shunt min. 1600 micro ohms 353 * 160 mV -> gain 4, shunt min. 3200 micro ohms 354 * 320 mV -> gain 8, shunt min. 6400 micro ohms 355 */ 356 static int isl28022_read_properties(struct device *dev, struct isl28022_data *data) 357 { 358 u32 val; 359 int err; 360 361 err = device_property_read_u32(dev, "shunt-resistor-micro-ohms", &val); 362 if (err == -EINVAL) 363 val = 10000; 364 else if (err < 0) 365 return err; 366 data->shunt = val; 367 368 err = device_property_read_u32(dev, "renesas,shunt-range-microvolt", &val); 369 if (err == -EINVAL) 370 val = 320000; 371 else if (err < 0) 372 return err; 373 374 switch (val) { 375 case 40000: 376 data->gain = 1; 377 if (data->shunt < 800) 378 goto shunt_invalid; 379 break; 380 case 80000: 381 data->gain = 2; 382 if (data->shunt < 1600) 383 goto shunt_invalid; 384 break; 385 case 160000: 386 data->gain = 4; 387 if (data->shunt < 3200) 388 goto shunt_invalid; 389 break; 390 case 320000: 391 data->gain = 8; 392 if (data->shunt < 6400) 393 goto shunt_invalid; 394 break; 395 default: > 396 dev_err_probe(dev, "renesas,shunt-range-microvolt invalid value %d\n", val); 397 return -EINVAL; 398 } 399 400 err = device_property_read_u32(dev, "renesas,average-samples", &val); 401 if (err == -EINVAL) 402 val = 1; 403 else if (err < 0) 404 return err; 405 if (val > 128 || hweight32(val) != 1) { 406 dev_err_probe(dev, "renesas,average-samples invalid value %d\n", val); 407 return -EINVAL; 408 } 409 data->average = val; 410 411 return 0; 412 413 shunt_invalid: 414 dev_err_probe(dev, "renesas,shunt-resistor-microvolt invalid value %d\n", data->shunt); 415 return -EINVAL; 416 } 417
Hi Yikai, kernel test robot noticed the following build errors: [auto build test ERROR on groeck-staging/hwmon-next] [also build test ERROR on linus/master v6.11 next-20240925] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in https://git-scm.com/docs/git-format-patch#_base_tree_information] url: https://github.com/intel-lab-lkp/linux/commits/Yikai-Tsai/dt-bindings-hwmon-add-renesas-isl28022/20240925-111332 base: https://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git hwmon-next patch link: https://lore.kernel.org/r/20240925031131.14645-3-yikai.tsai.wiwynn%40gmail.com patch subject: [PATCH v7 2/2] hwmon: (isl28022) new driver for ISL28022 power monitor config: hexagon-allmodconfig (https://download.01.org/0day-ci/archive/20240926/202409260859.DetsBmBQ-lkp@intel.com/config) compiler: clang version 20.0.0git (https://github.com/llvm/llvm-project 7773243d9916f98ba0ffce0c3a960e4aa9f03e81) reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20240926/202409260859.DetsBmBQ-lkp@intel.com/reproduce) If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags | Reported-by: kernel test robot <lkp@intel.com> | Closes: https://lore.kernel.org/oe-kbuild-all/202409260859.DetsBmBQ-lkp@intel.com/ All errors (new ones prefixed by >>): In file included from drivers/hwmon/isl28022.c:11: In file included from include/linux/i2c.h:19: In file included from include/linux/regulator/consumer.h:35: In file included from include/linux/suspend.h:5: In file included from include/linux/swap.h:9: In file included from include/linux/memcontrol.h:13: In file included from include/linux/cgroup.h:25: In file included from include/linux/kernel_stat.h:8: In file included from include/linux/interrupt.h:11: In file included from include/linux/hardirq.h:11: In file included from ./arch/hexagon/include/generated/asm/hardirq.h:1: In file included from include/asm-generic/hardirq.h:17: In file included from include/linux/irq.h:20: In file included from include/linux/io.h:14: In file included from arch/hexagon/include/asm/io.h:328: include/asm-generic/io.h:548:31: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic] 548 | val = __raw_readb(PCI_IOBASE + addr); | ~~~~~~~~~~ ^ include/asm-generic/io.h:561:61: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic] 561 | val = __le16_to_cpu((__le16 __force)__raw_readw(PCI_IOBASE + addr)); | ~~~~~~~~~~ ^ include/uapi/linux/byteorder/little_endian.h:37:51: note: expanded from macro '__le16_to_cpu' 37 | #define __le16_to_cpu(x) ((__force __u16)(__le16)(x)) | ^ In file included from drivers/hwmon/isl28022.c:11: In file included from include/linux/i2c.h:19: In file included from include/linux/regulator/consumer.h:35: In file included from include/linux/suspend.h:5: In file included from include/linux/swap.h:9: In file included from include/linux/memcontrol.h:13: In file included from include/linux/cgroup.h:25: In file included from include/linux/kernel_stat.h:8: In file included from include/linux/interrupt.h:11: In file included from include/linux/hardirq.h:11: In file included from ./arch/hexagon/include/generated/asm/hardirq.h:1: In file included from include/asm-generic/hardirq.h:17: In file included from include/linux/irq.h:20: In file included from include/linux/io.h:14: In file included from arch/hexagon/include/asm/io.h:328: include/asm-generic/io.h:574:61: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic] 574 | val = __le32_to_cpu((__le32 __force)__raw_readl(PCI_IOBASE + addr)); | ~~~~~~~~~~ ^ include/uapi/linux/byteorder/little_endian.h:35:51: note: expanded from macro '__le32_to_cpu' 35 | #define __le32_to_cpu(x) ((__force __u32)(__le32)(x)) | ^ In file included from drivers/hwmon/isl28022.c:11: In file included from include/linux/i2c.h:19: In file included from include/linux/regulator/consumer.h:35: In file included from include/linux/suspend.h:5: In file included from include/linux/swap.h:9: In file included from include/linux/memcontrol.h:13: In file included from include/linux/cgroup.h:25: In file included from include/linux/kernel_stat.h:8: In file included from include/linux/interrupt.h:11: In file included from include/linux/hardirq.h:11: In file included from ./arch/hexagon/include/generated/asm/hardirq.h:1: In file included from include/asm-generic/hardirq.h:17: In file included from include/linux/irq.h:20: In file included from include/linux/io.h:14: In file included from arch/hexagon/include/asm/io.h:328: include/asm-generic/io.h:585:33: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic] 585 | __raw_writeb(value, PCI_IOBASE + addr); | ~~~~~~~~~~ ^ include/asm-generic/io.h:595:59: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic] 595 | __raw_writew((u16 __force)cpu_to_le16(value), PCI_IOBASE + addr); | ~~~~~~~~~~ ^ include/asm-generic/io.h:605:59: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic] 605 | __raw_writel((u32 __force)cpu_to_le32(value), PCI_IOBASE + addr); | ~~~~~~~~~~ ^ In file included from drivers/hwmon/isl28022.c:11: In file included from include/linux/i2c.h:19: In file included from include/linux/regulator/consumer.h:35: In file included from include/linux/suspend.h:5: In file included from include/linux/swap.h:9: In file included from include/linux/memcontrol.h:21: In file included from include/linux/mm.h:2228: include/linux/vmstat.h:514:36: warning: arithmetic between different enumeration types ('enum node_stat_item' and 'enum lru_list') [-Wenum-enum-conversion] 514 | return node_stat_name(NR_LRU_BASE + lru) + 3; // skip "nr_" | ~~~~~~~~~~~ ^ ~~~ >> drivers/hwmon/isl28022.c:396:22: error: incompatible pointer to integer conversion passing 'char[48]' to parameter of type 'int' [-Wint-conversion] 396 | dev_err_probe(dev, "renesas,shunt-range-microvolt invalid value %d\n", val); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ include/linux/dev_printk.h:278:64: note: passing argument to parameter 'err' here 278 | __printf(3, 4) int dev_err_probe(const struct device *dev, int err, const char *fmt, ...); | ^ >> drivers/hwmon/isl28022.c:396:74: error: incompatible integer to pointer conversion passing 'u32' (aka 'unsigned int') to parameter of type 'const char *' [-Wint-conversion] 396 | dev_err_probe(dev, "renesas,shunt-range-microvolt invalid value %d\n", val); | ^~~ include/linux/dev_printk.h:278:81: note: passing argument to parameter 'fmt' here 278 | __printf(3, 4) int dev_err_probe(const struct device *dev, int err, const char *fmt, ...); | ^ drivers/hwmon/isl28022.c:406:22: error: incompatible pointer to integer conversion passing 'char[42]' to parameter of type 'int' [-Wint-conversion] 406 | dev_err_probe(dev, "renesas,average-samples invalid value %d\n", val); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ include/linux/dev_printk.h:278:64: note: passing argument to parameter 'err' here 278 | __printf(3, 4) int dev_err_probe(const struct device *dev, int err, const char *fmt, ...); | ^ drivers/hwmon/isl28022.c:406:68: error: incompatible integer to pointer conversion passing 'u32' (aka 'unsigned int') to parameter of type 'const char *' [-Wint-conversion] 406 | dev_err_probe(dev, "renesas,average-samples invalid value %d\n", val); | ^~~ include/linux/dev_printk.h:278:81: note: passing argument to parameter 'fmt' here 278 | __printf(3, 4) int dev_err_probe(const struct device *dev, int err, const char *fmt, ...); | ^ drivers/hwmon/isl28022.c:414:21: error: incompatible pointer to integer conversion passing 'char[51]' to parameter of type 'int' [-Wint-conversion] 414 | dev_err_probe(dev, "renesas,shunt-resistor-microvolt invalid value %d\n", data->shunt); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ include/linux/dev_printk.h:278:64: note: passing argument to parameter 'err' here 278 | __printf(3, 4) int dev_err_probe(const struct device *dev, int err, const char *fmt, ...); | ^ drivers/hwmon/isl28022.c:414:76: error: incompatible integer to pointer conversion passing 'u32' (aka 'unsigned int') to parameter of type 'const char *' [-Wint-conversion] 414 | dev_err_probe(dev, "renesas,shunt-resistor-microvolt invalid value %d\n", data->shunt); | ^~~~~~~~~~~ include/linux/dev_printk.h:278:81: note: passing argument to parameter 'fmt' here 278 | __printf(3, 4) int dev_err_probe(const struct device *dev, int err, const char *fmt, ...); | ^ 7 warnings and 6 errors generated. vim +396 drivers/hwmon/isl28022.c 346 347 /* 348 * read property values and make consistency checks. 349 * 350 * following values for shunt range and resistor are allowed: 351 * 40 mV -> gain 1, shunt min. 800 micro ohms 352 * 80 mV -> gain 2, shunt min. 1600 micro ohms 353 * 160 mV -> gain 4, shunt min. 3200 micro ohms 354 * 320 mV -> gain 8, shunt min. 6400 micro ohms 355 */ 356 static int isl28022_read_properties(struct device *dev, struct isl28022_data *data) 357 { 358 u32 val; 359 int err; 360 361 err = device_property_read_u32(dev, "shunt-resistor-micro-ohms", &val); 362 if (err == -EINVAL) 363 val = 10000; 364 else if (err < 0) 365 return err; 366 data->shunt = val; 367 368 err = device_property_read_u32(dev, "renesas,shunt-range-microvolt", &val); 369 if (err == -EINVAL) 370 val = 320000; 371 else if (err < 0) 372 return err; 373 374 switch (val) { 375 case 40000: 376 data->gain = 1; 377 if (data->shunt < 800) 378 goto shunt_invalid; 379 break; 380 case 80000: 381 data->gain = 2; 382 if (data->shunt < 1600) 383 goto shunt_invalid; 384 break; 385 case 160000: 386 data->gain = 4; 387 if (data->shunt < 3200) 388 goto shunt_invalid; 389 break; 390 case 320000: 391 data->gain = 8; 392 if (data->shunt < 6400) 393 goto shunt_invalid; 394 break; 395 default: > 396 dev_err_probe(dev, "renesas,shunt-range-microvolt invalid value %d\n", val); 397 return -EINVAL; 398 } 399 400 err = device_property_read_u32(dev, "renesas,average-samples", &val); 401 if (err == -EINVAL) 402 val = 1; 403 else if (err < 0) 404 return err; 405 if (val > 128 || hweight32(val) != 1) { 406 dev_err_probe(dev, "renesas,average-samples invalid value %d\n", val); 407 return -EINVAL; 408 } 409 data->average = val; 410 411 return 0; 412 413 shunt_invalid: 414 dev_err_probe(dev, "renesas,shunt-resistor-microvolt invalid value %d\n", data->shunt); 415 return -EINVAL; 416 } 417
Hi Yikai, kernel test robot noticed the following build warnings: [auto build test WARNING on groeck-staging/hwmon-next] [also build test WARNING on linus/master v6.11 next-20240926] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in https://git-scm.com/docs/git-format-patch#_base_tree_information] url: https://github.com/intel-lab-lkp/linux/commits/Yikai-Tsai/dt-bindings-hwmon-add-renesas-isl28022/20240925-111332 base: https://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git hwmon-next patch link: https://lore.kernel.org/r/20240925031131.14645-3-yikai.tsai.wiwynn%40gmail.com patch subject: [PATCH v7 2/2] hwmon: (isl28022) new driver for ISL28022 power monitor config: i386-randconfig-r133-20240927 (https://download.01.org/0day-ci/archive/20240927/202409271235.PtMXq9Kx-lkp@intel.com/config) compiler: gcc-12 (Debian 12.2.0-14) 12.2.0 reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20240927/202409271235.PtMXq9Kx-lkp@intel.com/reproduce) If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags | Reported-by: kernel test robot <lkp@intel.com> | Closes: https://lore.kernel.org/oe-kbuild-all/202409271235.PtMXq9Kx-lkp@intel.com/ sparse warnings: (new ones prefixed by >>) >> drivers/hwmon/isl28022.c:396:36: sparse: sparse: incorrect type in argument 2 (different base types) @@ expected int err @@ got char * @@ drivers/hwmon/isl28022.c:396:36: sparse: expected int err drivers/hwmon/isl28022.c:396:36: sparse: got char * >> drivers/hwmon/isl28022.c:396:88: sparse: sparse: incorrect type in argument 3 (different base types) @@ expected char const *fmt @@ got unsigned int [addressable] [assigned] [usertype] val @@ drivers/hwmon/isl28022.c:396:88: sparse: expected char const *fmt drivers/hwmon/isl28022.c:396:88: sparse: got unsigned int [addressable] [assigned] [usertype] val drivers/hwmon/isl28022.c:406:36: sparse: sparse: incorrect type in argument 2 (different base types) @@ expected int err @@ got char * @@ drivers/hwmon/isl28022.c:406:36: sparse: expected int err drivers/hwmon/isl28022.c:406:36: sparse: got char * drivers/hwmon/isl28022.c:406:82: sparse: sparse: incorrect type in argument 3 (different base types) @@ expected char const *fmt @@ got unsigned int [addressable] [assigned] [usertype] val @@ drivers/hwmon/isl28022.c:406:82: sparse: expected char const *fmt drivers/hwmon/isl28022.c:406:82: sparse: got unsigned int [addressable] [assigned] [usertype] val drivers/hwmon/isl28022.c:414:28: sparse: sparse: incorrect type in argument 2 (different base types) @@ expected int err @@ got char * @@ drivers/hwmon/isl28022.c:414:28: sparse: expected int err drivers/hwmon/isl28022.c:414:28: sparse: got char * >> drivers/hwmon/isl28022.c:414:87: sparse: sparse: incorrect type in argument 3 (different base types) @@ expected char const *fmt @@ got unsigned int [usertype] shunt @@ drivers/hwmon/isl28022.c:414:87: sparse: expected char const *fmt drivers/hwmon/isl28022.c:414:87: sparse: got unsigned int [usertype] shunt drivers/hwmon/isl28022.c: note: in included file (through include/linux/mmzone.h, include/linux/gfp.h, include/linux/xarray.h, ...): include/linux/page-flags.h:235:46: sparse: sparse: self-comparison always evaluates to false include/linux/page-flags.h:235:46: sparse: sparse: self-comparison always evaluates to false vim +396 drivers/hwmon/isl28022.c 346 347 /* 348 * read property values and make consistency checks. 349 * 350 * following values for shunt range and resistor are allowed: 351 * 40 mV -> gain 1, shunt min. 800 micro ohms 352 * 80 mV -> gain 2, shunt min. 1600 micro ohms 353 * 160 mV -> gain 4, shunt min. 3200 micro ohms 354 * 320 mV -> gain 8, shunt min. 6400 micro ohms 355 */ 356 static int isl28022_read_properties(struct device *dev, struct isl28022_data *data) 357 { 358 u32 val; 359 int err; 360 361 err = device_property_read_u32(dev, "shunt-resistor-micro-ohms", &val); 362 if (err == -EINVAL) 363 val = 10000; 364 else if (err < 0) 365 return err; 366 data->shunt = val; 367 368 err = device_property_read_u32(dev, "renesas,shunt-range-microvolt", &val); 369 if (err == -EINVAL) 370 val = 320000; 371 else if (err < 0) 372 return err; 373 374 switch (val) { 375 case 40000: 376 data->gain = 1; 377 if (data->shunt < 800) 378 goto shunt_invalid; 379 break; 380 case 80000: 381 data->gain = 2; 382 if (data->shunt < 1600) 383 goto shunt_invalid; 384 break; 385 case 160000: 386 data->gain = 4; 387 if (data->shunt < 3200) 388 goto shunt_invalid; 389 break; 390 case 320000: 391 data->gain = 8; 392 if (data->shunt < 6400) 393 goto shunt_invalid; 394 break; 395 default: > 396 dev_err_probe(dev, "renesas,shunt-range-microvolt invalid value %d\n", val); 397 return -EINVAL; 398 } 399 400 err = device_property_read_u32(dev, "renesas,average-samples", &val); 401 if (err == -EINVAL) 402 val = 1; 403 else if (err < 0) 404 return err; 405 if (val > 128 || hweight32(val) != 1) { > 406 dev_err_probe(dev, "renesas,average-samples invalid value %d\n", val); 407 return -EINVAL; 408 } 409 data->average = val; 410 411 return 0; 412 413 shunt_invalid: > 414 dev_err_probe(dev, "renesas,shunt-resistor-microvolt invalid value %d\n", data->shunt); 415 return -EINVAL; 416 } 417
Hi Yikai, kernel test robot noticed the following build warnings: [auto build test WARNING on groeck-staging/hwmon-next] [also build test WARNING on linus/master v6.11 next-20240927] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in https://git-scm.com/docs/git-format-patch#_base_tree_information] url: https://github.com/intel-lab-lkp/linux/commits/Yikai-Tsai/dt-bindings-hwmon-add-renesas-isl28022/20240925-111332 base: https://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git hwmon-next patch link: https://lore.kernel.org/r/20240925031131.14645-3-yikai.tsai.wiwynn%40gmail.com patch subject: [PATCH v7 2/2] hwmon: (isl28022) new driver for ISL28022 power monitor config: x86_64-randconfig-121-20240928 (https://download.01.org/0day-ci/archive/20240928/202409280806.yxX1K5ey-lkp@intel.com/config) compiler: gcc-11 (Debian 11.3.0-12) 11.3.0 reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20240928/202409280806.yxX1K5ey-lkp@intel.com/reproduce) If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags | Reported-by: kernel test robot <lkp@intel.com> | Closes: https://lore.kernel.org/oe-kbuild-all/202409280806.yxX1K5ey-lkp@intel.com/ sparse warnings: (new ones prefixed by >>) drivers/hwmon/isl28022.c:396:36: sparse: sparse: incorrect type in argument 2 (different base types) @@ expected int err @@ got char * @@ drivers/hwmon/isl28022.c:396:36: sparse: expected int err drivers/hwmon/isl28022.c:396:36: sparse: got char * drivers/hwmon/isl28022.c:396:88: sparse: sparse: incorrect type in argument 3 (different base types) @@ expected char const *fmt @@ got unsigned int [addressable] [assigned] [usertype] val @@ drivers/hwmon/isl28022.c:396:88: sparse: expected char const *fmt drivers/hwmon/isl28022.c:396:88: sparse: got unsigned int [addressable] [assigned] [usertype] val drivers/hwmon/isl28022.c:406:36: sparse: sparse: incorrect type in argument 2 (different base types) @@ expected int err @@ got char * @@ drivers/hwmon/isl28022.c:406:36: sparse: expected int err drivers/hwmon/isl28022.c:406:36: sparse: got char * drivers/hwmon/isl28022.c:406:82: sparse: sparse: incorrect type in argument 3 (different base types) @@ expected char const *fmt @@ got unsigned int [addressable] [assigned] [usertype] val @@ drivers/hwmon/isl28022.c:406:82: sparse: expected char const *fmt drivers/hwmon/isl28022.c:406:82: sparse: got unsigned int [addressable] [assigned] [usertype] val drivers/hwmon/isl28022.c:414:28: sparse: sparse: incorrect type in argument 2 (different base types) @@ expected int err @@ got char * @@ drivers/hwmon/isl28022.c:414:28: sparse: expected int err drivers/hwmon/isl28022.c:414:28: sparse: got char * drivers/hwmon/isl28022.c:414:87: sparse: sparse: incorrect type in argument 3 (different base types) @@ expected char const *fmt @@ got unsigned int [usertype] shunt @@ drivers/hwmon/isl28022.c:414:87: sparse: expected char const *fmt drivers/hwmon/isl28022.c:414:87: sparse: got unsigned int [usertype] shunt >> drivers/hwmon/isl28022.c:396:36: sparse: sparse: non size-preserving pointer to integer cast >> drivers/hwmon/isl28022.c:396:88: sparse: sparse: non size-preserving integer to pointer cast drivers/hwmon/isl28022.c:406:36: sparse: sparse: non size-preserving pointer to integer cast drivers/hwmon/isl28022.c:406:82: sparse: sparse: non size-preserving integer to pointer cast drivers/hwmon/isl28022.c:414:28: sparse: sparse: non size-preserving pointer to integer cast drivers/hwmon/isl28022.c:414:83: sparse: sparse: non size-preserving integer to pointer cast vim +396 drivers/hwmon/isl28022.c 346 347 /* 348 * read property values and make consistency checks. 349 * 350 * following values for shunt range and resistor are allowed: 351 * 40 mV -> gain 1, shunt min. 800 micro ohms 352 * 80 mV -> gain 2, shunt min. 1600 micro ohms 353 * 160 mV -> gain 4, shunt min. 3200 micro ohms 354 * 320 mV -> gain 8, shunt min. 6400 micro ohms 355 */ 356 static int isl28022_read_properties(struct device *dev, struct isl28022_data *data) 357 { 358 u32 val; 359 int err; 360 361 err = device_property_read_u32(dev, "shunt-resistor-micro-ohms", &val); 362 if (err == -EINVAL) 363 val = 10000; 364 else if (err < 0) 365 return err; 366 data->shunt = val; 367 368 err = device_property_read_u32(dev, "renesas,shunt-range-microvolt", &val); 369 if (err == -EINVAL) 370 val = 320000; 371 else if (err < 0) 372 return err; 373 374 switch (val) { 375 case 40000: 376 data->gain = 1; 377 if (data->shunt < 800) 378 goto shunt_invalid; 379 break; 380 case 80000: 381 data->gain = 2; 382 if (data->shunt < 1600) 383 goto shunt_invalid; 384 break; 385 case 160000: 386 data->gain = 4; 387 if (data->shunt < 3200) 388 goto shunt_invalid; 389 break; 390 case 320000: 391 data->gain = 8; 392 if (data->shunt < 6400) 393 goto shunt_invalid; 394 break; 395 default: > 396 dev_err_probe(dev, "renesas,shunt-range-microvolt invalid value %d\n", val); 397 return -EINVAL; 398 } 399 400 err = device_property_read_u32(dev, "renesas,average-samples", &val); 401 if (err == -EINVAL) 402 val = 1; 403 else if (err < 0) 404 return err; 405 if (val > 128 || hweight32(val) != 1) { 406 dev_err_probe(dev, "renesas,average-samples invalid value %d\n", val); 407 return -EINVAL; 408 } 409 data->average = val; 410 411 return 0; 412 413 shunt_invalid: 414 dev_err_probe(dev, "renesas,shunt-resistor-microvolt invalid value %d\n", data->shunt); 415 return -EINVAL; 416 } 417
diff --git a/Documentation/hwmon/index.rst b/Documentation/hwmon/index.rst index ea3b5be8fe4f..4d15664bc41e 100644 --- a/Documentation/hwmon/index.rst +++ b/Documentation/hwmon/index.rst @@ -96,6 +96,7 @@ Hardware Monitoring Kernel Drivers ir35221 ir38064 ir36021 + isl28022 isl68137 it87 jc42 diff --git a/Documentation/hwmon/isl28022.rst b/Documentation/hwmon/isl28022.rst new file mode 100644 index 000000000000..8d4422a2dacd --- /dev/null +++ b/Documentation/hwmon/isl28022.rst @@ -0,0 +1,63 @@ +.. SPDX-License-Identifier: GPL-2.0-or-later + +Kernel driver isl28022 +====================== + +Supported chips: + + * Renesas ISL28022 + + Prefix: 'isl28022' + + Addresses scanned: none + + Datasheet: Publicly available at the Renesas website + + https://www.renesas.com/us/en/www/doc/datasheet/isl28022.pdf + +Author: + Carsten Spieß <mail@carsten-spiess.de> + +Description +----------- + +The ISL28022 is a power monitor with I2C interface. The device monitors +voltage, current via shunt resistor and calculated power. + +Usage Notes +----------- + +This driver does not auto-detect devices. You will have to instantiate the +device explicitly. Please see Documentation/i2c/instantiating-devices.rst for +details. + +The shunt value in micro-ohms, shunt voltage range and averaging can be set +with device properties. +Please refer to the Documentation/devicetree/bindings/hwmon/isl,isl28022.yaml +for bindings if the device tree is used. + +The driver supports only shunt and bus continuous ADC mode at 15bit resolution. +Averaging can be set from 1 to 128 samples (power of 2) on both channels. +Shunt voltage range of 40, 80, 160 or 320mV is allowed +The bus voltage range is 60V fixed. + +Sysfs entries +------------- + +The following attributes are supported. All attributes are read-only. + +======================= ======================================================= +in0_input bus voltage (milli Volt) + +curr1_input current (milli Ampere) +power1_input power (micro Watt) +======================= ======================================================= + +Debugfs entries +--------------- + +The following attributes are supported. All attributes are read-only. + +======================= ======================================================= +shunt_voltage shunt voltage (micro Volt) +======================= ======================================================= diff --git a/MAINTAINERS b/MAINTAINERS index 9407481c03a2..a1531c358423 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -12080,6 +12080,8 @@ M: Carsten Spieß <mail@carsten-spiess.de> L: linux-hwmon@vger.kernel.org S: Maintained F: Documentation/devicetree/bindings/hwmon/renesas,isl28022.yaml +F: Documentation/hwmon/isl28022.rst +F: drivers/hwmon/isl28022.c ISOFS FILESYSTEM M: Jan Kara <jack@suse.cz> diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig index 65ea92529406..ad0f8c0a9535 100644 --- a/drivers/hwmon/Kconfig +++ b/drivers/hwmon/Kconfig @@ -853,6 +853,17 @@ config SENSORS_CORETEMP sensor inside your CPU. Most of the family 6 CPUs are supported. Check Documentation/hwmon/coretemp.rst for details. +config SENSORS_ISL28022 + tristate "Renesas ISL28022" + depends on I2C + select REGMAP_I2C + help + If you say yes here you get support for ISL28022 power monitor. + Check Documentation/hwmon/isl28022.rst for details. + + This driver can also be built as a module. If so, the module + will be called isl28022. + config SENSORS_IT87 tristate "ITE IT87xx and compatibles" depends on HAS_IOPORT diff --git a/drivers/hwmon/Makefile b/drivers/hwmon/Makefile index 9554d2fdcf7b..4ea6f7c95315 100644 --- a/drivers/hwmon/Makefile +++ b/drivers/hwmon/Makefile @@ -103,6 +103,7 @@ obj-$(CONFIG_SENSORS_INA2XX) += ina2xx.o obj-$(CONFIG_SENSORS_INA238) += ina238.o obj-$(CONFIG_SENSORS_INA3221) += ina3221.o obj-$(CONFIG_SENSORS_INTEL_M10_BMC_HWMON) += intel-m10-bmc-hwmon.o +obj-$(CONFIG_SENSORS_ISL28022) += isl28022.o obj-$(CONFIG_SENSORS_IT87) += it87.o obj-$(CONFIG_SENSORS_JC42) += jc42.o obj-$(CONFIG_SENSORS_K8TEMP) += k8temp.o diff --git a/drivers/hwmon/isl28022.c b/drivers/hwmon/isl28022.c new file mode 100644 index 000000000000..d7de8fbfe362 --- /dev/null +++ b/drivers/hwmon/isl28022.c @@ -0,0 +1,533 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* + * isl28022.c - driver for Renesas ISL28022 power monitor chip monitoring + * + * Copyright (c) 2023 Carsten Spieß <mail@carsten-spiess.de> + */ + +#include <linux/debugfs.h> +#include <linux/err.h> +#include <linux/hwmon.h> +#include <linux/i2c.h> +#include <linux/module.h> +#include <linux/regmap.h> + +/* ISL28022 registers */ +#define ISL28022_REG_CONFIG 0x00 +#define ISL28022_REG_SHUNT 0x01 +#define ISL28022_REG_BUS 0x02 +#define ISL28022_REG_POWER 0x03 +#define ISL28022_REG_CURRENT 0x04 +#define ISL28022_REG_CALIB 0x05 +#define ISL28022_REG_SHUNT_THR 0x06 +#define ISL28022_REG_BUS_THR 0x07 +#define ISL28022_REG_INT 0x08 +#define ISL28022_REG_AUX 0x09 +#define ISL28022_REG_MAX ISL28022_REG_AUX + +/* ISL28022 config flags */ +/* mode flags */ +#define ISL28022_MODE_SHIFT 0 +#define ISL28022_MODE_MASK 0x0007 + +#define ISL28022_MODE_PWR_DOWN 0x0 +#define ISL28022_MODE_TRG_S 0x1 +#define ISL28022_MODE_TRG_B 0x2 +#define ISL28022_MODE_TRG_SB 0x3 +#define ISL28022_MODE_ADC_OFF 0x4 +#define ISL28022_MODE_CONT_S 0x5 +#define ISL28022_MODE_CONT_B 0x6 +#define ISL28022_MODE_CONT_SB 0x7 + +/* shunt ADC settings */ +#define ISL28022_SADC_SHIFT 3 +#define ISL28022_SADC_MASK 0x0078 + +#define ISL28022_BADC_SHIFT 7 +#define ISL28022_BADC_MASK 0x0780 + +#define ISL28022_ADC_12 0x0 /* 12 bit ADC */ +#define ISL28022_ADC_13 0x1 /* 13 bit ADC */ +#define ISL28022_ADC_14 0x2 /* 14 bit ADC */ +#define ISL28022_ADC_15 0x3 /* 15 bit ADC */ +#define ISL28022_ADC_15_1 0x8 /* 15 bit ADC, 1 sample */ +#define ISL28022_ADC_15_2 0x9 /* 15 bit ADC, 2 samples */ +#define ISL28022_ADC_15_4 0xA /* 15 bit ADC, 4 samples */ +#define ISL28022_ADC_15_8 0xB /* 15 bit ADC, 8 samples */ +#define ISL28022_ADC_15_16 0xC /* 15 bit ADC, 16 samples */ +#define ISL28022_ADC_15_32 0xD /* 15 bit ADC, 32 samples */ +#define ISL28022_ADC_15_64 0xE /* 15 bit ADC, 64 samples */ +#define ISL28022_ADC_15_128 0xF /* 15 bit ADC, 128 samples */ + +/* shunt voltage range */ +#define ISL28022_PG_SHIFT 11 +#define ISL28022_PG_MASK 0x1800 + +#define ISL28022_PG_40 0x0 /* +/-40 mV */ +#define ISL28022_PG_80 0x1 /* +/-80 mV */ +#define ISL28022_PG_160 0x2 /* +/-160 mV */ +#define ISL28022_PG_320 0x3 /* +/-3200 mV */ + +/* bus voltage range */ +#define ISL28022_BRNG_SHIFT 13 +#define ISL28022_BRNG_MASK 0x6000 + +#define ISL28022_BRNG_16 0x0 /* 16 V */ +#define ISL28022_BRNG_32 0x1 /* 32 V */ +#define ISL28022_BRNG_60 0x3 /* 60 V */ + +/* reset */ +#define ISL28022_RESET 0x8000 + +struct isl28022_data { + struct regmap *regmap; + u32 shunt; + u32 gain; + u32 average; +}; + +static int isl28022_read_in(struct device *dev, u32 attr, int channel, long *val) +{ + struct isl28022_data *data = dev_get_drvdata(dev); + unsigned int regval; + int err; + u16 sign_bit; + + switch (channel) { + case 0: + switch (attr) { + case hwmon_in_input: + err = regmap_read(data->regmap, + ISL28022_REG_BUS, ®val); + if (err < 0) + return err; + /* driver supports only 60V mode (BRNG 11) */ + *val = (long)(((u16)regval) & 0xFFFC); + break; + default: + return -EOPNOTSUPP; + } + break; + case 1: + switch (attr) { + case hwmon_in_input: + err = regmap_read(data->regmap, + ISL28022_REG_SHUNT, ®val); + if (err < 0) + return err; + switch (data->gain) { + case 8: + sign_bit = (regval >> 15) & 0x01; + *val = (long)((((u16)regval) & 0x7FFF) - + (sign_bit * 32768)) / 100; + break; + case 4: + sign_bit = (regval >> 14) & 0x01; + *val = (long)((((u16)regval) & 0x3FFF) - + (sign_bit * 16384)) / 100; + break; + case 2: + sign_bit = (regval >> 13) & 0x01; + *val = (long)((((u16)regval) & 0x1FFF) - + (sign_bit * 8192)) / 100; + break; + case 1: + sign_bit = (regval >> 12) & 0x01; + *val = (long)((((u16)regval) & 0x0FFF) - + (sign_bit * 4096)) / 100; + break; + } + break; + default: + return -EOPNOTSUPP; + } + break; + default: + return -EOPNOTSUPP; + } + + return 0; +} + +static int isl28022_read_current(struct device *dev, u32 attr, long *val) +{ + struct isl28022_data *data = dev_get_drvdata(dev); + unsigned int regval; + int err; + + switch (attr) { + case hwmon_curr_input: + err = regmap_read(data->regmap, + ISL28022_REG_CURRENT, ®val); + if (err < 0) + return err; + *val = ((long)regval * 1250L * (long)data->gain) / + (long)data->shunt; + break; + default: + return -EOPNOTSUPP; + } + + return 0; +} + +static int isl28022_read_power(struct device *dev, u32 attr, long *val) +{ + struct isl28022_data *data = dev_get_drvdata(dev); + unsigned int regval; + int err; + + switch (attr) { + case hwmon_power_input: + err = regmap_read(data->regmap, + ISL28022_REG_POWER, ®val); + if (err < 0) + return err; + *val = ((51200000L * ((long)data->gain)) / + (long)data->shunt) * (long)regval; + break; + default: + return -EOPNOTSUPP; + } + + return 0; +} + +static int isl28022_read(struct device *dev, enum hwmon_sensor_types type, + u32 attr, int channel, long *val) +{ + switch (type) { + case hwmon_in: + return isl28022_read_in(dev, attr, channel, val); + case hwmon_curr: + return isl28022_read_current(dev, attr, val); + case hwmon_power: + return isl28022_read_power(dev, attr, val); + default: + return -EOPNOTSUPP; + } + return 0; +} + +static umode_t isl28022_is_visible(const void *data, enum hwmon_sensor_types type, + u32 attr, int channel) +{ + switch (type) { + case hwmon_in: + switch (attr) { + case hwmon_in_input: + return 0444; + default: + break; + } + break; + case hwmon_curr: + switch (attr) { + case hwmon_curr_input: + return 0444; + default: + break; + } + break; + case hwmon_power: + switch (attr) { + case hwmon_power_input: + return 0444; + default: + break; + } + break; + default: + break; + } + return 0; +} + +static const struct hwmon_channel_info *isl28022_info[] = { + HWMON_CHANNEL_INFO(in, + HWMON_I_INPUT, /* channel 0: bus voltage (mV) */ + HWMON_I_INPUT), /* channel 1: shunt voltage (mV) */ + HWMON_CHANNEL_INFO(curr, + HWMON_C_INPUT), /* channel 1: current (mA) */ + HWMON_CHANNEL_INFO(power, + HWMON_P_INPUT), /* channel 1: power (µW) */ + NULL +}; + +static const struct hwmon_ops isl28022_hwmon_ops = { + .is_visible = isl28022_is_visible, + .read = isl28022_read, +}; + +static const struct hwmon_chip_info isl28022_chip_info = { + .ops = &isl28022_hwmon_ops, + .info = isl28022_info, +}; + +static bool isl28022_is_writeable_reg(struct device *dev, unsigned int reg) +{ + switch (reg) { + case ISL28022_REG_CONFIG: + case ISL28022_REG_CALIB: + case ISL28022_REG_SHUNT_THR: + case ISL28022_REG_BUS_THR: + case ISL28022_REG_INT: + case ISL28022_REG_AUX: + return true; + } + + return false; +} + +static bool isl28022_is_volatile_reg(struct device *dev, unsigned int reg) +{ + switch (reg) { + case ISL28022_REG_CONFIG: + case ISL28022_REG_SHUNT: + case ISL28022_REG_BUS: + case ISL28022_REG_POWER: + case ISL28022_REG_CURRENT: + case ISL28022_REG_INT: + case ISL28022_REG_AUX: + return true; + } + return true; +} + +static const struct regmap_config isl28022_regmap_config = { + .reg_bits = 8, + .val_bits = 16, + .max_register = ISL28022_REG_MAX, + .writeable_reg = isl28022_is_writeable_reg, + .volatile_reg = isl28022_is_volatile_reg, + .val_format_endian = REGMAP_ENDIAN_BIG, + .cache_type = REGCACHE_RBTREE, + .use_single_read = true, + .use_single_write = true, +}; + +static int shunt_voltage_show(struct seq_file *seqf, void *unused) +{ + struct isl28022_data *data = seqf->private; + unsigned int regval; + int err; + + err = regmap_read(data->regmap, + ISL28022_REG_SHUNT, ®val); + if (err) + return err; + + /* print shunt voltage in micro volt */ + seq_printf(seqf, "%d\n", regval * 10); + + return 0; +} +DEFINE_SHOW_ATTRIBUTE(shunt_voltage); + +static struct dentry *isl28022_debugfs_root; + +static void isl28022_debugfs_remove(void *res) +{ + debugfs_remove_recursive(res); +} + +static void isl28022_debugfs_init(struct i2c_client *client, struct isl28022_data *data) +{ + char name[16]; + struct dentry *debugfs; + + scnprintf(name, sizeof(name), "%d-%04hx", client->adapter->nr, client->addr); + + debugfs = debugfs_create_dir(name, isl28022_debugfs_root); + debugfs_create_file("shunt_voltage", 0444, debugfs, data, &shunt_voltage_fops); + + devm_add_action_or_reset(&client->dev, isl28022_debugfs_remove, debugfs); +} + +/* + * read property values and make consistency checks. + * + * following values for shunt range and resistor are allowed: + * 40 mV -> gain 1, shunt min. 800 micro ohms + * 80 mV -> gain 2, shunt min. 1600 micro ohms + * 160 mV -> gain 4, shunt min. 3200 micro ohms + * 320 mV -> gain 8, shunt min. 6400 micro ohms + */ +static int isl28022_read_properties(struct device *dev, struct isl28022_data *data) +{ + u32 val; + int err; + + err = device_property_read_u32(dev, "shunt-resistor-micro-ohms", &val); + if (err == -EINVAL) + val = 10000; + else if (err < 0) + return err; + data->shunt = val; + + err = device_property_read_u32(dev, "renesas,shunt-range-microvolt", &val); + if (err == -EINVAL) + val = 320000; + else if (err < 0) + return err; + + switch (val) { + case 40000: + data->gain = 1; + if (data->shunt < 800) + goto shunt_invalid; + break; + case 80000: + data->gain = 2; + if (data->shunt < 1600) + goto shunt_invalid; + break; + case 160000: + data->gain = 4; + if (data->shunt < 3200) + goto shunt_invalid; + break; + case 320000: + data->gain = 8; + if (data->shunt < 6400) + goto shunt_invalid; + break; + default: + dev_err_probe(dev, "renesas,shunt-range-microvolt invalid value %d\n", val); + return -EINVAL; + } + + err = device_property_read_u32(dev, "renesas,average-samples", &val); + if (err == -EINVAL) + val = 1; + else if (err < 0) + return err; + if (val > 128 || hweight32(val) != 1) { + dev_err_probe(dev, "renesas,average-samples invalid value %d\n", val); + return -EINVAL; + } + data->average = val; + + return 0; + +shunt_invalid: + dev_err_probe(dev, "renesas,shunt-resistor-microvolt invalid value %d\n", data->shunt); + return -EINVAL; +} + +/* + * write configuration and calibration registers + * + * The driver supports only shunt and bus continuous ADC mode at 15bit resolution + * with averaging from 1 to 128 samples (pow of 2) on both channels. + * Shunt voltage gain 1,2,4 or 8 is allowed. + * The bus voltage range is 60V fixed. + */ +static int isl28022_config(struct isl28022_data *data) +{ + int err; + u16 config; + u16 calib; + + config = (ISL28022_MODE_CONT_SB << ISL28022_MODE_SHIFT) | + (ISL28022_BRNG_60 << ISL28022_BRNG_SHIFT) | + (__ffs(data->gain) << ISL28022_PG_SHIFT) | + ((ISL28022_ADC_15_1 + __ffs(data->average)) << ISL28022_SADC_SHIFT) | + ((ISL28022_ADC_15_1 + __ffs(data->average)) << ISL28022_BADC_SHIFT); + + calib = data->shunt ? 0x8000 / data->gain : 0; + + err = regmap_write(data->regmap, ISL28022_REG_CONFIG, config); + if (err < 0) + return err; + + return regmap_write(data->regmap, ISL28022_REG_CALIB, calib); +} + +static int isl28022_probe(struct i2c_client *client) +{ + struct device *dev = &client->dev; + struct device *hwmon_dev; + struct isl28022_data *data; + int err; + + if (!i2c_check_functionality(client->adapter, + I2C_FUNC_SMBUS_BYTE_DATA | + I2C_FUNC_SMBUS_WORD_DATA)) + return -ENODEV; + + data = devm_kzalloc(dev, sizeof(struct isl28022_data), GFP_KERNEL); + if (!data) + return -ENOMEM; + + err = isl28022_read_properties(dev, data); + if (err) + return err; + + data->regmap = devm_regmap_init_i2c(client, &isl28022_regmap_config); + if (IS_ERR(data->regmap)) + return PTR_ERR(data->regmap); + + err = isl28022_config(data); + if (err) + return err; + + isl28022_debugfs_init(client, data); + + hwmon_dev = devm_hwmon_device_register_with_info(dev, client->name, + data, &isl28022_chip_info, NULL); + if (IS_ERR(hwmon_dev)) + return PTR_ERR(hwmon_dev); + + dev_info(dev, "%s: sensor '%s'\n", dev_name(hwmon_dev), client->name); + return 0; +} + +static const struct i2c_device_id isl28022_ids[] = { + { "isl28022", 0}, + { /* LIST END */ } +}; +MODULE_DEVICE_TABLE(i2c, isl28022_ids); + +static const struct of_device_id __maybe_unused isl28022_of_match[] = { + { .compatible = "renesas,isl28022"}, + { /* LIST END */ } +}; +MODULE_DEVICE_TABLE(of, isl28022_of_match); + +static struct i2c_driver isl28022_driver = { + .class = I2C_CLASS_HWMON, + .driver = { + .name = "isl28022", + }, + .probe = isl28022_probe, + .id_table = isl28022_ids, +}; + +static int __init +isl28022_init(void) +{ + int err; + + isl28022_debugfs_root = debugfs_create_dir("isl28022", NULL); + err = i2c_add_driver(&isl28022_driver); + if (!err) + return 0; + + debugfs_remove_recursive(isl28022_debugfs_root); + return err; +} + +static void __exit +isl28022_exit(void) +{ + i2c_del_driver(&isl28022_driver); + debugfs_remove_recursive(isl28022_debugfs_root); +} + +module_init(isl28022_init); +module_exit(isl28022_exit); + +MODULE_AUTHOR("Carsten Spieß <mail@carsten-spiess.de>"); +MODULE_DESCRIPTION("ISL28022 driver"); +MODULE_LICENSE("GPL");