diff options
| author | John Audia <therealgraysky@proton.me> | 2024-01-05 15:37:47 -0500 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2024-01-06 12:52:49 +0100 |
| commit | f45fa6b45abf29a0d74c2f2ea4b8e18b6334f2e2 (patch) | |
| tree | 3786e38169c81c1dcee0dc3abe77c28702a958e1 /target/linux/mediatek | |
| parent | 37bb3893929fc3277e7d26ff0012d86526c98b77 (diff) | |
| download | upstream-f45fa6b45abf29a0d74c2f2ea4b8e18b6334f2e2.tar.gz upstream-f45fa6b45abf29a0d74c2f2ea4b8e18b6334f2e2.tar.bz2 upstream-f45fa6b45abf29a0d74c2f2ea4b8e18b6334f2e2.zip | |
kernel: bump 6.1 to 6.1.71
Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.1.71
Manually rebased:
gemini/patches-6.1/0002-usb-fotg210-Collect-pieces-of-dual-mode-controller.patch
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.patch | 12 |
1 files changed, 6 insertions, 6 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 4f9ad9aceff..9aeeb786589 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 @@ -11,7 +11,7 @@ Signed-off-by: SkyLake.Huang <skylake.huang@mediatek.com> --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c -@@ -1374,6 +1374,70 @@ static int spi_transfer_wait(struct spi_ +@@ -1385,6 +1385,70 @@ static int spi_transfer_wait(struct spi_ return 0; } @@ -82,7 +82,7 @@ Signed-off-by: SkyLake.Huang <skylake.huang@mediatek.com> static void _spi_transfer_delay_ns(u32 ns) { if (!ns) -@@ -2208,6 +2272,75 @@ void spi_flush_queue(struct spi_controll +@@ -2219,6 +2283,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) { -@@ -2326,6 +2459,10 @@ of_register_spi_device(struct spi_contro +@@ -2337,6 +2470,10 @@ of_register_spi_device(struct spi_contro if (rc) goto err_out; @@ -171,7 +171,7 @@ Signed-off-by: SkyLake.Huang <skylake.huang@mediatek.com> spi->dev.of_node = nc; --- a/include/linux/spi/spi.h +++ b/include/linux/spi/spi.h -@@ -298,6 +298,40 @@ struct spi_driver { +@@ -318,6 +318,40 @@ struct spi_driver { struct device_driver driver; }; @@ -212,7 +212,7 @@ Signed-off-by: SkyLake.Huang <skylake.huang@mediatek.com> static inline struct spi_driver *to_spi_driver(struct device_driver *drv) { return drv ? container_of(drv, struct spi_driver, driver) : NULL; -@@ -683,6 +717,11 @@ struct spi_controller { +@@ -703,6 +737,11 @@ struct spi_controller { void *dummy_rx; void *dummy_tx; @@ -224,7 +224,7 @@ Signed-off-by: SkyLake.Huang <skylake.huang@mediatek.com> int (*fw_translate_cs)(struct spi_controller *ctlr, unsigned cs); /* -@@ -1490,6 +1529,9 @@ spi_register_board_info(struct spi_board +@@ -1510,6 +1549,9 @@ spi_register_board_info(struct spi_board { return 0; } #endif |