aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/mediatek
diff options
context:
space:
mode:
authorJohn Audia <therealgraysky@proton.me>2024-02-02 16:56:39 -0500
committerNick Hainke <vincent@systemli.org>2024-02-08 18:35:42 +0100
commit4a0839b44ede74754f8022ca7fbd31c862ca86c2 (patch)
tree15e1ded94a1dac2b9d296eb93b435a5c01392260 /target/linux/mediatek
parentd274867c217cade795537af93ff9b209e472e19c (diff)
downloadupstream-4a0839b44ede74754f8022ca7fbd31c862ca86c2.tar.gz
upstream-4a0839b44ede74754f8022ca7fbd31c862ca86c2.tar.bz2
upstream-4a0839b44ede74754f8022ca7fbd31c862ca86c2.zip
kernel: bump 6.1 to 6.1.76
Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.1.76 All patches automatically rebased. Build system: x86/64 Build-tested: x86/64/AMD Cezanne Run-tested: x86/64/AMD Cezanne Signed-off-by: John Audia <therealgraysky@proton.me>
Diffstat (limited to 'target/linux/mediatek')
-rw-r--r--target/linux/mediatek/patches-6.1/432-drivers-spi-Add-support-for-dynamic-calibration.patch4
-rw-r--r--target/linux/mediatek/patches-6.1/901-arm-add-cmdline-override.patch2
2 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/mediatek/patches-6.1/432-drivers-spi-Add-support-for-dynamic-calibration.patch b/target/linux/mediatek/patches-6.1/432-drivers-spi-Add-support-for-dynamic-calibration.patch
index 9aeeb786589..b2c9df4386a 100644
--- a/target/linux/mediatek/patches-6.1/432-drivers-spi-Add-support-for-dynamic-calibration.patch
+++ b/target/linux/mediatek/patches-6.1/432-drivers-spi-Add-support-for-dynamic-calibration.patch
@@ -82,7 +82,7 @@ Signed-off-by: SkyLake.Huang <skylake.huang@mediatek.com>
static void _spi_transfer_delay_ns(u32 ns)
{
if (!ns)
-@@ -2219,6 +2283,75 @@ void spi_flush_queue(struct spi_controll
+@@ -2223,6 +2287,75 @@ void spi_flush_queue(struct spi_controll
/*-------------------------------------------------------------------------*/
#if defined(CONFIG_OF)
@@ -158,7 +158,7 @@ Signed-off-by: SkyLake.Huang <skylake.huang@mediatek.com>
static int of_spi_parse_dt(struct spi_controller *ctlr, struct spi_device *spi,
struct device_node *nc)
{
-@@ -2337,6 +2470,10 @@ of_register_spi_device(struct spi_contro
+@@ -2341,6 +2474,10 @@ of_register_spi_device(struct spi_contro
if (rc)
goto err_out;
diff --git a/target/linux/mediatek/patches-6.1/901-arm-add-cmdline-override.patch b/target/linux/mediatek/patches-6.1/901-arm-add-cmdline-override.patch
index 72e4d150095..bfca4b63894 100644
--- a/target/linux/mediatek/patches-6.1/901-arm-add-cmdline-override.patch
+++ b/target/linux/mediatek/patches-6.1/901-arm-add-cmdline-override.patch
@@ -37,7 +37,7 @@
* CONFIG_CMDLINE is meant to be a default in case nothing else
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
-@@ -2236,6 +2236,14 @@ config CMDLINE_FORCE
+@@ -2240,6 +2240,14 @@ config CMDLINE_FORCE
endchoice