mirror of
https://git.openwrt.org/openwrt/openwrt.git
synced 2024-11-24 14:06:15 +00:00
10d77b9bc3
Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.6.31 Removed upstreamed: backport-6.6/600-v6.9-01-net-gro-parse-ipv6-ext-headers-without-frag0-invalid.patch[1] backport-6.6/600-v6.9-02-net-gro-fix-udp-bad-offset-in-socket-lookup-by-addin.patch[2] backport-6.6/600-v6.9-03-net-gro-add-flush-check-in-udp_gro_receive_segment.patch[3] backport-6.6/816-v6.7-0002-nvmem-add-explicit-config-option-to-read-old-syntax-.patch[4] pending-6.6/681-net-bridge-fix-multicast-to-unicast-with-fraglist-GS.patch[5] pending-6.6/682-net-core-reject-skb_copy-_expand-for-fraglist-GSO-sk.patch[6] pending-6.6/684-net-bridge-fix-corrupted-ethernet-header-on-multicas.patch[7] pending-6.6/778-net-l2tp-drop-flow-hash-on-forward.patch[8] pending-6.6/440-mtd-don-t-look-for-OTP-legacy-NVMEM-cells-if-proper-.patch[9a,b] All other patches automatically rebased. 1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.31&id=7f7b0ebb37afc5070d122318e3651d7cb8c4f01c 2. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.31&id=af276a5ac8e938c8b058e3e124073cc1e322d98b 3. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.31&id=78b6092d78341e423e5f6afae4d9f401b561aca7 4. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.31&id=26e2fe4cab10e67f116f4a2eecc393824bb294b8 5. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.31&id=65fbc7a11d063236e1f1dcebb38eeaa3ccbe2dbc 6. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.31&id=cfe34d86ef9765c388f145039006bb79b6c81ac6 7. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.31&id=1ce60741d7e17dcf707e3bdebed4442ae30bdd02 8. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.31&id=23e25d2fc777cd0cc77c2f857f93e9b13ee789b9 9a. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.31&id=cce311f8bbbf9d24eacc39af3228cd104e079396 9b. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/diff/drivers/mtd/mtdcore.c?id=v6.6.31&id2=v6.6.30 Build system: x86/64 Build-tested: x86/64/AMD Cezanne, flogic/xiaomi_redmi-router-ax6000-ubootmod, ramips/tplink_archer-a6-v3 Run-tested: x86/64/AMD Cezanne, flogic/xiaomi_redmi-router-ax6000-ubootmod, ramips/tplink_archer-a6-v3 Signed-off-by: John Audia <therealgraysky@proton.me>
38 lines
1.5 KiB
Diff
38 lines
1.5 KiB
Diff
From 16724d6ea40a2c9315f5a0d81005dfa4d7a6da24 Mon Sep 17 00:00:00 2001
|
|
From: Luca Weiss <luca.weiss@fairphone.com>
|
|
Date: Fri, 20 Oct 2023 11:55:40 +0100
|
|
Subject: [PATCH] nvmem: qfprom: Mark core clk as optional
|
|
|
|
On some platforms like sc7280 on non-ChromeOS devices the core clock
|
|
cannot be touched by Linux so we cannot provide it. Mark it as optional
|
|
as accessing qfprom for reading works without it but we still prohibit
|
|
writing if we cannot provide the clock.
|
|
|
|
Signed-off-by: Luca Weiss <luca.weiss@fairphone.com>
|
|
Reviewed-by: Douglas Anderson <dianders@chromium.org>
|
|
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
|
|
Link: https://lore.kernel.org/r/20231020105545.216052-2-srinivas.kandagatla@linaro.org
|
|
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|
---
|
|
drivers/nvmem/qfprom.c | 6 +++---
|
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
--- a/drivers/nvmem/qfprom.c
|
|
+++ b/drivers/nvmem/qfprom.c
|
|
@@ -424,12 +424,12 @@ static int qfprom_probe(struct platform_
|
|
if (IS_ERR(priv->vcc))
|
|
return PTR_ERR(priv->vcc);
|
|
|
|
- priv->secclk = devm_clk_get(dev, "core");
|
|
+ priv->secclk = devm_clk_get_optional(dev, "core");
|
|
if (IS_ERR(priv->secclk))
|
|
return dev_err_probe(dev, PTR_ERR(priv->secclk), "Error getting clock\n");
|
|
|
|
- /* Only enable writing if we have SoC data. */
|
|
- if (priv->soc_data)
|
|
+ /* Only enable writing if we have SoC data and a valid clock */
|
|
+ if (priv->soc_data && priv->secclk)
|
|
econfig.reg_write = qfprom_reg_write;
|
|
}
|
|
|