summaryrefslogtreecommitdiffstats
path: root/meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-kernel
diff options
context:
space:
mode:
authorJoel Stanley <joel@jms.id.au>2017-08-01 09:46:22 +0930
committerPatrick Williams <patrick@stwcx.xyz>2017-08-01 17:23:35 +0000
commit74edaef60c260bca0c1a9f61ade107e6a2bc0f4f (patch)
tree19d6494d51ad02ef1f75e0328c851eda4d9c4bca /meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-kernel
parent1649812d251cd662230d62f16a7ecdffeafa9898 (diff)
downloadtalos-openbmc-74edaef60c260bca0c1a9f61ade107e6a2bc0f4f.tar.gz
talos-openbmc-74edaef60c260bca0c1a9f61ade107e6a2bc0f4f.zip
kernel: Watchdog gpio, upstream vuart, pca955x and i2c fixes
Update defconfigs with new VUART kconfig symbol. The MAX31785 symbol moves as it is now sorted with the PMBUS drivers. Andrew Jeffery (4): ARM: aspeed: Request WDTRST1 pinctrl function dt-bindings: watchdog: aspeed: External reset signal properties watchdog: aspeed: Support configuration of external signal properties ARM: dts: aspeed: Witherspoon WDT1 external signal is push-pull Brendan Higgins (1): i2c: aspeed: fixed potential null pointer dereference Cédric Le Goater (1): leds: pca955x: fix typo Jeremy Kerr (1): drivers/serial: Add driver for Aspeed virtual UART Joel Stanley (4): Revert "drivers/serial: Add driver for Aspeed virtual UART" serial: 8250: Add flag so drivers can avoid THRE probe ARM: dts: aspeed: Update vuart compatible ARM: configs: aspeed: Regenerate defconfigs Change-Id: I151016c7ea98fc6552ce8ab54661dd1353834deb Signed-off-by: Joel Stanley <joel@jms.id.au>
Diffstat (limited to 'meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-kernel')
-rw-r--r--meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-kernel/linux/linux-obmc/defconfig4
1 files changed, 2 insertions, 2 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 d83f426a7..2caeb0ca4 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
@@ -121,9 +121,9 @@ CONFIG_SERIAL_8250_CONSOLE=y
CONFIG_SERIAL_8250_NR_UARTS=6
CONFIG_SERIAL_8250_RUNTIME_UARTS=6
CONFIG_SERIAL_8250_EXTENDED=y
+CONFIG_SERIAL_8250_ASPEED_VUART=y
CONFIG_SERIAL_8250_SHARE_IRQ=y
CONFIG_SERIAL_OF_PLATFORM=y
-CONFIG_SERIAL_ASPEED_VUART=y
CONFIG_ASPEED_BT_IPMI_BMC=y
CONFIG_HW_RANDOM_TIMERIOMEM=y
CONFIG_I2C=y
@@ -141,7 +141,6 @@ CONFIG_W1_MASTER_GPIO=y
CONFIG_W1_SLAVE_THERM=y
CONFIG_SENSORS_ASPEED=y
CONFIG_SENSORS_IIO_HWMON=y
-CONFIG_SENSORS_MAX31785=y
CONFIG_SENSORS_LM75=y
CONFIG_SENSORS_NCT7904=y
CONFIG_SENSORS_OCC=y
@@ -150,6 +149,7 @@ CONFIG_PMBUS=y
# CONFIG_SENSORS_PMBUS is not set
CONFIG_SENSORS_ADM1275=y
CONFIG_SENSORS_LM25066=y
+CONFIG_SENSORS_MAX31785=y
CONFIG_SENSORS_UCD9000=y
CONFIG_SENSORS_TMP421=y
# CONFIG_HID is not set
OpenPOWER on IntegriCloud