summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel Stanley <joel@jms.id.au>2017-01-17 09:31:28 +1100
committerPatrick Williams <patrick@stwcx.xyz>2017-01-17 02:43:42 +0000
commit08fcdced5dc4fb209ed57c7aa756d09cfd752f3a (patch)
treed1969eee4913fcf2fd6b63965d9d3220fe40fba8
parent8e04907a01397419e3c75da6a2a645ae92ceae22 (diff)
downloadtalos-openbmc-08fcdced5dc4fb209ed57c7aa756d09cfd752f3a.tar.gz
talos-openbmc-08fcdced5dc4fb209ed57c7aa756d09cfd752f3a.zip
kernel: Add mailbox and LPC drivers
Mailbox and LPC drivers: drivers/mailbox: Add Aspeed mailbox driver drivers/misc: Add Aspeed LPC control driver dt-bindings: Add Aspeed LPC Control bindings dt-bindings: Add Aspeed mailbox bindings Enable the devices for Zaius and Witherspoon: ARM: dts: aspeed-bmc-opp-witherspoon: Enable mailbox and LPC control ARM: dts: aspeed-bmc-opp-zaius: Enable mailbox and LPC control node ARM: dts: aspeed-g5: Add mailbox and LPC control node Change-Id: I8030404c5c2f6d90935bbd6b26de7143f564f06d Signed-off-by: Joel Stanley <joel@jms.id.au>
-rw-r--r--meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-kernel/linux/linux-obmc/defconfig3
-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.7.bb2
3 files changed, 7 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 f9669192f..771200cf4 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
@@ -75,6 +75,7 @@ CONFIG_BLK_DEV_LOOP=y
CONFIG_BLK_DEV_RAM=y
CONFIG_BLK_DEV_RAM_COUNT=4
CONFIG_BLK_DEV_RAM_SIZE=8192
+CONFIG_ASPEED_LPC_CTRL=y
CONFIG_EEPROM_AT24=y
CONFIG_NETDEVICES=y
# CONFIG_NET_VENDOR_ARC is not set
@@ -143,6 +144,8 @@ CONFIG_LEDS_TRIGGER_GPIO=y
CONFIG_RTC_CLASS=y
CONFIG_RTC_DRV_DS1307=y
CONFIG_RTC_DRV_ASPEED=y
+CONFIG_MAILBOX=y
+CONFIG_ASPEED_MBOX=y
# CONFIG_IOMMU_SUPPORT is not set
CONFIG_FSI=y
CONFIG_FSI_MASTER_GPIO=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 73a5397f4..2523ef5f9 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
@@ -78,6 +78,7 @@ CONFIG_BLK_DEV_LOOP=y
CONFIG_BLK_DEV_RAM=y
CONFIG_BLK_DEV_RAM_COUNT=4
CONFIG_BLK_DEV_RAM_SIZE=8192
+CONFIG_ASPEED_LPC_CTRL=y
CONFIG_EEPROM_AT24=y
CONFIG_NETDEVICES=y
# CONFIG_NET_VENDOR_ARC is not set
@@ -147,6 +148,8 @@ CONFIG_LEDS_TRIGGER_GPIO=y
CONFIG_RTC_CLASS=y
CONFIG_RTC_DRV_DS1307=y
CONFIG_RTC_DRV_ASPEED=y
+CONFIG_MAILBOX=y
+CONFIG_ASPEED_MBOX=y
# CONFIG_IOMMU_SUPPORT is not set
CONFIG_FSI=y
CONFIG_FSI_MASTER_GPIO=y
diff --git a/meta-phosphor/common/recipes-kernel/linux/linux-obmc_4.7.bb b/meta-phosphor/common/recipes-kernel/linux/linux-obmc_4.7.bb
index f9709841a..f862ee8f7 100644
--- a/meta-phosphor/common/recipes-kernel/linux/linux-obmc_4.7.bb
+++ b/meta-phosphor/common/recipes-kernel/linux/linux-obmc_4.7.bb
@@ -1,6 +1,6 @@
KBRANCH ?= "dev-4.7"
LINUX_VERSION ?= "4.7"
-SRCREV="b40fcf1208470a9107caaf7e73387799f32c5111"
+SRCREV="26d51e63ed7433662b0137dff63b42d6969417d5"
require linux-obmc.inc
OpenPOWER on IntegriCloud