linux gbmc-5.15: SRCREV bump e1b64a3a0f2..584b216c911
Willy Tu(1):
Merge tag 'v5.15.120' into gbmc-5.15
Guenter Roeck(3):
hwmon: (pmbus/adm1275) Fix problems with temperature monitoring on ADM1272
hwmon: (pmbus/adm1275) Prepare for protected write to PMON_CONFIG
hwmon: (pmbus/adm1275) Disable ADC while updating PMON_CONFIG
Google-Bug-Id: 292007476
Google-Bug-Id: 291836446
Change-Id: Ie3065fd1064f579f149e303f929bf3737091470c
Signed-off-by: Willy Tu <wltu@google.com>
diff --git a/recipes-kernel/linux/5.15/DOWNSTREAM_0002-mtd-spi-nor-macronix-Add-google-compatible-flash-IDs.patch b/recipes-kernel/linux/5.15/DOWNSTREAM_0002-mtd-spi-nor-macronix-Add-google-compatible-flash-IDs.patch
index 0442f5d..dc840a7 100644
--- a/recipes-kernel/linux/5.15/DOWNSTREAM_0002-mtd-spi-nor-macronix-Add-google-compatible-flash-IDs.patch
+++ b/recipes-kernel/linux/5.15/DOWNSTREAM_0002-mtd-spi-nor-macronix-Add-google-compatible-flash-IDs.patch
@@ -1,7 +1,7 @@
-From 8d141ae0c536568019b9d65936678f45c6356db7 Mon Sep 17 00:00:00 2001
+From 41762c6a71d8d1ff0f7a6baf7bea2822ce082820 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <wak@google.com>
Date: Fri, 12 Nov 2021 17:38:21 -0800
-Subject: [PATCH 2/2] mtd: spi-nor: macronix: Add google compatible flash IDs
+Subject: [PATCH] mtd: spi-nor: macronix: Add google compatible flash IDs
This is required in order to bind against our spi security interposers.
@@ -28,8 +28,8 @@
+ {"hothb2-1024", INFO(0x26021a, 0x0, 64 * 1024, 1024, SECT_4K) },
+ {"dauntlessd2-1024", INFO(0x26221a, 0, 64 * 1024, 1024, SECT_4K) },
};
-
+
static void macronix_default_init(struct spi_nor *nor)
---
-2.34.0.rc2.393.gf8c9666880-goog
+--
+2.41.0.487.g6d72f3e995-goog
diff --git a/recipes-kernel/linux/linux-gbmc_5.15.bb b/recipes-kernel/linux/linux-gbmc_5.15.bb
index 53ed5f3..78c0f27 100644
--- a/recipes-kernel/linux/linux-gbmc_5.15.bb
+++ b/recipes-kernel/linux/linux-gbmc_5.15.bb
@@ -1,12 +1,14 @@
require linux-gbmc.inc
KBRANCH = "gbmc-5.15"
-LINUX_VERSION = "5.15.108"
-SRCREV = "e1b64a3a0f2ab801e682779f924d07c695101ce5"
+LINUX_VERSION = "5.15.120"
+SRCREV = "584b216c911456fa2732bc7b9648bdc62afe5e4f"
LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
FILESEXTRAPATHS:prepend := "${THISDIR}/5.15:"
-SRC_URI += "file://DOWNSTREAM_0002-mtd-spi-nor-macronix-Add-google-compatible-flash-IDs.patch"
+SRC_URI += " \
+ file://DOWNSTREAM_0002-mtd-spi-nor-macronix-Add-google-compatible-flash-IDs.patch \
+"
SRC_URI:append:aspeed-g6 = " \
file://0001-net-ftgmac100-Support-for-fixed-PHYs.patch \
