diff options
| author | Joel Stanley <joel@jms.id.au> | 2017-06-21 15:45:27 +0930 |
|---|---|---|
| committer | Patrick Williams <patrick@stwcx.xyz> | 2017-06-21 16:06:40 +0000 |
| commit | a21cfe00485e129372ed985826185fc8dc7bb4c9 (patch) | |
| tree | e2175bfcb087ff349fa17ce83b6a9d9e7fac0f98 | |
| parent | 0e1e5650d3c9c1ef40757abaa7c9a5606784b1a0 (diff) | |
| download | talos-openbmc-a21cfe00485e129372ed985826185fc8dc7bb4c9.tar.gz talos-openbmc-a21cfe00485e129372ed985826185fc8dc7bb4c9.zip | |
kernel: Add DPS310, max31785 fixes, wdt2 enablement
Andrew Jeffery (2):
hwmon: occ: Fix uninitialised variable warning
hwmon: max31785: Enable dual rotor if functionality is detected
Benjamin Herrenschmidt (2):
aspeed: Don't blast SCU04 at boot time
spi-nor: Add Winbond w25m512jv
Christopher Bostic (1):
drivers/hwmon: max31785 Set fan fault response based on dev tree
Joel Stanley (3):
iio: Add driver for Infineon DPS310
ARM: configs: aspeed_g5: Add DPS310 driver
ARM: dts: aspeed: Enable WDT2 for all platforms
Patrick Venture (1):
ARM: dts: aspeed: quanta-q71l: i2c-mux compat fix
Change-Id: I2a71977b959227762d62f803a3593c8fc16cc2c2
Signed-off-by: Joel Stanley <joel@jms.id.au>
| -rw-r--r-- | meta-openbmc-bsp/meta-aspeed/meta-ast2500/recipes-kernel/linux/linux-obmc/defconfig | 1 | ||||
| -rw-r--r-- | meta-phosphor/common/recipes-kernel/linux/linux-obmc_4.10.bb | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/meta-openbmc-bsp/meta-aspeed/meta-ast2500/recipes-kernel/linux/linux-obmc/defconfig b/meta-openbmc-bsp/meta-aspeed/meta-ast2500/recipes-kernel/linux/linux-obmc/defconfig index 49bc0d044..29206d1b7 100644 --- a/meta-openbmc-bsp/meta-aspeed/meta-ast2500/recipes-kernel/linux/linux-obmc/defconfig +++ b/meta-openbmc-bsp/meta-aspeed/meta-ast2500/recipes-kernel/linux/linux-obmc/defconfig @@ -177,6 +177,7 @@ CONFIG_IIO=y CONFIG_ASPEED_ADC=y CONFIG_MAX1363=y CONFIG_BMP280=y +CONFIG_DPS310=y CONFIG_FSI=y CONFIG_FSI_MASTER_GPIO=y CONFIG_FSI_MASTER_HUB=y 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 f31f12bc4..542a93e80 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="09041b7c3b65a7ec1063d4882b58fd6f00fc87b3" +SRCREV="9f6d91f5597d0b09da1caac45574e24c6aeadc44" require linux-obmc.inc |
