Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-15 00:21:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

hwmon fixes for v5.6-rc2

Browse Source 
Fix compatible string typos in the xdpe12284 driver, and a wrong
 bit value in the ltc2978 driver.
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEiHPvMQj9QTOCiqgVyx8mb86fmYEFAl5ILnQACgkQyx8mb86f
 mYFqIQ//TB+Mu01JsI7buqlpkSlXcaEABiyL0a3Hku4sYKYBjYNQ6dXn+wihmypr
 2ELGjs0EOx8V1RLZ2PcEKl95/8UV5cMmSX0FSfZRj29fcBighrJVJprkPQLA8SF5
 9at4M2UpwWrPl/l0PLsQLB8Ed7QkGPZfCuiy5zitk6lUhchh7kJ2hG6fYfTs4RGu
 rU4bEciQFAuUmd+Tfmp/YBCX+ymLKzkMh1727HSmyAOCfolXDnickVoJGyE1nKRK
 yQOdXC3a+28QuQJaJcbh+99M9oYTSzTNnSKq9djcHUaU3Z+bVuBOlgqt5qf80K/E
 JhIKH6MQJCDG9+8CHCz8yCIjfm8kqN/pmUKSwcgvofGLQo1ti3VWTrgCh/T8lQpl
 kXV1ZVwaNRnU5zZgS/zUUt07arlbIZSe/EoBaVxAWxmYf7HVjQcucdTR4KNFIN0h
 jjgKAiyW05bmMJjgI4TV4xDYndMyrwegQIY/hhhNG6LuDoC0sMiUJEsk8XM0ZUy3
 nHVh0bKsfGZ7ncixqIK8Szsf54jj5IQ3pnZPNrV9tTml7gz2n0uozGgBA2XaPdWv
 aLTu3AQtg7eHiPOFIrQtNPUp6RDh2em6XpVarsA5/ecmJihMVWj7/io9O76SPXPc
 HGynqxNUyspMtjntmiffhOEasPk/5EeLlt6UsbB4eYuseSLRyqQ=
 =q2M0
 -----END PGP SIGNATURE-----

Merge tag 'hwmon-for-v5.6-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging

Pull hwmon fixes from Guenter Roeck:
 "Fix compatible string typos in the xdpe12284 driver, and a wrong bit
  value in the ltc2978 driver"

* tag 'hwmon-for-v5.6-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
  hwmon: (pmbus/xdpe12284) fix typo in compatible strings
  hwmon: (pmbus/ltc2978) Fix PMBus polling of MFR_COMMON definitions.
This commit is contained in:
Linus Torvalds 2020-02-15 13:03:50 -08:00
commit bd516133cc
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/hwmon/pmbus/ltc2978.c
View File

@ -82,8 +82,8 @@ enum chips { ltc2974, ltc2975, ltc2977, ltc2978, ltc2980, ltc3880, ltc3882,
#define LTC_POLL_TIMEOUT 100 /* in milli-seconds */
#define LTC_NOT_BUSY BIT(5)
#define LTC_NOT_PENDING BIT(4)
#define LTC_NOT_BUSY BIT(6)
#define LTC_NOT_PENDING BIT(5)
/*
* LTC2978 clears peak data whenever the CLEAR_FAULTS command is executed, which

4
drivers/hwmon/pmbus/xdpe12284.c
View File

@ -94,8 +94,8 @@ static const struct i2c_device_id xdpe122_id[] = {
MODULE_DEVICE_TABLE(i2c, xdpe122_id);
static const struct of_device_id __maybe_unused xdpe122_of_match[] = {
{.compatible = "infineon, xdpe12254"},
{.compatible = "infineon, xdpe12284"},
{.compatible = "infineon,xdpe12254"},
{.compatible = "infineon,xdpe12284"},
{}
};
MODULE_DEVICE_TABLE(of, xdpe122_of_match);