diff options
| author | jmbills <jason.m.bills@intel.com> | 2021-11-05 18:45:06 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-05 18:45:06 +0300 |
| commit | 4dac5fcd49b5e2de1074f1363775ec0f19041072 (patch) | |
| tree | 5aadf91080299b1583caed86a31da368dfcda2da /meta-openbmc-mods/meta-common/recipes-kernel | |
| parent | 0c9e31989c615598b5d042ffab385606660c93c0 (diff) | |
| parent | 61f1ca1b31a9a1108e9e7f71e47fdc19beb0490b (diff) | |
| download | openbmc-4dac5fcd49b5e2de1074f1363775ec0f19041072.tar.xz | |
Update
Diffstat (limited to 'meta-openbmc-mods/meta-common/recipes-kernel')
2 files changed, 7 insertions, 7 deletions
diff --git a/meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed/0009-ARM-dts-add-rtc-pch-node-into-aspeed-bmc-intel-ast2x.patch b/meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed/0009-ARM-dts-add-rtc-pch-node-into-aspeed-bmc-intel-ast2x.patch index 4b84c831f..ef2196c44 100644 --- a/meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed/0009-ARM-dts-add-rtc-pch-node-into-aspeed-bmc-intel-ast2x.patch +++ b/meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed/0009-ARM-dts-add-rtc-pch-node-into-aspeed-bmc-intel-ast2x.patch @@ -1,4 +1,4 @@ -From dbd6feacb11dbcd81fb3586dd62170d3d5900c1c Mon Sep 17 00:00:00 2001 +From aed87d1ffe2d22986e38b22b1c77beadcd3376c8 Mon Sep 17 00:00:00 2001 From: Jae Hyun Yoo <jae.hyun.yoo@intel.com> Date: Fri, 30 Jul 2021 14:17:24 -0700 Subject: [PATCH] ARM: dts: add rtc-pch node into aspeed-bmc-intel-ast2xxx @@ -13,10 +13,10 @@ Signed-off-by: Jae Hyun Yoo <jae.hyun.yoo@intel.com> 2 files changed, 10 insertions(+) diff --git a/arch/arm/boot/dts/aspeed-bmc-intel-ast2500.dts b/arch/arm/boot/dts/aspeed-bmc-intel-ast2500.dts -index 27f2febdb8e5..48e6029bcafc 100644 +index 2efa67f08dcb..a460169e1b7b 100644 --- a/arch/arm/boot/dts/aspeed-bmc-intel-ast2500.dts +++ b/arch/arm/boot/dts/aspeed-bmc-intel-ast2500.dts -@@ -399,6 +399,11 @@ +@@ -383,6 +383,11 @@ aspeed,dma-buf-size = <4095>; aspeed,hw-timeout-ms = <300>; status = "okay"; @@ -29,12 +29,12 @@ index 27f2febdb8e5..48e6029bcafc 100644 &i2c4 { diff --git a/arch/arm/boot/dts/aspeed-bmc-intel-ast2600.dts b/arch/arm/boot/dts/aspeed-bmc-intel-ast2600.dts -index 766496340b3c..8b2c20d200e1 100644 +index 02a671ca0f19..9bc859f69307 100644 --- a/arch/arm/boot/dts/aspeed-bmc-intel-ast2600.dts +++ b/arch/arm/boot/dts/aspeed-bmc-intel-ast2600.dts -@@ -478,6 +478,11 @@ - /* SMB_HOST_STBY_BMC_LVC3_R */ +@@ -491,6 +491,11 @@ multi-master; + aspeed,hw-timeout-ms = <300>; status = "okay"; + + rtc-pch@44 { diff --git a/meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed_%.bbappend b/meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed_%.bbappend index da5b88bb0..b5165c73c 100644 --- a/meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed_%.bbappend +++ b/meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed_%.bbappend @@ -6,7 +6,7 @@ KBRANCH = "dev-5.10-intel" KSRC = "git://github.com/Intel-BMC/linux;protocol=ssh;branch=${KBRANCH}" # Include this as a comment only for downstream auto-bump # SRC_URI = "git://github.com/Intel-BMC/linux;protocol=ssh;branch=dev-5.10-intel" -SRCREV="9c808fc8b3ad7c030fe546b1b5c6c38556fa784a" +SRCREV="c6e2963874ca7454eb901b4ac668f05b36cf03c8" do_compile:prepend(){ # device tree compiler flags |