summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel Stanley <joel@jms.id.au>2017-06-16 16:22:35 +0930
committerPatrick Williams <patrick@stwcx.xyz>2017-06-19 13:59:09 +0000
commit5fa1bb7bf7949f76214c8b31f4b14a56a68a1f22 (patch)
tree437d9e31a51df6738594fed8e9f949dd823731ca
parent521a5949f2f2d6bb35543193e76ec270abdbeb62 (diff)
downloadtalos-openbmc-5fa1bb7bf7949f76214c8b31f4b14a56a68a1f22.tar.gz
talos-openbmc-5fa1bb7bf7949f76214c8b31f4b14a56a68a1f22.zip
kernel: FSI, hwmon, LED GPIO and device tree fixes
Andrew Jeffery (2): hwmon: max31785: Clean up uninitialised values hwmon: max31785: Use standard sysfs ABI for fast rotor inputs Cédric Le Goater (5): leds: pca955x: add device tree support leds: pca955x: use devm_led_classdev_register leds: pca955x: add GPIO support dt-bindings leds: add pca955x ARM: dts: aspeed: witherspoon: Add pca9552 device Edward A. James (7): fsi: occ: Fix 1 byte response and rc for O_NONBLOCK hwmon: occ: Add new sensor versions and non-hwmon attributes hwmon: occ: Add P8 OCC access occ: hwmon and fsi probing fix ARM: aspeed: Power9 dts and defconfigs for OCC drivers: fsi: sbefifo: Fix buffer initialization drivers: hwmon: occ: Add "master" attribute and remove status files Joel Stanley (1): ARM: configs: aspeed: Add pca9552 driver Rick Altherr (1): ARM: dts: aspeed: quanta-q71l: Add i2c and LED devices Change-Id: I9d1307cd3d8e0eaa86197a2da858dd0d83174d6c Signed-off-by: Joel Stanley <joel@jms.id.au>
-rw-r--r--meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-kernel/linux/linux-obmc/defconfig2
-rw-r--r--meta-openbmc-bsp/meta-aspeed/meta-ast2500/recipes-kernel/linux/linux-obmc/defconfig3
-rw-r--r--meta-phosphor/common/recipes-kernel/linux/linux-obmc_4.10.bb2
3 files changed, 6 insertions, 1 deletions
diff --git a/meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-kernel/linux/linux-obmc/defconfig b/meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-kernel/linux/linux-obmc/defconfig
index 1dbea59d2..47669198e 100644
--- a/meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-kernel/linux/linux-obmc/defconfig
+++ b/meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-kernel/linux/linux-obmc/defconfig
@@ -141,6 +141,8 @@ CONFIG_SENSORS_IIO_HWMON=y
CONFIG_SENSORS_MAX31785=y
CONFIG_SENSORS_LM75=y
CONFIG_SENSORS_NCT7904=y
+CONFIG_SENSORS_OCC=y
+CONFIG_SENSORS_OCC_P8_I2C=y
CONFIG_PMBUS=y
# CONFIG_SENSORS_PMBUS is not set
CONFIG_SENSORS_ADM1275=y
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 64e3aed89..49bc0d044 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
@@ -140,6 +140,7 @@ CONFIG_SENSORS_IIO_HWMON=y
CONFIG_SENSORS_MAX31785=y
CONFIG_SENSORS_LM75=y
CONFIG_SENSORS_NCT7904=y
+CONFIG_SENSORS_OCC=y
CONFIG_SENSORS_OCC_P9_SBE=y
CONFIG_PMBUS=y
CONFIG_SENSORS_ADM1275=y
@@ -158,6 +159,8 @@ CONFIG_NEW_LEDS=y
CONFIG_LEDS_CLASS=y
CONFIG_LEDS_CLASS_FLASH=y
CONFIG_LEDS_GPIO=y
+CONFIG_LEDS_PCA955X=y
+CONFIG_LEDS_PCA955X_GPIO=y
CONFIG_LEDS_TRIGGERS=y
CONFIG_LEDS_TRIGGER_TIMER=y
CONFIG_LEDS_TRIGGER_HEARTBEAT=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 5b2cabd63..f31f12bc4 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="c694e47cbc1efc2bc181b2ac7137dfda04f974c2"
+SRCREV="09041b7c3b65a7ec1063d4882b58fd6f00fc87b3"
require linux-obmc.inc
OpenPOWER on IntegriCloud