| commit | 4430173e97f821b5de1c1bbd07894ecb1bfedc41 | [log] [tgz] |
|---|---|---|
| author | Joel Stanley <joel@jms.id.au> | Fri Jul 28 11:16:35 2017 +0930 |
| committer | Joel Stanley <joel@jms.id.au> | Fri Jul 28 11:20:12 2017 +0930 |
| tree | 1701b17073e3c153ed5fb102d929f44f4d9bc9ae | |
| parent | 3ba80c8f28d86c63e150fa06f029b5deb9406b45 [diff] |
kernel: new Maxim MAX31785A driver Andrew has cooked us up a proper pmbus MAX31785A driver. This bumps the kernel to include that driver, the device tree updates for the new bindings, and a userspace change for Witherspoon. The userspace change was reviewed and got five +1's: phosphor-hwmon: Update Witherspoon fan labels for PMBus driver The reimplementation of the max37185 fan controller driver uses the Linux PMBus subsystem, which exposes the installed number of fans rather than all supported fan IO. https://gerrit.openbmc-project.xyz/#/c/5564/ It is included in this commit so the system remains bisectable. Andrew Jeffery (6): dt-bindings: hwmon: pmbus: Add Maxim MAX31785 documentation ARM: dts: aspeed: witherspoon: Update max31785 node hwmon: pmbus: Add fan control support hwmon: Remove MAX31785 implementation pmbus: Add driver for Maxim MAX31785 Intelligent Fan Controller ARM: dts: aspeed: Witherspoon has a MAX31785A fan controller Joel Stanley (2): ARM: dts: aspeed: romulus: Update max31785 node ARM: dts: aspeed: firestone: Update max31785 node Change-Id: I7a7b86f5ee6ff38803d4f62c3d3ac99edbea45fb Signed-off-by: Joel Stanley <joel@jms.id.au>
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@100/max31785@52.conf b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@100/max31785@52.conf index ef3a5eb..a4bbe92 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@100/max31785@52.conf +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@100/max31785@52.conf
@@ -2,7 +2,7 @@ LABEL_fan2 = "fan1_0" LABEL_fan3 = "fan2_0" LABEL_fan4 = "fan3_0" -LABEL_fan7 = "fan0_1" -LABEL_fan8 = "fan1_1" -LABEL_fan9 = "fan2_1" -LABEL_fan10 = "fan3_1" +LABEL_fan5 = "fan0_1" +LABEL_fan6 = "fan1_1" +LABEL_fan7 = "fan2_1" +LABEL_fan8 = "fan3_1"
diff --git a/meta-phosphor/common/recipes-kernel/linux/linux-obmc_4.10.bb b/meta-phosphor/common/recipes-kernel/linux/linux-obmc_4.10.bb index 8159795..24a613c 100644 --- a/meta-phosphor/common/recipes-kernel/linux/linux-obmc_4.10.bb +++ b/meta-phosphor/common/recipes-kernel/linux/linux-obmc_4.10.bb
@@ -1,6 +1,6 @@ KBRANCH ?= "dev-4.10" LINUX_VERSION ?= "4.10.17" -SRCREV="bbd291e4ce0009aa07183c94a77b08211422ed99" +SRCREV="44f0dc8ac43162c4f7082884d6cd79400341bf5b" require linux-obmc.inc