kernel: bump 6.1 to 6.1.71
authorJohn Audia <therealgraysky@proton.me>
Fri, 5 Jan 2024 20:37:47 +0000 (15:37 -0500)
committerHauke Mehrtens <hauke@hauke-m.de>
Sat, 6 Jan 2024 11:52:49 +0000 (12:52 +0100)
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>
include/kernel-6.1
target/linux/bcm27xx/patches-6.1/950-0227-spi-Force-CS_HIGH-if-GPIO-descriptors-are-used.patch
target/linux/gemini/patches-6.1/0002-usb-fotg210-Collect-pieces-of-dual-mode-controller.patch
target/linux/generic/backport-6.1/828-v6.4-0003-of-Rename-of_modalias_node.patch
target/linux/mediatek/patches-6.1/432-drivers-spi-Add-support-for-dynamic-calibration.patch

index 8cfdaad6d73d2ed0d198f4b614e1bbf5b1280540..c52b94712fbd39bc4833f6b776d0b2ad7107849a 100644 (file)
@@ -1,2 +1,2 @@
-LINUX_VERSION-6.1 = .70
-LINUX_KERNEL_HASH-6.1.70 = ed1365266456c07696a7499581aec5d851ca2296f4f6f90f23d189ea5a56afef
+LINUX_VERSION-6.1 = .71
+LINUX_KERNEL_HASH-6.1.71 = 2df774dd53f9ffd4e57ebf804cf597709295df6a304fe261d25220a134b7f041
index dfbea6258f85148a32e3d20ac8769888051951ca..974a516829b379e834873ac0fb22e5f817ee2303 100644 (file)
@@ -32,7 +32,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
 
 --- a/drivers/spi/spi.c
 +++ b/drivers/spi/spi.c
-@@ -3633,6 +3633,7 @@ static int __spi_validate_bits_per_word(
+@@ -3675,6 +3675,7 @@ static int spi_set_cs_timing(struct spi_
   */
  int spi_setup(struct spi_device *spi)
  {
@@ -40,7 +40,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
        unsigned        bad_bits, ugly_bits;
        int             status = 0;
  
-@@ -3653,6 +3654,14 @@ int spi_setup(struct spi_device *spi)
+@@ -3695,6 +3696,14 @@ int spi_setup(struct spi_device *spi)
                (SPI_TX_DUAL | SPI_TX_QUAD | SPI_TX_OCTAL |
                 SPI_RX_DUAL | SPI_RX_QUAD | SPI_RX_OCTAL)))
                return -EINVAL;
index 902bf4c68fe2d5c310858e36b159ba8fb18d9cef..1ee4f27c46d28cf1992bb26b8f119f2d4ba2de09 100644 (file)
@@ -104,7 +104,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 +obj-$(CONFIG_USB_FOTG210_UDC) += fotg210-udc.o
 --- a/drivers/usb/host/fotg210-hcd.c
 +++ /dev/null
-@@ -1,5727 +0,0 @@
+@@ -1,5724 +0,0 @@
 -// SPDX-License-Identifier: GPL-2.0+
 -/* Faraday FOTG210 EHCI-like driver
 - *
@@ -536,8 +536,6 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 -                      temp = size;
 -              size -= temp;
 -              next += temp;
--              if (temp == size)
--                      goto done;
 -      }
 -
 -      temp = snprintf(next, size, "\n");
@@ -547,7 +545,6 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 -      size -= temp;
 -      next += temp;
 -
--done:
 -      *sizep = size;
 -      *nextp = next;
 -}
index f82dc1428aa552420dd96f1fbac4429827fb1209..15af039a16f01d3b81c5626a5b5a0e9eee35d858 100644 (file)
@@ -148,7 +148,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
   * of_find_node_by_phandle - Find a node given a phandle
 --- a/drivers/spi/spi.c
 +++ b/drivers/spi/spi.c
-@@ -2315,8 +2315,8 @@ of_register_spi_device(struct spi_contro
+@@ -2326,8 +2326,8 @@ of_register_spi_device(struct spi_contro
        }
  
        /* Select device driver */
index 4f9ad9aceff47a0569fe8c4a5743d0cbc37f671b..9aeeb786589bcdf184700d43fe9007267d0af941 100644 (file)
@@ -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