diff options
| author | Joel Stanley <joel@jms.id.au> | 2017-08-11 17:06:50 +0930 |
|---|---|---|
| committer | Patrick Williams <patrick@stwcx.xyz> | 2017-08-15 04:42:38 +0000 |
| commit | 83a4307ecef9a5451af4f46ca3f84c1b45d9cd1b (patch) | |
| tree | 92d58831e97fc72706ae291b1e3842cee30d46bd | |
| parent | d9300f647562af92520cb1915d3d0a472df72afc (diff) | |
| download | talos-openbmc-83a4307ecef9a5451af4f46ca3f84c1b45d9cd1b.tar.gz talos-openbmc-83a4307ecef9a5451af4f46ca3f84c1b45d9cd1b.zip | |
kernel: IBM PSU driver, hwmon core additions, and aspeed-pwm-tacho
Edward A. James (8):
hwmon: (pmbus): Switch status registers to 16 bit
hwmon: (pmbus): Access word data for STATUS_WORD
hwmon: (pmbus): Add generic alarm bit for iin and pin
hwmon: (pmbus): Add debugfs for status registers
dt-bindings: i2c: Document the IBM CCF power supply version 1
hwmon: (pmbus): Add IBM Common Form Factor (CFF) power supply driver
Documentation: hwmon: Document the IBM CFF power supply
ARM: dts: aspeed: Witherspoon: Add power supplies to i2c bus
Jaghathiswari Rankappagounder Natarajan (1):
Documentation: dt-bindings: Document bindings for ASPEED AST2400/AST2500 PWM and Fan tach control
Joel Stanley (2):
ARM: configs: aspeed: Add VLAN options
ARM: configs: aspeed: Enable IBM CFF Power Supply driver
Mykola Kostenok (2):
Documentation: dt-bindings: aspeed-pwm-tacho cooling device.
hwmon: (aspeed-pwm-tacho) cooling device support.
Change-Id: I78081bba5af67a1b1987fe256dd1f2ff3182472d
Signed-off-by: Joel Stanley <joel@jms.id.au>
3 files changed, 5 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 2caeb0ca4..49e9370dd 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 @@ -61,6 +61,7 @@ CONFIG_INET_UDP_DIAG=y CONFIG_NETFILTER=y CONFIG_IP_NF_IPTABLES=y CONFIG_IP_NF_FILTER=y +CONFIG_VLAN_8021Q=y CONFIG_NET_NCSI=y # CONFIG_WIRELESS is not set CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" @@ -150,6 +151,7 @@ CONFIG_PMBUS=y CONFIG_SENSORS_ADM1275=y CONFIG_SENSORS_LM25066=y CONFIG_SENSORS_MAX31785=y +CONFIG_SENSORS_IBM_CFFPS=y CONFIG_SENSORS_UCD9000=y CONFIG_SENSORS_TMP421=y # CONFIG_HID is not set 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 3008b6cac..10dc73146 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 @@ -53,6 +53,7 @@ CONFIG_SYN_COOKIES=y # CONFIG_INET6_XFRM_MODE_TUNNEL is not set # CONFIG_INET6_XFRM_MODE_BEET is not set # CONFIG_IPV6_SIT is not set +CONFIG_VLAN_8021Q=y CONFIG_NET_NCSI=y # CONFIG_WIRELESS is not set CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" @@ -150,6 +151,7 @@ CONFIG_SENSORS_ADM1275=y CONFIG_SENSORS_IR35221=y CONFIG_SENSORS_LM25066=y CONFIG_SENSORS_MAX31785=y +CONFIG_SENSORS_IBM_CFFPS=y CONFIG_SENSORS_UCD9000=y CONFIG_SENSORS_UCD9200=y CONFIG_SENSORS_TMP421=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 4c042a757..9e3c04afb 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="b8cd93f62581143a80ba5c0c61629031ce4a5240" +SRCREV="1a4df30c39cf5ee0e3d2528c409787ccbb4a672a" require linux-obmc.inc |
