diff options
author | dheerajpdsk <p.dheeraj.srujan.kumar@intel.com> | 2022-05-06 12:32:30 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-05-06 12:32:30 +0300 |
commit | 0945170f93cc0c101bf01739f41136c2f05af570 (patch) | |
tree | 4899512512abc7e1529391ae48337ec8b40acced /meta-openbmc-mods/meta-ast2600/recipes-kernel | |
parent | ca8d06bc610af08c2d3efc487aa9519989b743e6 (diff) | |
parent | 9cc183a531e1e309a99784f65b15c0fb1a18ddef (diff) | |
download | openbmc-0945170f93cc0c101bf01739f41136c2f05af570.tar.xz |
Merge pull request #81 from Intel-BMC/update1-0.91-67
Update to internal 1-0.91-67
Diffstat (limited to 'meta-openbmc-mods/meta-ast2600/recipes-kernel')
2 files changed, 27 insertions, 0 deletions
diff --git a/meta-openbmc-mods/meta-ast2600/recipes-kernel/linux/linux-aspeed/0006-Fix-PSU-fan-sensor-read-0.patch b/meta-openbmc-mods/meta-ast2600/recipes-kernel/linux/linux-aspeed/0006-Fix-PSU-fan-sensor-read-0.patch new file mode 100644 index 000000000..800b107d7 --- /dev/null +++ b/meta-openbmc-mods/meta-ast2600/recipes-kernel/linux/linux-aspeed/0006-Fix-PSU-fan-sensor-read-0.patch @@ -0,0 +1,26 @@ +From bf27d571ef4e46724a60e26ff52e0eae9709db75 Mon Sep 17 00:00:00 2001 +From: Zhikui Ren <zhikui.ren@intel.com> +Date: Tue, 11 Jan 2022 09:00:01 -0800 +Subject: [PATCH] Fix PSU fan sensor read 0 + +Signed-off-by: Zhikui Ren <zhikui.ren@intel.com> +--- + drivers/hwmon/pmbus/pmbus_core.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/hwmon/pmbus/pmbus_core.c b/drivers/hwmon/pmbus/pmbus_core.c +index a4bf6f0fe013..c45b283fffa7 100644 +--- a/drivers/hwmon/pmbus/pmbus_core.c ++++ b/drivers/hwmon/pmbus/pmbus_core.c +@@ -997,7 +997,7 @@ static ssize_t pmbus_set_sensor(struct device *dev, + if (ret < 0) + rv = ret; + else +- sensor->data = -ENODATA; ++ sensor->data = regval; + mutex_unlock(&data->update_lock); + return rv; + } +-- +2.17.1 + diff --git a/meta-openbmc-mods/meta-ast2600/recipes-kernel/linux/linux-aspeed_%.bbappend b/meta-openbmc-mods/meta-ast2600/recipes-kernel/linux/linux-aspeed_%.bbappend index 94d22381f..7ec69d252 100644 --- a/meta-openbmc-mods/meta-ast2600/recipes-kernel/linux/linux-aspeed_%.bbappend +++ b/meta-openbmc-mods/meta-ast2600/recipes-kernel/linux/linux-aspeed_%.bbappend @@ -8,4 +8,5 @@ SRC_URI += " \ file://0003-serial-8250_aspeed-Make-port-type-fixed.patch \ file://0004-Add-a-workaround-to-cover-UART-interrupt-bug-in-AST2.patch \ file://0005-Add-sample-i3c-slave-driver.patch \ + file://0006-Fix-PSU-fan-sensor-read-0.patch \ " |